fix(langserver): correct importing variables with the same filename

closes [BUG] Variables from variable files are often displayed as not found #214

Author: d-biehl

packages/language_server/src/robotcode/language_server/robotframework/parts/references.py

@@ -543,7 +543,7 @@ def _find_variables_import_references_in_file(self, doc: TextDocument, library_d
         namespace = self.parent.documents_cache.get_namespace(doc)
 
         result: List[Location] = []
-        for lib_entry in (namespace.get_imported_variables()).values():
+        for lib_entry in namespace.get_imported_variables().values():
             if lib_entry.import_source == str(doc.uri.to_path()) and lib_entry.library_doc.source == library_doc.source:
                 result.append(Location(str(doc.uri), lib_entry.import_range))
 

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

@@ -2118,14 +2118,19 @@ def get_variables_doc(
             if import_name.lower().endswith((".yaml", ".yml")):
                 source = import_name
                 importer = YamlImporter()
+                stem = Path(import_name).stem
             elif get_robot_version() >= (6, 1) and import_name.lower().endswith(".json"):
                 source = import_name
                 importer = JsonImporter()
+                stem = Path(import_name).stem
             else:
                 python_import = True
 
                 if not is_variables_by_path(import_name):
+                    stem = import_name
                     module_spec = get_module_spec(import_name)
+                else:
+                    stem = Path(import_name).stem
 
                 # skip antigravity easter egg
                 # see https://python-history.blogspot.com/2010/06/import-antigravity.html

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

@@ -1292,8 +1292,8 @@ def _import(
                                 code=Error.VARIABLES_ALREADY_IMPORTED,
                             )
 
-                        if (entry.alias or entry.name or entry.import_name) not in self._variables:
-                            self._variables[entry.alias or entry.name or entry.import_name] = entry
+                        if entry.library_doc is not None and entry.library_doc.source_or_origin:
+                            self._variables[entry.library_doc.source_or_origin] = entry
 
                     elif isinstance(entry, LibraryEntry):
                         if top_level and entry.name == BUILTIN_LIBRARY_NAME and entry.alias is None:

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

@@ -24,11 +24,11 @@ result:
 - !Location
   range:
     end:
-      character: 24
-      line: 9
+      character: 26
+      line: 10
     start:
-      character: 13
-      line: 9
+      character: 12
+      line: 10
   uri: tests/duplicated_resources.robot
 - !Location
   range:

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

@@ -24,11 +24,11 @@ result:
 - !Location
   range:
     end:
-      character: 24
-      line: 9
+      character: 26
+      line: 10
     start:
-      character: 13
-      line: 9
+      character: 12
+      line: 10
   uri: tests/duplicated_resources.robot
 - !Location
   range:

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

@@ -24,11 +24,11 @@ result:
 - !Location
   range:
     end:
-      character: 24
-      line: 9
+      character: 26
+      line: 10
     start:
-      character: 13
-      line: 9
+      character: 12
+      line: 10
   uri: tests/duplicated_resources.robot
 - !Location
   range:

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

@@ -24,11 +24,11 @@ result:
 - !Location
   range:
     end:
-      character: 24
-      line: 9
+      character: 26
+      line: 10
     start:
-      character: 13
-      line: 9
+      character: 12
+      line: 10
   uri: tests/duplicated_resources.robot
 - !Location
   range:

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

@@ -24,11 +24,11 @@ result:
 - !Location
   range:
     end:
-      character: 24
-      line: 9
+      character: 26
+      line: 10
     start:
-      character: 13
-      line: 9
+      character: 12
+      line: 10
   uri: tests/duplicated_resources.robot
 - !Location
   range:

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

@@ -24,11 +24,11 @@ result:
 - !Location
   range:
     end:
-      character: 24
-      line: 9
+      character: 26
+      line: 10
     start:
-      character: 13
-      line: 9
+      character: 12
+      line: 10
   uri: tests/duplicated_resources.robot
 - !Location
   range:

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

@@ -24,11 +24,11 @@ result:
 - !Location
   range:
     end:
-      character: 24
-      line: 9
+      character: 26
+      line: 10
     start:
-      character: 13
-      line: 9
+      character: 12
+      line: 10
   uri: tests/duplicated_resources.robot
 - !Location
   range: