From 10b856e0af7d66da1f94072ae46978e2e429ea38 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Wed, 18 Oct 2023 15:18:12 -0700 Subject: [PATCH] cleanup --- aider/coders/base_coder.py | 2 +- aider/parsers.py | 58 -------------------------------------- aider/repomap.py | 7 +---- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 aider/parsers.py diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index 6a1478a93..5c90ddfe9 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -178,7 +178,7 @@ class Coder: ) if map_tokens > 0: - self.io.tool_output(f"Repo-map: universal-ctags using {map_tokens} tokens") + self.io.tool_output(f"Repo-map: using {map_tokens} tokens") else: self.io.tool_output("Repo-map: disabled because map_tokens == 0") diff --git a/aider/parsers.py b/aider/parsers.py deleted file mode 100644 index 9353a3493..000000000 --- a/aider/parsers.py +++ /dev/null @@ -1,58 +0,0 @@ -import os - -# Updated mapping of file extensions to parsers -PARSERS = { - ".py": "python", - ".js": "javascript", - ".go": "go", - ".bash": "bash", - ".c": "c", - ".cs": "c-sharp", - ".cl": "commonlisp", - ".cpp": "cpp", - ".css": "css", - ".dockerfile": "dockerfile", - ".dot": "dot", - ".el": "elisp", - ".ex": "elixir", - ".elm": "elm", - ".et": "embedded-template", - ".erl": "erlang", - ".gomod": "go-mod", - ".hack": "hack", - ".hs": "haskell", - ".hcl": "hcl", - ".html": "html", - ".java": "java", - ".jsdoc": "jsdoc", - ".json": "json", - ".jl": "julia", - ".kt": "kotlin", - ".lua": "lua", - ".mk": "make", - # ".md": "markdown", - ".m": "objc", - ".ml": "ocaml", - ".pl": "perl", - ".php": "php", - ".ql": "ql", - ".r": "r", - ".regex": "regex", - ".rst": "rst", - ".rb": "ruby", - ".rs": "rust", - ".scala": "scala", - ".sql": "sql", - ".sqlite": "sqlite", - ".toml": "toml", - ".tsq": "tsq", - ".tsx": "typescript", - ".ts": "typescript", - ".yaml": "yaml", -} - - -def filename_to_lang(filename): - file_extension = os.path.splitext(filename)[1] - lang = PARSERS.get(file_extension) - return lang diff --git a/aider/repomap.py b/aider/repomap.py index c210aab8a..2198eb93f 100644 --- a/aider/repomap.py +++ b/aider/repomap.py @@ -8,12 +8,11 @@ from pathlib import Path import networkx as nx import pkg_resources from diskcache import Cache -from grep_ast import TreeContext +from grep_ast import TreeContext, filename_to_lang from tqdm import tqdm from tree_sitter_languages import get_language, get_parser from aider import models -from aider.parsers import filename_to_lang from .dump import dump # noqa: F402 @@ -183,8 +182,6 @@ class RepoMap: scm_fname = pkg_resources.resource_filename( __name__, os.path.join("queries", f"tree-sitter-{lang}-tags.scm") ) - dump(fname) - dump(scm_fname) query_scm = Path(scm_fname) if not query_scm.exists(): return @@ -198,10 +195,8 @@ class RepoMap: captures = query.captures(tree.root_node) captures = list(captures) - dump(captures) for node, tag in captures: - dump(node, tag) if tag.startswith("name.definition."): kind = "def" elif tag.startswith("name.reference."):