dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-31 17:55:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

More clear feedback when SEARCH/REPLACE blocks fail to match

Browse source
This commit is contained in:
Paul Gauthier 2024-05-11 10:25:16 -07:00
parent 478b5c8e7c
commit 5ec441dd2c
1 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

45
aider/coders/editblock_coder.py
View file

@ -24,24 +24,47 @@ class EditBlockCoder(Coder):
return edits return edits
def apply_edits(self, edits): def apply_edits(self, edits):
for path, original, updated in edits: failed = []
passed = []
for edit in edits:
path, original, updated = edit
full_path = self.abs_root_path(path) full_path = self.abs_root_path(path)
content = self.io.read_text(full_path) content = self.io.read_text(full_path)
content = do_replace(full_path, content, original, updated, self.fence) content = do_replace(full_path, content, original, updated, self.fence)
if content: if content:
self.io.write_text(full_path, content) self.io.write_text(full_path, content)
continue passed.append(edit)
raise ValueError(f"""InvalidEditBlock: edit failed! else:
failed.append(edit)
{path} does not contain the *exact chunk* of SEARCH lines you specified. if not failed:
Try again. return
DO NOT skip blank lines, comments, docstrings, etc!
The SEARCH block needs to be EXACTLY the same as the lines in {path} with nothing missing!
{path} does not contain these {len(original.splitlines())} exact lines in a row: blocks = "block" if len(failed) == 1 else "blocks"
```
{original}``` res = f"# {len(failed)} SEARCH/REPLACE {blocks} failed to match!\n"
""") for edit in failed:
path, original, updated = edit
res += f"""
## SearchReplaceNoExactMatch: This SEARCH block failed to exactly match lines in {path}
<<<<<<< SEARCH
{original}
=======
{updated}
>>>>>>> REPLACE
"""
res += (
"\nThe SEARCH section must exactly match an existing block of lines including all white"
" space, comments, indentation, docstrings, etc\n"
)
if passed:
pblocks = "block" if len(passed) == 1 else "blocks"
res += f"""
# The other {len(passed)} SEARCH/REPLACE {pblocks} were applied successfully.
Don't re-send them.
Just reply with fixed versions of the {blocks} above that failed to match.
"""
raise ValueError(res)
def prep(content): def prep(content):