fix(robotlangserver): resolving imports with arguments in diffent files and folders but with same string representation ie. ${curdir}/blah.py now works correctly

Author: d-biehl

robotcode/language_server/robotframework/diagnostics/imports_manager.py

@@ -73,6 +73,7 @@
     is_embedded_keyword,
     is_library_by_path,
     is_variables_by_path,
+    resolve_args,
     resolve_variable,
 )
 
@@ -1056,7 +1057,14 @@ async def _get_libdoc(name: str, args: Tuple[Any, ...], working_dir: str, base_d
 
                 return result
 
-        entry_key = _LibrariesEntryKey(source, args)
+        resolved_args = resolve_args(
+            args,
+            str(self.folder.to_path()),
+            base_dir,
+            self.config.robot.variables if self.config.robot is not None else None,
+            variables,
+        )
+        entry_key = _LibrariesEntryKey(source, resolved_args)
 
         async with self._libaries_lock:
             if entry_key not in self._libaries:
@@ -1293,7 +1301,14 @@ async def _get_libdoc() -> VariablesDoc:
                     self._logger.exception(e)
                 return result
 
-        entry_key = _VariablesEntryKey(source, args)
+        resolved_args = resolve_args(
+            args,
+            str(self.folder.to_path()),
+            base_dir,
+            self.config.robot.variables if self.config.robot is not None else None,
+            variables,
+        )
+        entry_key = _VariablesEntryKey(source, resolved_args)
 
         async with self._variables_lock:
             if entry_key not in self._variables:

robotcode/language_server/robotframework/diagnostics/library_doc.py

@@ -1468,6 +1468,25 @@ def _find_variables_internal(
     return (result, robot_variables)
 
 
+def resolve_args(
+    args: Tuple[Any, ...],
+    working_dir: str = ".",
+    base_dir: str = ".",
+    command_line_variables: Optional[Dict[str, Optional[Any]]] = None,
+    variables: Optional[Dict[str, Optional[Any]]] = None,
+) -> Tuple[Any, ...]:
+    robot_variables = resolve_robot_variables(working_dir, base_dir, command_line_variables, variables)
+
+    result = []
+    for arg in args:
+        if isinstance(arg, str):
+            result.append(robot_variables.replace_string(arg, ignore_errors=True))
+        else:
+            result.append(arg)
+
+    return tuple(result)
+
+
 def find_variables(
     name: str,
     working_dir: str = ".",