fix(analyze): corrected checking if a resource is already imported

fixes: #353 #340

Author: d-biehl

packages/core/src/robotcode/core/utils/path.py

@@ -39,7 +39,7 @@ def normalized_path(path: "Union[str, os.PathLike[str]]") -> Path:
     return Path(p)
 
 
-def normalized_path_full(path: Union[str, "os.PathLike[Any]"]) -> Path:
+def normalized_path_full(path: Union[str, "os.PathLike[str]"]) -> Path:
     p = normalized_path(path)
 
     orig_parents = list(reversed(p.parents))
@@ -59,3 +59,10 @@ def normalized_path_full(path: Union[str, "os.PathLike[Any]"]) -> Path:
             return Path(*parents, *[f.name for f in orig_parents[index:]])
 
     return Path(*parents)
+
+
+def same_file(path1: Union[str, "os.PathLike[str]", Path], path2: Union[str, "os.PathLike[str]", Path]) -> bool:
+    try:
+        return os.path.samefile(path1, path2)
+    except OSError:
+        return False

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

@@ -44,6 +44,7 @@
 from robotcode.core.text_document import TextDocument
 from robotcode.core.uri import Uri
 from robotcode.core.utils.logging import LoggingDescriptor
+from robotcode.core.utils.path import same_file
 
 from ..utils.ast import (
     range_from_node,
@@ -1242,8 +1243,37 @@ def _import(
 
                 source = self.imports_manager.find_resource(value.name, base_dir, variables=variables)
 
-                if source in self._resources_files:
+                allread_imported_resource = next(
+                    (
+                        v
+                        for k, v in self._resources.items()
+                        if v.library_doc.source is not None and same_file(v.library_doc.source, source)
+                    ),
+                    None,
+                )
+                if allread_imported_resource is not None:
                     self._logger.debug(lambda: f"Resource '{value.name}' already imported.", context_name="import")
+                    if top_level:
+                        self.append_diagnostics(
+                            range=value.range,
+                            message=f"Resource '{value.name}' already imported.",
+                            severity=DiagnosticSeverity.INFORMATION,
+                            source=DIAGNOSTICS_SOURCE_NAME,
+                            related_information=(
+                                [
+                                    DiagnosticRelatedInformation(
+                                        location=Location(
+                                            uri=str(Uri.from_path(allread_imported_resource.import_source)),
+                                            range=allread_imported_resource.import_range,
+                                        ),
+                                        message="",
+                                    )
+                                ]
+                                if allread_imported_resource.import_source
+                                else None
+                            ),
+                            code=Error.RESOURCE_ALREADY_IMPORTED,
+                        )
                     return None
 
                 if self.source == source: