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

Handle existing dirnames with [globby] chars, with test #195

Browse source
This commit is contained in:
Paul Gauthier 2024-04-30 15:50:24 -07:00
parent a3a4d87a0c
commit e610e5bd0a
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
aider/commands.py
View file

@ -349,10 +349,12 @@ class Commands:
self.io.tool_error(f"Skipping {fname} that matches aiderignore spec.") self.io.tool_error(f"Skipping {fname} that matches aiderignore spec.")
continue continue
if fname.exists() and fname.is_file(): if fname.exists():
all_matched_files.add(str(fname)) if fname.is_file():
continue all_matched_files.add(str(fname))
# an existing dir will fall through and get recursed by glob continue
# an existing dir, escape any special chars so they won't be globs
word = re.sub(r"([\*\?\[\]])", r"[\1]", word)
matched_files = self.glob_filtered_to_repo(word) matched_files = self.glob_filtered_to_repo(word)
if matched_files: if matched_files:

17
tests/test_commands.py
View file

@ -386,6 +386,23 @@ class TestCommands(TestCase):
self.assertIn(str(fname.resolve()), coder.abs_fnames) self.assertIn(str(fname.resolve()), coder.abs_fnames)
def test_cmd_add_dirname_with_special_chars(self):
with ChdirTemporaryDirectory():
io = InputOutput(pretty=False, yes=False)
from aider.coders import Coder
coder = Coder.create(self.GPT35, None, io)
commands = Commands(io, coder)
dname = Path("with[brackets]")
dname.mkdir()
fname = dname / "filename.txt"
fname.touch()
commands.cmd_add(str(dname))
self.assertIn(str(fname.resolve()), coder.abs_fnames)
def test_cmd_add_abs_filename(self): def test_cmd_add_abs_filename(self):
with ChdirTemporaryDirectory(): with ChdirTemporaryDirectory():
io = InputOutput(pretty=False, yes=False) io = InputOutput(pretty=False, yes=False)