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

fix tests; fix off-by-one bug in output of repomap

Browse source
This commit is contained in:
Paul Gauthier 2023-10-18 15:42:38 -07:00
parent 10b856e0af
commit c0375d3328
2 changed files with 14 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
aider/repomap.py
View file

@ -28,12 +28,17 @@ def to_tree(tags):
cur_fname = None
context = None
output = ""
for tag in tags:
if type(tag) is tuple:
# add a bogus tag at the end so we trip the this_fname != cur_fname...
for tag in tags + [None]:
if tag is None:
this_fname = None
elif type(tag) is tuple:
this_fname = tag[0]
else:
this_fname = tag.rel_fname
# ... here ... to output the final real entry in the list
if this_fname != cur_fname:
if context:
context.add_context()
@ -45,7 +50,7 @@ def to_tree(tags):
elif cur_fname:
output += cur_fname + "\n"
if type(tag) is not tuple:
if type(tag) is Tag:
context = TreeContext(
tag.rel_fname,
Path(tag.fname).read_text(), # TODO: encoding
@ -120,7 +125,7 @@ class RepoMap:
num_tokens = self.token_count(files_listing)
if self.verbose:
self.io.tool_output(f"ctags map: {num_tokens/1024:.1f} k-tokens")
self.io.tool_output(f"ast map: {num_tokens/1024:.1f} k-tokens")
if chat_files:
other = "other "

33
tests/test_repomap.py
View file

@ -1,7 +1,7 @@
import os
import unittest
from unittest.mock import patch
from aider.dump import dump # noqa: F401
from aider.io import InputOutput
from aider.repomap import RepoMap
from tests.utils import IgnorantTemporaryDirectory
@ -89,33 +89,9 @@ print(my_function(3, 4))
# close the open cache files, so Windows won't error
del repo_map
def test_check_for_ctags_failure(self):
with patch("subprocess.run") as mock_run:
mock_run.side_effect = Exception("ctags not found")
repo_map = RepoMap(io=InputOutput())
self.assertFalse(repo_map.has_ctags)
def test_check_for_ctags_success(self):
with patch("subprocess.check_output") as mock_run:
mock_run.side_effect = [
(
b"Universal Ctags 0.0.0(f25b4bb7)\n Optional compiled features: +wildcards,"
b" +regex, +gnulib_fnmatch, +gnulib_regex, +iconv, +option-directory, +xpath,"
b" +json, +interactive, +yaml, +case-insensitive-filenames, +packcc,"
b" +optscript, +pcre2"
),
(
b'{"_type": "tag", "name": "status", "path": "aider/main.py", "pattern": "/^ '
b' status = main()$/", "kind": "variable"}'
),
]
repo_map = RepoMap(io=InputOutput())
self.assertTrue(repo_map.has_ctags)
def test_get_repo_map_without_ctags(self):
# Create a temporary directory with a sample Python file containing identifiers
def test_get_repo_map_all_files(self):
test_files = [
"test_file_without_ctags.py",
"test_file0.py",
"test_file1.txt",
"test_file2.md",
"test_file3.json",
@ -130,10 +106,11 @@ print(my_function(3, 4))
f.write("")
repo_map = RepoMap(root=temp_dir, io=InputOutput())
repo_map.has_ctags = False # force it off
other_files = [os.path.join(temp_dir, file) for file in test_files]
result = repo_map.get_repo_map([], other_files)
dump(other_files)
dump(repr(result))
# Check if the result contains each specific file in the expected tags map without ctags
for file in test_files: