strip_quoted_wrapping() incorrectly detects quoted wrappings #4093

aider/coders/editblock_coder.py

@@ -346,15 +346,17 @@ def strip_quoted_wrapping(res, fname=None, fence=DEFAULT_FENCE):
     if not res:
         return res
 
-    res = res.splitlines()
+    res_lines = res.splitlines()
 
-    if fname and res[0].strip().endswith(Path(fname).name):
-        res = res[1:]
+    if fname and len(res_lines) > 1 and res_lines[0].strip().endswith(Path(fname).name):
+        res_lines = res_lines[1:]
 
-    if res[0].startswith(fence[0]) and res[-1].startswith(fence[1]):
-        res = res[1:-1]
+    if res_lines[0].startswith(fence[0]) and res_lines[-1].startswith(fence[1]):
+        res_lines = res_lines[1:-1]
+    else:
+        return res  # Directly return the original string if it doesn't need to be stripped
 
-    res = "\n".join(res)
+    res = "\n".join(res_lines)
     if res and res[-1] != "\n":
         res += "\n"
 

tests/basic/test_editblock.py

@@ -89,6 +89,18 @@ def test_strip_quoted_wrapping_no_wrapping(self):
         result = eb.strip_quoted_wrapping(input_text)
         self.assertEqual(result, expected_output)
 
+    def test_strip_quoted_wrapping_filename_only(self):
+        input_text = "filename.ext\n"
+        expected_output = "filename.ext\n"
+        result = eb.strip_quoted_wrapping(input_text, "filename.ext")
+        self.assertEqual(result, expected_output)
+
+    def test_strip_quoted_wrapping_filename_ending(self):
+        input_text = "Line that ends with filename.ext\nA second line"
+        expected_output = "Line that ends with filename.ext\nA second line"
+        result = eb.strip_quoted_wrapping(input_text, "filename.ext")
+        self.assertEqual(result, expected_output)
+
     def test_find_original_update_blocks(self):
         edit = """
 Here's the change:

tests/basic/test_run_cmd.py

@@ -4,8 +4,9 @@
 
 
 def test_run_cmd_echo():
-    command = "echo Hello, World!"
+    # echo can work the same in both Linux and Windows if only echoing one word
+    command = "echo Hello!"
     exit_code, output = run_cmd(command)
 
     assert exit_code == 0
-    assert output.strip() == "Hello, World!"
+    assert output.strip() == "Hello!"