Merge pull request #134 from yury-mishchenko/main

Preserve file encoding and line endings in eclipse-coder::replaceFileContent/deleteLinesInFile

Author: gradusnikov

plugins/com.github.gradusnikov.eclipse.plugin.assistai.main/src/com/github/gradusnikov/eclipse/assistai/mcp/services/CodeEditingService.java

@@ -2209,9 +2209,7 @@ public String replaceFileContent(String projectName, String filePath, String con
             backupFile(file);
 
             // Replace the file content
-            byte[] bytes = content.getBytes(StandardCharsets.UTF_8);
-            ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
-            file.setContents(inputStream, IResource.FORCE, null);
+            file.setContents(ResourceUtilities.toFileContent(file, content), IResource.FORCE, null);
 
             // Refresh the file
             file.refreshLocal(IResource.DEPTH_ZERO, null);
@@ -2282,38 +2280,31 @@ public String deleteLinesInFile(String projectName, String filePath, int startLi
             backupFile(file);
 
             // Read the file content
-            String fileContent = new String(file.getContents().readAllBytes(), StandardCharsets.UTF_8);
-            String[] lines = fileContent.split("\r?\n", -1);
+            var lines = ResourceUtilities.readFileLinesWithTerminators(file);
 
             // Validate line numbers
-            if (startLine > lines.length) 
+            if (startLine > lines.size()) 
             {
-                throw new IllegalArgumentException("Error: Start line " + startLine + " is beyond the file length (" + lines.length + " lines).");
+                throw new IllegalArgumentException("Error: Start line " + startLine + " is beyond the file length (" + lines.size() + " lines).");
             }
-            if (endLine > lines.length) 
+            if (endLine > lines.size()) 
             {
-                throw new IllegalArgumentException("Error: End line " + endLine + " is beyond the file length (" + lines.length + " lines).");
+                throw new IllegalArgumentException("Error: End line " + endLine + " is beyond the file length (" + lines.size() + " lines).");
             }
 
             // Build new content without the deleted lines
             StringBuilder newContent = new StringBuilder();
-            for (int i = 0; i < lines.length; i++) 
+            for (int i = 0; i < lines.size(); i++) 
             {
                 int lineNum = i + 1; // Convert to 1-based
                 if (lineNum < startLine || lineNum > endLine) 
                 {
-                    newContent.append(lines[i]);
-                    if (i < lines.length - 1) 
-                    {
-                        newContent.append("\n");
-                    }
+                    newContent.append(lines.get(i));
                 }
             }
 
             // Write the new content back to the file
-            byte[] bytes = newContent.toString().getBytes(StandardCharsets.UTF_8);
-            ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
-            file.setContents(inputStream, IResource.FORCE, null);
+            file.setContents(ResourceUtilities.toFileContent(file, newContent.toString()), IResource.FORCE, null);
 
             // Refresh the file
             file.refreshLocal(IResource.DEPTH_ZERO, null);

plugins/com.github.gradusnikov.eclipse.plugin.assistai.main/src/com/github/gradusnikov/eclipse/assistai/tools/ResourceUtilities.java

@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -16,6 +17,7 @@
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.core.runtime.content.IContentTypeManager;
 import org.eclipse.core.resources.IContainer;
@@ -130,6 +132,17 @@ public static String readFileContent(IFile file) throws IOException, CoreExcepti
         }
     }
 
+    public static InputStream toFileContent(IFile file, String text) throws CoreException
+    {
+        Objects.requireNonNull(file);
+        
+        try {
+			return new ByteArrayInputStream(text == null ? new byte[0]: text.getBytes(file.getCharset()));
+		} catch (UnsupportedEncodingException e) {
+			throw new CoreException(Status.error("Unknown charset", e));
+		}
+    }
+
     public static String getSuggestedFileName(String lang, String codeBlock)
     {
         // Fall back to the original implementation if parsing fails or for other languages