fix(langserver): add duplicated imports to references

Author: d-biehl

packages/robot/src/robotcode/robot/diagnostics/namespace_analyzer.py

@@ -1131,12 +1131,22 @@ def visit_VariablesImport(self, node: VariablesImport) -> None:  # noqa: N802
         if name_token is None:
             return
 
+        found = False
         entries = self.namespace.get_import_entries()
         if entries and self.namespace.document:
             for v in entries.values():
                 if v.import_source == self.namespace.source and v.import_range == range_from_token(name_token):
-                    if v not in self._namespace_references:
-                        self._namespace_references[v] = set()
+                    for k in self._namespace_references:
+                        if type(k) == type(v) and k.library_doc.source_or_origin == v.library_doc.source_or_origin:
+                            self._namespace_references[k].add(
+                                Location(self.namespace.document.document_uri, v.import_range)
+                            )
+                            found = True
+                            break
+                    if not found:
+                        if v not in self._namespace_references:
+                            self._namespace_references[v] = set()
+                    break
 
     def visit_ResourceImport(self, node: ResourceImport) -> None:  # noqa: N802
         if get_robot_version() >= (6, 1):
@@ -1146,12 +1156,22 @@ def visit_ResourceImport(self, node: ResourceImport) -> None:  # noqa: N802
         if name_token is None:
             return
 
+        found = False
         entries = self.namespace.get_import_entries()
         if entries and self.namespace.document:
             for v in entries.values():
                 if v.import_source == self.namespace.source and v.import_range == range_from_token(name_token):
-                    if v not in self._namespace_references:
-                        self._namespace_references[v] = set()
+                    for k in self._namespace_references:
+                        if type(k) == type(v) and k.library_doc.source_or_origin == v.library_doc.source_or_origin:
+                            self._namespace_references[k].add(
+                                Location(self.namespace.document.document_uri, v.import_range)
+                            )
+                            found = True
+                            break
+                    if not found:
+                        if v not in self._namespace_references:
+                            self._namespace_references[v] = set()
+                    break
 
     def visit_LibraryImport(self, node: LibraryImport) -> None:  # noqa: N802
         if get_robot_version() >= (6, 1):
@@ -1161,9 +1181,19 @@ def visit_LibraryImport(self, node: LibraryImport) -> None:  # noqa: N802
         if name_token is None:
             return
 
+        found = False
         entries = self.namespace.get_import_entries()
         if entries and self.namespace.document:
             for v in entries.values():
                 if v.import_source == self.namespace.source and v.import_range == range_from_token(name_token):
-                    if v not in self._namespace_references:
-                        self._namespace_references[v] = set()
+                    for k in self._namespace_references:
+                        if type(k) == type(v) and k.library_doc.source_or_origin == v.library_doc.source_or_origin:
+                            self._namespace_references[k].add(
+                                Location(self.namespace.document.document_uri, v.import_range)
+                            )
+                            found = True
+                            break
+                    if not found:
+                        if v not in self._namespace_references:
+                            self._namespace_references[v] = set()
+                    break

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-003-030-a_custom_library_with_path].out

@@ -12,6 +12,15 @@ result:
       character: 16
       line: 3
   uri: tests/code_action_show_documentation.robot
+- !Location
+  range:
+    end:
+      character: 47
+      line: 5
+    start:
+      character: 16
+      line: 5
+  uri: tests/code_action_show_documentation.robot
 - !Location
   range:
     end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-003-037-a_custom_library_with_path].out

@@ -12,6 +12,15 @@ result:
       character: 16
       line: 3
   uri: tests/code_action_show_documentation.robot
+- !Location
+  range:
+    end:
+      character: 47
+      line: 5
+    start:
+      character: 16
+      line: 5
+  uri: tests/code_action_show_documentation.robot
 - !Location
   range:
     end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-003-043-a_custom_library_with_path].out

@@ -12,6 +12,15 @@ result:
       character: 16
       line: 3
   uri: tests/code_action_show_documentation.robot
+- !Location
+  range:
+    end:
+      character: 47
+      line: 5
+    start:
+      character: 16
+      line: 5
+  uri: tests/code_action_show_documentation.robot
 - !Location
   range:
     end:

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

@@ -57,6 +57,15 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 7
+    start:
+      character: 11
+      line: 7
+  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

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

@@ -57,6 +57,15 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 7
+    start:
+      character: 11
+      line: 7
+  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

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

@@ -57,6 +57,15 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 7
+    start:
+      character: 11
+      line: 7
+  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

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

@@ -57,6 +57,15 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 7
+    start:
+      character: 11
+      line: 7
+  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

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

@@ -57,6 +57,15 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 7
+    start:
+      character: 11
+      line: 7
+  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end:

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

@@ -57,6 +57,15 @@ result:
       character: 10
       line: 6
   uri: tests/duplicated_resources.robot
+- !Location
+  range:
+    end:
+      character: 19
+      line: 7
+    start:
+      character: 11
+      line: 7
+  uri: tests/duplicated_resources.robot
 - !Location
   range:
     end: