Skip to content

Commit f0eb9c9

Browse files
committed
fix: use import nodes to add references for libraries/resources and variables
1 parent fbedcf9 commit f0eb9c9

File tree

38 files changed

+333
-3
lines changed

38 files changed

+333
-3
lines changed

packages/language_server/src/robotcode/language_server/robotframework/diagnostics/analyzer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ async def visit_VariablesImport(self, node: ast.AST) -> None: # noqa: N802
10511051
if name_token is None:
10521052
return
10531053

1054-
entries = await self.namespace.get_imported_variables()
1054+
entries = await self.namespace.get_import_entries()
10551055
if entries and self.namespace.document:
10561056
for v in entries.values():
10571057
if v.import_source == self.namespace.source and v.import_range == range_from_token(name_token):
@@ -1071,7 +1071,7 @@ async def visit_ResourceImport(self, node: ast.AST) -> None: # noqa: N802
10711071
if name_token is None:
10721072
return
10731073

1074-
entries = await self.namespace.get_resources()
1074+
entries = await self.namespace.get_import_entries()
10751075
if entries and self.namespace.document:
10761076
for v in entries.values():
10771077
if v.import_source == self.namespace.source and v.import_range == range_from_token(name_token):
@@ -1091,7 +1091,7 @@ async def visit_LibraryImport(self, node: ast.AST) -> None: # noqa: N802
10911091
if name_token is None:
10921092
return
10931093

1094-
entries = await self.namespace.get_libraries()
1094+
entries = await self.namespace.get_import_entries()
10951095
if entries and self.namespace.document:
10961096
for v in entries.values():
10971097
if v.import_source == self.namespace.source and v.import_range == range_from_token(name_token):

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-006-033-a_variable_import].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ result:
2121
character: 16
2222
line: 4
2323
uri: tests/document_highlight.robot
24+
- !Location
25+
range:
26+
end:
27+
character: 26
28+
line: 10
29+
start:
30+
character: 12
31+
line: 10
32+
uri: tests/duplicated_resources.robot
2433
- !Location
2534
range:
2635
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-006-040-a_variable_import].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ result:
2121
character: 16
2222
line: 4
2323
uri: tests/document_highlight.robot
24+
- !Location
25+
range:
26+
end:
27+
character: 26
28+
line: 10
29+
start:
30+
character: 12
31+
line: 10
32+
uri: tests/duplicated_resources.robot
2433
- !Location
2534
range:
2635
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-006-046-a_variable_import].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ result:
2121
character: 16
2222
line: 4
2323
uri: tests/document_highlight.robot
24+
- !Location
25+
range:
26+
end:
27+
character: 26
28+
line: 10
29+
start:
30+
character: 12
31+
line: 10
32+
uri: tests/duplicated_resources.robot
2433
- !Location
2534
range:
2635
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-011-016-a_custom_library].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ result:
4848
character: 16
4949
line: 10
5050
uri: tests/document_highlight.robot
51+
- !Location
52+
range:
53+
end:
54+
character: 21
55+
line: 6
56+
start:
57+
character: 10
58+
line: 6
59+
uri: tests/duplicated_resources.robot
5160
- !Location
5261
range:
5362
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-011-020-a_custom_library].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ result:
4848
character: 16
4949
line: 10
5050
uri: tests/document_highlight.robot
51+
- !Location
52+
range:
53+
end:
54+
character: 21
55+
line: 6
56+
start:
57+
character: 10
58+
line: 6
59+
uri: tests/duplicated_resources.robot
5160
- !Location
5261
range:
5362
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-011-023-a_custom_library].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ result:
4848
character: 16
4949
line: 10
5050
uri: tests/document_highlight.robot
51+
- !Location
52+
range:
53+
end:
54+
character: 21
55+
line: 6
56+
start:
57+
character: 10
58+
line: 6
59+
uri: tests/duplicated_resources.robot
5160
- !Location
5261
range:
5362
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-013-016-a_same_custom_library].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ result:
4848
character: 16
4949
line: 10
5050
uri: tests/document_highlight.robot
51+
- !Location
52+
range:
53+
end:
54+
character: 21
55+
line: 6
56+
start:
57+
character: 10
58+
line: 6
59+
uri: tests/duplicated_resources.robot
5160
- !Location
5261
range:
5362
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-013-020-a_same_custom_library].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ result:
4848
character: 16
4949
line: 10
5050
uri: tests/document_highlight.robot
51+
- !Location
52+
range:
53+
end:
54+
character: 21
55+
line: 6
56+
start:
57+
character: 10
58+
line: 6
59+
uri: tests/duplicated_resources.robot
5160
- !Location
5261
range:
5362
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-013-023-a_same_custom_library].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ result:
4848
character: 16
4949
line: 10
5050
uri: tests/document_highlight.robot
51+
- !Location
52+
range:
53+
end:
54+
character: 21
55+
line: 6
56+
start:
57+
character: 10
58+
line: 6
59+
uri: tests/duplicated_resources.robot
5160
- !Location
5261
range:
5362
end:

0 commit comments

Comments
 (0)