robotcode-robot 0.97.0__tar.gz → 0.99.0__tar.gz

{robotcode_robot-0.97.0 → robotcode_robot-0.99.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode-robot
-Version: 0.97.0
+Version: 0.99.0
 Summary: Support classes for RobotCode for handling Robot Framework projects.
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -25,7 +25,7 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Requires-Dist: platformdirs<4.4.0,>=3.2.0
-Requires-Dist: robotcode-core==0.97.0
+Requires-Dist: robotcode-core==0.99.0
 Requires-Dist: robotframework>=4.1.0
 Requires-Dist: tomli>=1.1.0; python_version < '3.11'
 Description-Content-Type: text/markdown

{robotcode_robot-0.97.0 → robotcode_robot-0.99.0}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
   "robotframework>=4.1.0",
   "tomli>=1.1.0; python_version < '3.11'",
   "platformdirs>=3.2.0,<4.4.0",
-  "robotcode-core==0.97.0",
+  "robotcode-core==0.99.0",
 ]
 dynamic = ["version"]
 

robotcode_robot-0.99.0/src/robotcode/robot/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.99.0"

{robotcode_robot-0.97.0 → robotcode_robot-0.99.0}/src/robotcode/robot/diagnostics/errors.py

@@ -10,6 +10,7 @@ class Error:
     KEYWORD_NOT_FOUND = "KeywordNotFound"
     LIBRARY_CONTAINS_NO_KEYWORDS = "LibraryContainsNoKeywords"
     POSSIBLE_CIRCULAR_IMPORT = "PossibleCircularImport"
+    CIRCULAR_IMPORT = "CircularImport"
     RESOURCE_EMPTY = "ResourceEmpty"
     IMPORT_CONTAINS_ERRORS = "ImportContainsErrors"
     RECURSIVE_IMPORT = "RecursiveImport"

{robotcode_robot-0.97.0 → robotcode_robot-0.99.0}/src/robotcode/robot/diagnostics/namespace.py

@@ -44,6 +44,7 @@ from robotcode.core.lsp.types import (
 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,15 +1243,45 @@ class Namespace:
 
                 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:
+                if same_file(self.source, source):
                     if parent_import:
                         self.append_diagnostics(
                             range=parent_import.range,
-                            message="Possible circular import.",
+                            message=f"Possible circular import detected, Resource file'{Path(self.source).name}' "
+                            "might reference itself directly or through other resource files",
                             severity=DiagnosticSeverity.INFORMATION,
                             source=DIAGNOSTICS_SOURCE_NAME,
                             related_information=(
@@ -1268,6 +1299,15 @@ class Namespace:
                             ),
                             code=Error.POSSIBLE_CIRCULAR_IMPORT,
                         )
+                    else:
+                        self.append_diagnostics(
+                            range=value.range,
+                            message=f"Circular import detected, Resource file '{Path(source).name}' "
+                            "is importing itself",
+                            severity=DiagnosticSeverity.INFORMATION,
+                            source=DIAGNOSTICS_SOURCE_NAME,
+                            code=Error.CIRCULAR_IMPORT,
+                        )
                 else:
                     result = self._get_resource_entry(
                         value.name,
@@ -1453,7 +1493,7 @@ class Namespace:
                         allread_imported_resource = self._resources_files.get(entry.library_doc.source, None)
 
                         if allread_imported_resource is None and entry.library_doc.source != self.source:
-                            self._resources[entry.import_name] = entry
+                            self._resources[entry.library_doc.source] = entry
                             self._resources_files[entry.library_doc.source] = entry
                             if entry.variables:
                                 variables = self.get_suite_variables()
@@ -1515,7 +1555,14 @@ class Namespace:
                             (
                                 e
                                 for e in self._variables_imports.values()
-                                if e.library_doc.source == entry.library_doc.source
+                                if (
+                                    (
+                                        e.library_doc.source is not None
+                                        and entry.library_doc.source is not None
+                                        and same_file(e.library_doc.source, entry.library_doc.source)
+                                    )
+                                    or (e.library_doc.source is None and entry.library_doc.source is None)
+                                )
                                 and e.alias == entry.alias
                                 and e.args == entry.args
                             ),
@@ -1580,7 +1627,14 @@ class Namespace:
                             (
                                 e
                                 for e in self._libraries.values()
-                                if e.library_doc.source == entry.library_doc.source
+                                if (
+                                    (
+                                        e.library_doc.source is not None
+                                        and entry.library_doc.source is not None
+                                        and same_file(e.library_doc.source, entry.library_doc.source)
+                                    )
+                                    or (e.library_doc.source is None and entry.library_doc.source is None)
+                                )
                                 and e.library_doc.member_name == entry.library_doc.member_name
                                 and e.alias == entry.alias
                                 and e.args == entry.args

robotcode_robot-0.97.0/src/robotcode/robot/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.97.0"