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

refac

Browse source
This commit is contained in:
Paul Gauthier 2023-10-19 13:10:29 -07:00
parent ce3099fa8b
commit 5b99281d86
1 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
aider/repomap.py
View file

@ -71,7 +71,7 @@ def to_tree(tags):
class RepoMap: class RepoMap:
CACHE_VERSION = 2 CACHE_VERSION = 3
TAGS_CACHE_DIR = f".aider.tags.cache.v{CACHE_VERSION}" TAGS_CACHE_DIR = f".aider.tags.cache.v{CACHE_VERSION}"
cache_missing = False cache_missing = False
@ -181,6 +181,7 @@ class RepoMap:
captures = list(captures) captures = list(captures)
saw = set()
for node, tag in captures: for node, tag in captures:
if tag.startswith("name.definition."): if tag.startswith("name.definition."):
kind = "def" kind = "def"
@ -189,6 +190,8 @@ class RepoMap:
else: else:
continue continue
saw.add(kind)
result = Tag( result = Tag(
rel_fname=rel_fname, rel_fname=rel_fname,
fname=fname, fname=fname,
@ -199,6 +202,32 @@ class RepoMap:
yield result yield result
if "ref" in saw:
return
if "def" not in saw:
return
# We saw defs, without any refs
# Some tags files only provide defs (cpp, for example)
# Use pygments to backfill refs
try:
lexer = guess_lexer_for_filename(fname, code)
except ClassNotFound:
return
tokens = list(lexer.get_tokens(code))
tokens = [token[1] for token in tokens if token[0] in Token.Name]
for token in tokens:
yield Tag(
rel_fname=rel_fname,
fname=fname,
name=token,
kind="ref",
line=-1,
)
def get_ranked_tags(self, chat_fnames, other_fnames): def get_ranked_tags(self, chat_fnames, other_fnames):
defines = defaultdict(set) defines = defaultdict(set)
references = defaultdict(list) references = defaultdict(list)
@ -248,21 +277,6 @@ class RepoMap:
if tag.kind == "ref": if tag.kind == "ref":
references[tag.name].append(rel_fname) references[tag.name].append(rel_fname)
tag_kinds = set(tag.kind for tag in tags)
if "def" in tag_kinds and "ref" not in tag_kinds:
content = Path(fname).read_text() # TODO: encoding
try:
lexer = guess_lexer_for_filename(fname, content)
except ClassNotFound:
lexer = None
if lexer:
tokens = list(lexer.get_tokens(content))
tokens = [token[1] for token in tokens if token[0] in Token.Name]
for token in tokens:
references[token].append(rel_fname)
## ##
# dump(defines) # dump(defines)
# dump(references) # dump(references)