robotcode-robot 0.97.0__py3-none-any.whl → 0.99.0__py3-none-any.whl

robotcode/robot/__version__.py

@@ -1 +1 @@
-__version__ = "0.97.0"
+__version__ = "0.99.0"

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/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.dist-info → robotcode_robot-0.99.0.dist-info}/METADATA

@@ -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.dist-info → robotcode_robot-0.99.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 robotcode/robot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robotcode/robot/__version__.py,sha256=4n3tdadixJ_eZgVwheQyewJFQEfb651DXkoZqfN9A3o,23
+robotcode/robot/__version__.py,sha256=edGCadaA59-v6zz7c0FTQVXhF-FODX9Og9G1bbQCm40,23
 robotcode/robot/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
 robotcode/robot/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robotcode/robot/config/loader.py,sha256=tLPzeyHl4ELBIVSj2JtU2wVqlurouKTdfxHy0T5HxRE,8584
@@ -10,12 +10,12 @@ robotcode/robot/diagnostics/data_cache.py,sha256=Wge9HuxSUiBVMmrmlsYSMmG2ad7f3Te
 robotcode/robot/diagnostics/diagnostics_modifier.py,sha256=3dDsu8-ET6weIvv7Sk3IQaPYFNxnXUs8Y7gpGTjfOBs,9796
 robotcode/robot/diagnostics/document_cache_helper.py,sha256=n903UxVXM4Uq4fPxN5s-dugQAKcWUwf4Nw4q0CJV7aw,23902
 robotcode/robot/diagnostics/entities.py,sha256=b4u2yQN8MDg90RoTMaW7iLogiDNwOAtK180KCB94RfE,10970
-robotcode/robot/diagnostics/errors.py,sha256=vRH7HiZOfQIC-L7ys2Bj9ULYxLpUH7I03qJRSkEx08k,1813
+robotcode/robot/diagnostics/errors.py,sha256=vp7MAB0_t9tAnnPfXcXMpUqjV6ifzPPEsfMUEseEzr8,1852
 robotcode/robot/diagnostics/imports_manager.py,sha256=jaEE7iUzEA4Rp-KXP3nfn0JyUGyp-0BMfNi8_DsQ6KE,61169
 robotcode/robot/diagnostics/keyword_finder.py,sha256=dm4BA0ccp5V4C65CkSYUJUNXegSmvG24uu09T3eL6a4,17319
 robotcode/robot/diagnostics/library_doc.py,sha256=VPCX7xp-0LJiYSFLO68y8MuNAMIYcnhJTIHRmWPpl30,100507
 robotcode/robot/diagnostics/model_helper.py,sha256=ltuUNWwZJFBmMFXIomMmW1IP5v7tMpQSoC1YbncgoNI,30985
-robotcode/robot/diagnostics/namespace.py,sha256=lJOkaS_yCp8SVhURqh5NqAsm394s0cHZUMQwVeh9nno,75159
+robotcode/robot/diagnostics/namespace.py,sha256=uRr2TINn7xNyF9tbw_0ojnTnZj_Kr6Rid_hEz68hFP8,78197
 robotcode/robot/diagnostics/namespace_analyzer.py,sha256=MgEoEGH7FvwVYoR3wA0JEGQxMWJTUUHq10NrorJV5LY,74183
 robotcode/robot/diagnostics/workspace_config.py,sha256=gyKR5z-HpnjxPAui3YujgeZqXX7RYBO_ErGVlk7vnGc,2689
 robotcode/robot/utils/__init__.py,sha256=OjNPMn_XSnfaMCyKd8Kmq6vlRt6mIGlzW4qiiD3ykUg,447
@@ -26,7 +26,7 @@ robotcode/robot/utils/robot_path.py,sha256=Z-GVBOPA_xeD20bCJi4_AWaU0eQWvCym-YFty
 robotcode/robot/utils/stubs.py,sha256=umugZYAyneFNgqRJBRMJPzm0u0B_TH8Sx_y-ykXnxpw,351
 robotcode/robot/utils/variables.py,sha256=-ldL8mRRSYYW2pwlm8IpoDeQcG6LYBqaYyV_7U3xsIc,2174
 robotcode/robot/utils/visitor.py,sha256=nP3O0qh3YYuxR6S8wYJRBFfNwIVgsgohURBlrnFkRYQ,2299
-robotcode_robot-0.97.0.dist-info/METADATA,sha256=ZH34rvGP5O_-ihAJedp0f682Q7DOkNVFoT8s9n9wUeo,2214
-robotcode_robot-0.97.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-robotcode_robot-0.97.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
-robotcode_robot-0.97.0.dist-info/RECORD,,
+robotcode_robot-0.99.0.dist-info/METADATA,sha256=EoIldqp50xLr4Xk7anxZqU9o7R0OiMy4yaIMJ79I0UI,2214
+robotcode_robot-0.99.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+robotcode_robot-0.99.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
+robotcode_robot-0.99.0.dist-info/RECORD,,