tiennm99/serena
1
0
Fork 0
mirror of https://github.com/tiennm99/serena.git synced 2026-09-03 06:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

LS: use File symbol instead of Module

Browse Source
This commit is contained in:
Michael Panchenko
2025-03-25 22:24:00 +01:00
parent 5adc2f130e
commit 79140e9f80
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/multilspy/language_server.py
+6 -5
View File
@@ -811,10 +811,10 @@ class LanguageServer:
_, root_nodes = await self.request_document_symbols(item_path, include_body=include_body)
# Create module symbol
module_symbol = multilspy_types.UnifiedSymbolInformation( # type: ignore
# Create file symbol
file_symbol = multilspy_types.UnifiedSymbolInformation( # type: ignore
name=os.path.splitext(item)[0],
kind=multilspy_types.SymbolKind.Module,
kind=multilspy_types.SymbolKind.File,
location=multilspy_types.Location(
uri=str(pathlib.Path(abs_item_path).as_uri()),
range={"start": {"line": 0, "character": 0}, "end": {"line": 0, "character": 0}},
@@ -824,7 +824,7 @@ class LanguageServer:
children=root_nodes
)
package_symbol["children"].append(module_symbol)
package_symbol["children"].append(file_symbol)
return result
@@ -907,7 +907,7 @@ class LanguageServer:
roots = await self.request_full_symbol_tree()
paths = []
def collect_module_files(symbol):
if symbol["kind"] == multilspy_types.SymbolKind.Module:
if symbol["kind"] == multilspy_types.SymbolKind.File:
assert "location" in symbol
paths.append(symbol["location"]["relativePath"])
@@ -946,6 +946,7 @@ class LanguageServer:
all_files = await self.request_parsed_files()
for path in all_files:
# Apply glob filters if provided
# TODO: fnmatch is not exactly the same as glob
if paths_include_glob and not fnmatch(path, paths_include_glob):
self.logger.log(f"Skipping {path}: does not match include pattern {paths_include_glob}", logging.DEBUG)
continue
test/multilspy/test_symbol_retrieval.py
+2 -2
View File
@@ -338,7 +338,7 @@ class TestLanguageServerSymbols:
examples_package = next(child for child in repo_structure[0]["children"] if child["name"] == "examples")
# assert that children are __init__ and user_management
assert {child["name"] for child in examples_package["children"]} == {"__init__", "user_management"}
assert {child["kind"] for child in examples_package["children"]} == {SymbolKind.Module}
assert {child["kind"] for child in examples_package["children"]} == {SymbolKind.File}
# assert that tree of user_management node is same as retrieved directly
user_management_node = next(child for child in examples_package["children"] if child["name"] == "user_management")
@@ -357,7 +357,7 @@ class TestLanguageServerSymbols:
assert examples_package["kind"] == SymbolKind.Package
# assert that children are __init__ and user_management
assert {child["name"] for child in examples_package["children"]} == {"__init__", "user_management"}
assert {child["kind"] for child in examples_package["children"]} == {SymbolKind.Module}
assert {child["kind"] for child in examples_package["children"]} == {SymbolKind.File}
# assert that tree of user_management node is same as retrieved directly
user_management_node = next(child for child in examples_package["children"] if child["name"] == "user_management")