fix(langserver): single resource file with different relative paths is not seen as same file

fixes #173

Author: d-biehl

packages/core/src/robotcode/core/uri.py

@@ -181,6 +181,6 @@ def __iter__(self) -> Iterator[str]:
 
     def normalized(self) -> Uri:
         if self.scheme == "file":
-            return Uri.from_path(self.to_path().absolute())
+            return Uri.from_path(self.to_path().resolve())
 
         return Uri(str(self))

packages/debugger/src/robotcode/debugger/listeners.py

@@ -142,9 +142,9 @@ def log_message(self, message: Dict[str, Any]) -> None:
             item_id = next(
                 (
                     (
-                        f"{Path(item.source).absolute() if item.source is not None else ''};{item.longname}"
+                        f"{Path(item.source).resolve() if item.source is not None else ''};{item.longname}"
                         if item.type == "SUITE"
-                        else f"{Path(item.source).absolute() if item.source is not None else ''};"
+                        else f"{Path(item.source).resolve() if item.source is not None else ''};"
                         f"{item.longname};{item.line}"
                     )
                     for item in Debugger.instance().full_stack_frames
@@ -189,9 +189,9 @@ def message(self, message: Dict[str, Any]) -> None:
             item_id = next(
                 (
                     (
-                        f"{Path(item.source).absolute() if item.source is not None else ''};{item.longname}"
+                        f"{Path(item.source).resolve() if item.source is not None else ''};{item.longname}"
                         if item.type == "SUITE"
-                        else f"{Path(item.source).absolute() if item.source is not None else ''};"
+                        else f"{Path(item.source).resolve() if item.source is not None else ''};"
                         f"{item.longname};{item.line}"
                     )
                     for item in Debugger.instance().full_stack_frames
@@ -264,15 +264,15 @@ def start_suite(self, data: running.TestSuite, result: result.TestSuite) -> None
 
         def enqueue(item: Union[running.TestSuite, running.TestCase]) -> Iterator[str]:
             if isinstance(item, running.TestSuite):
-                yield f"{Path(item.source).absolute() if item.source is not None else ''};{item.longname}"
+                yield f"{Path(item.source).resolve() if item.source is not None else ''};{item.longname}"
 
                 for s in item.suites:
                     yield from enqueue(s)
                 for s in item.tests:
                     yield from enqueue(s)
                 return
 
-            yield f"{Path(item.source).absolute() if item.source is not None else ''};{item.longname};{item.lineno}"
+            yield f"{Path(item.source).resolve() if item.source is not None else ''};{item.longname};{item.lineno}"
 
         if self._event_sended:
             return

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

@@ -190,7 +190,7 @@ async def check_file_changed(self, changes: List[FileEvent]) -> Optional[FileCha
                         self._lib_doc.module_spec is not None
                         and self._lib_doc.module_spec.submodule_search_locations is not None
                         and any(
-                            path_is_relative_to(path, Path(e).absolute())
+                            path_is_relative_to(path, Path(e).resolve())
                             for e in self._lib_doc.module_spec.submodule_search_locations
                         )
                     )
@@ -204,7 +204,7 @@ async def check_file_changed(self, changes: List[FileEvent]) -> Optional[FileCha
                         self._lib_doc.module_spec is None
                         and not self._lib_doc.source
                         and self._lib_doc.python_path
-                        and any(path_is_relative_to(path, Path(e).absolute()) for e in self._lib_doc.python_path)
+                        and any(path_is_relative_to(path, Path(e).resolve()) for e in self._lib_doc.python_path)
                     )
                 ):
                     await self._invalidate()
@@ -230,14 +230,14 @@ async def _update(self) -> None:
                 await self.parent.parent_protocol.workspace.add_file_watchers(
                     self.parent.did_change_watched_files,
                     [
-                        str(Path(location).absolute().joinpath("**"))
+                        str(Path(location).resolve().joinpath("**"))
                         for location in self._lib_doc.module_spec.submodule_search_locations
                     ],
                 )
             )
 
             if source_or_origin is not None and Path(source_or_origin).parent in [
-                Path(loc).absolute() for loc in self._lib_doc.module_spec.submodule_search_locations
+                Path(loc).resolve() for loc in self._lib_doc.module_spec.submodule_search_locations
             ]:
                 return
 
@@ -315,7 +315,7 @@ async def check_file_changed(self, changes: List[FileEvent]) -> Optional[FileCha
                 path = uri.to_path()
                 if (
                     self._document is not None
-                    and (path.absolute() == self._document.uri.to_path().absolute())
+                    and (path.resolve() == self._document.uri.to_path().resolve())
                     or self._document is None
                 ):
                     await self._invalidate()
@@ -423,11 +423,7 @@ async def check_file_changed(self, changes: List[FileEvent]) -> Optional[FileCha
                     continue
 
                 path = uri.to_path()
-                if (
-                    self._lib_doc.source
-                    and path.exists()
-                    and path.absolute().samefile(Path(self._lib_doc.source).absolute())
-                ):
+                if self._lib_doc.source and path.exists() and path.samefile(Path(self._lib_doc.source)):
                     await self._invalidate()
 
                     return change.type
@@ -859,14 +855,14 @@ async def get_library_meta(
                     return None, import_name
 
                 if result.origin is not None:
-                    result.mtimes = {result.origin: Path(result.origin).absolute().stat().st_mtime_ns}
+                    result.mtimes = {result.origin: Path(result.origin).stat().st_mtime_ns}
 
                 if result.submodule_search_locations:
                     if result.mtimes is None:
                         result.mtimes = {}
                     result.mtimes.update(
                         {
-                            str(f): f.absolute().stat().st_mtime_ns
+                            str(f): f.stat().st_mtime_ns
                             for f in itertools.chain(
                                 *(iter_files(loc, "**/*.py") for loc in result.submodule_search_locations)
                             )
@@ -928,14 +924,14 @@ async def get_variables_meta(
                     return None, import_name
 
                 if result.origin is not None:
-                    result.mtimes = {result.origin: Path(result.origin).absolute().stat().st_mtime_ns}
+                    result.mtimes = {result.origin: Path(result.origin).stat().st_mtime_ns}
 
                 if result.submodule_search_locations:
                     if result.mtimes is None:
                         result.mtimes = {}
                     result.mtimes.update(
                         {
-                            str(f): f.absolute().stat().st_mtime_ns
+                            str(f): f.stat().st_mtime_ns
                             for f in itertools.chain(
                                 *(iter_files(loc, "**/*.py") for loc in result.submodule_search_locations)
                             )
@@ -1309,7 +1305,7 @@ async def _get_entry_for_resource_import(
         async def _get_document() -> TextDocument:
             self._logger.debug(lambda: f"Load resource {name} from source {source}")
 
-            source_path = Path(source).absolute()
+            source_path = Path(source).resolve()
             extension = source_path.suffix
             if extension.lower() not in RESOURCE_EXTENSIONS:
                 raise ImportError(

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

@@ -1327,7 +1327,7 @@ def _get_default_variables() -> Any:
     if __default_variables is None:
         __default_variables = Variables()
         for k, v in {
-            "${TEMPDIR}": str(Path(tempfile.gettempdir()).absolute()),
+            "${TEMPDIR}": str(Path(tempfile.gettempdir()).resolve()),
             "${/}": os.sep,
             "${:}": os.pathsep,
             "${\\n}": os.linesep,
@@ -1376,8 +1376,8 @@ def resolve_robot_variables(
     result: Variables = _get_default_variables().copy()
 
     for k, v in {
-        "${CURDIR}": str(Path(base_dir).absolute()),
-        "${EXECDIR}": str(Path(working_dir).absolute()),
+        "${CURDIR}": str(Path(base_dir).resolve()),
+        "${EXECDIR}": str(Path(working_dir).resolve()),
     }.items():
         result[k] = v
 
@@ -2207,9 +2207,11 @@ def complete_library_import(
     if name is None or (is_file_like(name) and (name.endswith(("/", os.sep)))):
         name_path = Path(name if name else base_dir)
         if name_path.is_absolute():
-            path = name_path.absolute()
+            path = name_path
         else:
-            path = Path(base_dir, name if name else base_dir).absolute()
+            path = Path(base_dir, name) if name else Path(base_dir)
+
+        path = path.resolve()
 
         if path.exists() and path.is_dir():
             result += [
@@ -2270,9 +2272,9 @@ def complete_resource_import(
     if name is None or name.startswith((".", "/", os.sep)):
         name_path = Path(name if name else base_dir)
         if name_path.is_absolute():
-            path = name_path.absolute()
+            path = name_path.resolve()
         else:
-            path = Path(base_dir, name if name else base_dir).absolute()
+            path = Path(base_dir, name if name else base_dir).resolve()
 
         if path.exists() and (path.is_dir()):
             result += [
@@ -2366,9 +2368,9 @@ def complete_variables_import(
     if name is None or name.startswith((".", "/", os.sep)):
         name_path = Path(name if name else base_dir)
         if name_path.is_absolute():
-            path = name_path.absolute()
+            path = name_path.resolve()
         else:
-            path = Path(base_dir, name if name else base_dir).absolute()
+            path = Path(base_dir, name if name else base_dir).resolve()
 
         if path.exists() and (path.is_dir()):
             result += [

packages/runner/src/robotcode/runner/cli/discover/discover.py

@@ -256,7 +256,7 @@ def visit_suite(self, suite: TestSuite) -> None:
         self._collected[-1][suite.name] = True
         self._collected.append(NormalizedDict(ignore="_"))
         try:
-            absolute_path = Path(suite.source).absolute() if suite.source else None
+            absolute_path = Path(suite.source).resolve() if suite.source else None
             item = TestItem(
                 type="suite",
                 id=f"{absolute_path or ''};{suite.longname}",
@@ -309,7 +309,7 @@ def visit_test(self, test: TestCase) -> None:
         if self._current.children is None:
             self._current.children = []
         try:
-            absolute_path = Path(test.source).absolute() if test.source is not None else None
+            absolute_path = Path(test.source).resolve() if test.source is not None else None
             item = TestItem(
                 type="test",
                 id=f"{absolute_path or ''};{test.longname};{test.lineno}",
@@ -386,7 +386,7 @@ def add_diagnostic(
         line: Optional[int] = None,
         text: Optional[str] = None,
     ) -> None:
-        source_uri = str(Uri.from_path(Path(source_uri).absolute() if source_uri else Path.cwd()))
+        source_uri = str(Uri.from_path(Path(source_uri).resolve() if source_uri else Path.cwd()))
 
         if source_uri not in result:
             result[source_uri] = []