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

prioritize how to allocate code blocks to filenames

Browse source
This commit is contained in:
Paul Gauthier 2023-07-10 17:42:23 -07:00
parent fd8a6c4e2f
commit 6fc276d336
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
aider/coders/wholefile_coder.py
View file

@ -63,11 +63,13 @@ class WholeFileCoder(Coder):
edits.append((fname, fname_source, new_lines)) edits.append((fname, fname_source, new_lines))
fname = None fname = None
fname_source = None
new_lines = [] new_lines = []
continue continue
# fname==None ... starting a new block # fname==None ... starting a new block
if i > 0: if i > 0:
fname_source = "block"
fname = lines[i - 1].strip() fname = lines[i - 1].strip()
# Did gpt prepend a bogus dir? It especially likes to # Did gpt prepend a bogus dir? It especially likes to
# include the path/to prefix from the one-shot example in # 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 not fname: # blank line? or ``` was on first line i==0
if saw_fname: if saw_fname:
fname = saw_fname fname = saw_fname
fname_source = "saw"
elif len(chat_files) == 1: elif len(chat_files) == 1:
fname = chat_files[0] fname = chat_files[0]
fname_source = "chat"
else: else:
# TODO: sense which file it is by diff size # TODO: sense which file it is by diff size
raise ValueError( raise ValueError(
@ -108,7 +112,16 @@ class WholeFileCoder(Coder):
edits.append((fname, fname_source, new_lines)) edits.append((fname, fname_source, new_lines))
edited = set() edited = set()
# process from most reliable filename, to least reliable
for source in ("block", "saw", "chat"):
for fname, fname_source, new_lines in edits: 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) new_lines = "".join(new_lines)
if self.allowed_to_edit(fname, new_lines): if self.allowed_to_edit(fname, new_lines):
edited.add(fname) edited.add(fname)