Patched patchwork/steps/ModifyCode/ModifyCode.py

Author: patched.codes[bot]

patchwork/steps/ModifyCode/ModifyCode.py

@@ -3,12 +3,20 @@
 from pathlib import Path
 
 from patchwork.step import Step, StepStatus
+from patchwork.common.utils.utils import open_with_chardet
 
 
 def save_file_contents(file_path, content):
-    """Utility function to save content to a file."""
-    with open(file_path, "w") as file:
-        file.write(content)
+    """Utility function to save content to a file while preserving line endings.
+    
+    Args:
+        file_path: Path to the file to write to
+        content: Content to write to the file
+    """
+    # Convert content to bytes preserving the exact bytes of line endings
+    content_bytes = content.encode('utf-8')
+    with open(file_path, "wb") as file:
+        file.write(content_bytes)
 
 
 def handle_indent(src: list[str], target: list[str], start: int, end: int) -> list[str]:
@@ -38,24 +46,60 @@ def replace_code_in_file(
     end_line: int | None,
     new_code: str,
 ) -> None:
+    """Replaces specified lines in a file with new code while preserving line endings.
+    
+    Args:
+        file_path: Path to file to modify
+        start_line: Starting line number (0-based) to replace
+        end_line: Ending line number to replace (exclusive)
+        new_code: New code to insert
+        
+    This function carefully preserves the original line endings (CRLF vs LF) of the file.
+    """
     path = Path(file_path)
-    new_code_lines = new_code.splitlines(keepends=True)
-    if len(new_code_lines) > 0 and not new_code_lines[-1].endswith("\n"):
-        new_code_lines[-1] += "\n"
-
-    if path.exists() and start_line is not None and end_line is not None:
-        """Replaces specified lines in a file with new code."""
-        text = path.read_text()
-
-        lines = text.splitlines(keepends=True)
-
-        # Insert the new code at the start line after converting it into a list of lines
-        lines[start_line:end_line] = handle_indent(lines, new_code_lines, start_line, end_line)
+    
+    # Read existing file in binary mode if it exists to determine endings
+    original_ending = b'\n'  # default to LF
+    original_content = b''
+    file_exists = path.exists()
+    
+    if file_exists:
+        with open(path, 'rb') as f:
+            original_content = f.read()
+            if b'\r\n' in original_content:
+                original_ending = b'\r\n'  # CRLF
+    
+    # Prepare new code with the correct line endings
+    new_code_lines = new_code.splitlines(keepends=False)
+    if len(new_code_lines) > 0:
+        # Encode each line and add detected/default ending
+        new_code_lines = [line.encode('utf-8') + original_ending for line in new_code_lines]
+    
+    if file_exists and start_line is not None and end_line is not None:
+        # Split existing content preserving original endings
+        lines = original_content.split(original_ending)
+        if original_content.endswith(original_ending):
+            lines = lines[:-1]  # Remove empty line from split if file ends with newline
+        lines = [line + original_ending for line in lines]
+        
+        # Convert new code lines for indentation handling
+        new_code_decoded = [line.decode('utf-8') for line in new_code_lines]
+        lines_decoded = [line.decode('utf-8') for line in lines]
+        
+        # Handle indentation
+        indented_lines = handle_indent(lines_decoded, new_code_decoded, start_line, end_line)
+        
+        # Convert back to bytes with correct endings
+        new_code_lines = [line.encode('utf-8') for line in indented_lines]
+        
+        # Replace the lines
+        lines[start_line:end_line] = new_code_lines
     else:
         lines = new_code_lines
 
-    # Save the modified contents back to the file
-    save_file_contents(file_path, "".join(lines))
+    # Join and write back in binary mode
+    content = b''.join(lines)
+    save_file_contents(file_path, content.decode('utf-8'))
 
 
 class ModifyCode(Step):