dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-30 09:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'main' into edit-formats

Browse source
This commit is contained in:
Paul Gauthier 2023-06-23 07:54:24 -07:00
commit fc6dd1877c
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aider/coders/editblock_coder.py
View file

@ -95,7 +95,7 @@ def replace_part_with_missing_leading_whitespace(whole, part, replace):
# If all lines in the part start with whitespace, then honor it. # If all lines in the part start with whitespace, then honor it.
# But GPT often outdents the part and replace blocks completely, # But GPT often outdents the part and replace blocks completely,
# thereby discarding the actual leading whitespace in the file. # thereby discarding the actual leading whitespace in the file.
if all((len(pline) > 0 and pline[0].isspace()) for pline in part_lines): if all((not pline or pline[0].isspace()) for pline in part_lines):
return return
for i in range(len(whole_lines) - len(part_lines) + 1): for i in range(len(whole_lines) - len(part_lines) + 1):

14
tests/test_editblock.py
View file

@ -209,6 +209,20 @@ These changes replace the `subprocess.run` patches with `subprocess.check_output
result = eb.replace_part_with_missing_leading_whitespace(whole, part, replace) result = eb.replace_part_with_missing_leading_whitespace(whole, part, replace)
self.assertEqual(result, expected_output) self.assertEqual(result, expected_output)
def test_replace_part_with_missing_leading_whitespace_including_blank_lines(self):
"""
The part has leading whitespace on all lines, so should be ignored.
But it has a *blank* line with no whitespace at all, which was causing a
bug per issue #25. Test case to repro and confirm fix.
"""
whole = " line1\n line2\n line3\n"
part = "\n line1\n line2"
replace = "new_line1\nnew_line2"
expected_output = None
result = utils.replace_part_with_missing_leading_whitespace(whole, part, replace)
self.assertEqual(result, expected_output)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()