Skip to content

Fix tree-sitter dependency graph path mismatch #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tristanmanchester wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix tree-sitter dependency graph path mismatch #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions desloppify/languages/_framework/treesitter/imports/graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,20 @@ def ts_build_dep_graph(
query = _make_query(language, spec.import_query)

scan_path = str(path.resolve())
file_set = set(file_list)
abs_file_list = [
filepath
if os.path.isabs(filepath)
else os.path.normpath(os.path.join(scan_path, filepath))
for filepath in file_list
]
file_set = set(abs_file_list)
graph: dict[str, dict[str, Any]] = {}

# Initialize all files in the graph.
for f in file_list:
for f in abs_file_list:
graph[f] = {"imports": set(), "importers": set()}

for filepath in file_list:
for filepath in abs_file_list:
cached = get_or_parse_tree(filepath, parser, spec.grammar)
if cached is None:
continue
Expand Down
12 changes: 8 additions & 4 deletions desloppify/tests/lang/common/test_treesitter_imports_direct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ def test_graph_helpers_build_internal_edges_and_builder(monkeypatch, tmp_path: P
source_file.parent.mkdir(parents=True)
source_file.write_text("<?php\n", encoding="utf-8")
dep_file.write_text("<?php\n", encoding="utf-8")
file_list = [str(source_file), str(dep_file)]
relative_file_list = [
str(source_file.relative_to(tmp_path)),
str(dep_file.relative_to(tmp_path)),
]
absolute_file_list = [str(source_file), str(dep_file)]

monkeypatch.setattr(graph_mod, "_get_parser", lambda _grammar: ("parser", "language"))
monkeypatch.setattr(graph_mod, "_make_query", lambda _language, source: source)
Expand Down Expand Up @@ -67,18 +71,18 @@ def test_graph_helpers_build_internal_edges_and_builder(monkeypatch, tmp_path: P
),
)

graph = graph_mod.ts_build_dep_graph(tmp_path, spec, file_list)
graph = graph_mod.ts_build_dep_graph(tmp_path, spec, relative_file_list)
assert graph[str(source_file)]["imports"] == {str(dep_file)}
assert graph[str(dep_file)]["importers"] == {str(source_file)}
assert graph[str(source_file)]["import_count"] == 1
assert graph[str(dep_file)]["importer_count"] == 1

builder = graph_mod.make_ts_dep_builder(spec, lambda _path: file_list)
builder = graph_mod.make_ts_dep_builder(spec, lambda _path: relative_file_list)
assert builder(tmp_path)[str(source_file)]["imports"] == {str(dep_file)}
assert graph_mod.ts_build_dep_graph(
tmp_path,
SimpleNamespace(import_query=None, resolve_import=None),
file_list,
absolute_file_list,
) == {}


Expand Down