dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-03 03:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #81 from paul-gauthier/issue-73

Browse source 
Prioritize how to allocate code blocks to filenames in wholefile
This commit is contained in:
paul-gauthier 2023-07-11 09:44:33 -07:00 • committed by GitHub
commit 7e17059b59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
aider/coders/wholefile_coder.py
View file

@ -38,14 +38,16 @@ class WholeFileCoder(Coder):
def update_files(self, mode="update"):
content = self.partial_response_content
edited = set()
chat_files = self.get_inchat_relative_files()
output = []
lines = content.splitlines(keepends=True)
edits = []
saw_fname = None
fname = None
fname_source = None
new_lines = []
for i, line in enumerate(lines):
if line.startswith(self.fence[0]) or line.startswith(self.fence[1]):
@ -57,17 +59,17 @@ class WholeFileCoder(Coder):
if mode == "diff":
output += self.do_live_diff(full_path, new_lines, True)
elif self.allowed_to_edit(fname):
edited.add(fname)
new_lines = "".join(new_lines)
self.io.write_text(full_path, new_lines)
else:
edits.append((fname, fname_source, new_lines))
fname = None
fname_source = None
new_lines = []
continue
# fname==None ... starting a new block
if i > 0:
fname_source = "block"
fname = lines[i - 1].strip()
# Did gpt prepend a bogus dir? It especially likes to
# include the path/to prefix from the one-shot example in
@ -77,8 +79,10 @@ class WholeFileCoder(Coder):
if not fname: # blank line? or ``` was on first line i==0
if saw_fname:
fname = saw_fname
fname_source = "saw"
elif len(chat_files) == 1:
fname = chat_files[0]
fname_source = "chat"
else:
# TODO: sense which file it is by diff size
raise ValueError(
@ -105,11 +109,22 @@ class WholeFileCoder(Coder):
return "\n".join(output)
if fname:
full_path = self.allowed_to_edit(fname)
if full_path:
edited.add(fname)
edits.append((fname, fname_source, new_lines))
edited = set()
# process from most reliable filename, to least reliable
for source in ("block", "saw", "chat"):
for fname, fname_source, new_lines in edits:
if fname_source != source:
continue
# if a higher priority source already edited the file, skip
if fname in edited:
continue
# we have a winner
new_lines = "".join(new_lines)
self.io.write_text(full_path, new_lines)
if self.allowed_to_edit(fname, new_lines):
edited.add(fname)
return edited