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

move the expansion into glob_filtered_to_repo so it works in drop too

Browse source
This commit is contained in:
Paul Gauthier 2023-07-10 15:17:41 -07:00
parent a88b2a70e8
commit 56f465b7f3
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
aider/commands.py
View file

@ -221,15 +221,18 @@ class Commands:
yield Completion(fname, start_position=-len(partial)) yield Completion(fname, start_position=-len(partial))
def glob_filtered_to_repo(self, pattern): def glob_filtered_to_repo(self, pattern):
matched_files = Path(self.coder.root).glob(pattern) raw_matched_files = Path(self.coder.root).glob(pattern)
matched_files = [fn.relative_to(self.coder.root) for fn in matched_files] matched_files = []
for fn in raw_matched_files:
matched_files += expand_subdir(fn.relative_to(self.coder.root))
# if repo, filter against it # if repo, filter against it
if self.coder.repo: if self.coder.repo:
git_files = self.coder.get_tracked_files() git_files = self.coder.get_tracked_files()
matched_files = [fn for fn in matched_files if str(fn) in git_files] matched_files = [fn for fn in matched_files if str(fn) in git_files]
return list(map(str, matched_files)) res = list(map(str, matched_files))
return res
def cmd_add(self, args): def cmd_add(self, args):
"Add matching files to the chat session using glob patterns" "Add matching files to the chat session using glob patterns"
@ -238,7 +241,7 @@ class Commands:
git_added = [] git_added = []
git_files = self.coder.get_tracked_files() git_files = self.coder.get_tracked_files()
expanded_files = set() all_matched_files = set()
for word in args.split(): for word in args.split():
matched_files = self.glob_filtered_to_repo(word) matched_files = self.glob_filtered_to_repo(word)
@ -254,13 +257,9 @@ class Commands:
(Path(self.coder.root) / word).touch() (Path(self.coder.root) / word).touch()
matched_files = [word] matched_files = [word]
for matched_file in matched_files: all_matched_files.update(matched_files)
if Path(matched_file).is_dir():
expanded_files.update(expand_subdir(matched_file))
else:
expanded_files.add(matched_file)
for matched_file in expanded_files: for matched_file in all_matched_files:
abs_file_path = self.coder.abs_root_path(matched_file) abs_file_path = self.coder.abs_root_path(matched_file)
if self.coder.repo and matched_file not in git_files: if self.coder.repo and matched_file not in git_files:
@ -390,6 +389,11 @@ class Commands:
def expand_subdir(file_path): def expand_subdir(file_path):
for file in Path(file_path).rglob("*"): file_path = Path(file_path)
if file_path.is_file():
yield file_path
return
for file in file_path.rglob("*"):
if file.is_file(): if file.is_file():
yield str(file) yield str(file)