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

Handle missing filenames by scanning for mentions in the text

Browse source
This commit is contained in:
Paul Gauthier 2023-06-24 15:32:35 -07:00
parent f2a03e917d
commit ac560c2877
3 changed files with 61 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
aider/coders/base_coder.py
View file

@ -167,9 +167,10 @@ class Coder:
self.io.tool_output(f"Added {fname} to the chat.")
def find_common_root(self):
if self.abs_fnames:
common_prefix = os.path.commonpath(list(self.abs_fnames))
self.root = os.path.dirname(common_prefix)
if len(self.abs_fnames) == 1:
self.root = os.path.dirname(list(self.abs_fnames)[0])
elif self.abs_fnames:
self.root = os.path.commonpath(list(self.abs_fnames))
else:
self.root = os.getcwd()

17
aider/coders/wholefile_coder.py
View file

@ -32,13 +32,15 @@ class WholeFileCoder(Coder):
output = []
lines = content.splitlines(keepends=True)
saw_fname = None
fname = None
new_lines = []
for i, line in enumerate(lines):
dump(repr(fname), repr(line), repr(new_lines))
if line.startswith("```"):
if fname is not None:
# ending an existing block
saw_fname = None
full_path = (Path(self.root) / fname).absolute()
if mode == "diff" and full_path.exists():
@ -65,15 +67,24 @@ class WholeFileCoder(Coder):
if i > 0:
fname = lines[i - 1].strip()
if not fname: # blank line? or ``` was on first line i==0
if len(chat_files) == 1:
if saw_fname:
fname = saw_fname
elif len(chat_files) == 1:
fname = chat_files[0]
else:
# TODO: sense which file it is by diff size
raise ValueError("No filename provided before ``` block")
raise ValueError("No filename provided before ``` in file listing")
elif fname is not None:
new_lines.append(line)
else:
for word in line.strip().split():
word = word.rstrip(".:,;!")
for chat_file in chat_files:
quoted_chat_file = f"`{chat_file}`"
if word == quoted_chat_file:
saw_fname = chat_file
output.append(line)
if mode == "diff":