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

fix: handle updated edits array in apply_edits return value

Browse source
This commit is contained in:
Paul Gauthier 2024-10-29 14:10:19 -07:00 • committed by Paul Gauthier (aider)
parent eb9a73bdb0
commit f9604633e6
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aider/coders/base_coder.py
View file

@ -1812,6 +1812,8 @@ class Coder:
try: try:
edits = self.get_edits() edits = self.get_edits()
edits = self.prepare_to_edit(edits) edits = self.prepare_to_edit(edits)
# ai: handle the case where apply_edits returns an updated edits array (it may just return None, meaning use the existing edits array)!
edited = set(edit[0] for edit in edits) edited = set(edit[0] for edit in edits)
self.apply_edits(edits) self.apply_edits(edits)
except ValueError as err: except ValueError as err:

3
aider/coders/editblock_coder.py
View file

@ -50,6 +50,7 @@ class EditBlockCoder(Coder):
content = self.io.read_text(full_path) content = self.io.read_text(full_path)
new_content = do_replace(full_path, content, original, updated, self.fence) new_content = do_replace(full_path, content, original, updated, self.fence)
if new_content: if new_content:
# ai: update the edits array to reflect the actually edited file
break break
if new_content: if new_content:
@ -59,7 +60,7 @@ class EditBlockCoder(Coder):
failed.append(edit) failed.append(edit)
if not failed: if not failed:
return return # ai: return the updated list of edits
blocks = "block" if len(failed) == 1 else "blocks" blocks = "block" if len(failed) == 1 else "blocks"