robotcode-robot 1.5.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

robotcode/robot/__version__.py

@@ -1 +1 @@
-__version__ = "1.5.0"
+__version__ = "1.7.0"

robotcode/robot/diagnostics/document_cache_helper.py

@@ -589,7 +589,6 @@ class DocumentsCacheHelper:
             return self._imports_managers[folder]
 
     def calc_cache_path(self, folder_uri: Uri) -> Path:
-        # TODO: cache path should be configurable, save cache in vscode workspace folder or in robotcode cache folder
         return folder_uri.to_path()
 
     def get_diagnostic_modifier(self, document: TextDocument) -> DiagnosticsModifier:

robotcode/robot/diagnostics/entities.py

@@ -179,7 +179,8 @@ class VariableDefinitionType(Enum):
 @dataclass
 class VariableDefinition(SourceEntity):
     name: str
-    name_token: Optional[Token]
+    name_token: Optional[Token]  # TODO: this is not needed anymore, but kept for compatibility
+
     type: VariableDefinitionType = VariableDefinitionType.VARIABLE
 
     has_value: bool = field(default=False, compare=False)

robotcode/robot/diagnostics/errors.py

@@ -39,6 +39,7 @@ class Error:
     INVALID_HEADER = "InvalidHeader"
     DEPRECATED_HEADER = "DeprecatedHeader"
     OVERRIDDEN_BY_COMMANDLINE = "OverriddenByCommandLine"
+    OVERRIDES_IMPORTED_VARIABLE = "OverridesImportedVariable"
     VARIABLE_ALREADY_DEFINED = "VariableAlreadyDefined"
     VARIABLE_OVERRIDDEN = "VariableOverridden"
     MODEL_ERROR = "ModelError"

robotcode/robot/diagnostics/keyword_finder.py

@@ -65,7 +65,6 @@ class KeywordFinder:
         self.multiple_keywords_result = None
         self.result_bdd_prefix = None
 
-    # TODO: make this threadsafe
     def find_keyword(
         self,
         name: Optional[str],

robotcode/robot/diagnostics/namespace.py

@@ -1116,8 +1116,8 @@ class Namespace:
                     else []
                 ),
                 [] if skip_global_variables or skip_commandline_variables else self.get_command_line_variables(),
-                [] if skip_global_variables else self.get_own_variables(),
                 [] if skip_global_variables else self.get_imported_variables(),
+                [] if skip_global_variables else self.get_own_variables(),
                 [] if skip_global_variables else self.get_builtin_variables(),
             )
         )

robotcode/robot/diagnostics/namespace_analyzer.py

@@ -234,6 +234,27 @@ class NamespaceAnalyzer(Visitor):
             )
 
             add_to_references = True
+
+            if existing_var is not None and existing_var.type == VariableDefinitionType.IMPORTED_VARIABLE:
+                self._append_diagnostics(
+                    r,
+                    "Overrides imported variable.",
+                    DiagnosticSeverity.WARNING,
+                    Error.OVERRIDES_IMPORTED_VARIABLE,
+                    related_information=[
+                        DiagnosticRelatedInformation(
+                            location=Location(
+                                uri=str(Uri.from_path(existing_var.source)),
+                                range=existing_var.range,
+                            ),
+                            message="Already defined here.",
+                        )
+                    ]
+                    if existing_var.source
+                    else None,
+                )
+                existing_var = None
+
             first_overidden_reference: Optional[VariableDefinition] = None
             if existing_var is not None:
                 self._variable_references[existing_var].add(Location(self._namespace.document_uri, r))

{robotcode_robot-1.5.0.dist-info → robotcode_robot-1.7.0.dist-info}/METADATA

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

{robotcode_robot-1.5.0.dist-info → robotcode_robot-1.7.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 robotcode/robot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robotcode/robot/__version__.py,sha256=X9pTeGHIYZtDOmfb9pnn2DEqWZMAyaPlqdFwEhsuSvk,22
+robotcode/robot/__version__.py,sha256=lEEx5lwinUby-YNl7w-VFGUcjcibsJ9EuzgJ2W7ocrU,22
 robotcode/robot/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
 robotcode/robot/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robotcode/robot/config/loader.py,sha256=qrP810HNMDpqhXopWa0dOa0Wq_zQfVctsNYKY6sLKGI,8654
@@ -8,15 +8,15 @@ robotcode/robot/config/utils.py,sha256=xY-LH31BidWzonpvSrle-4HvKrp02I7IRqU2JwlL4
 robotcode/robot/diagnostics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robotcode/robot/diagnostics/data_cache.py,sha256=duLbcKzwqlCC1tBvJY8ASYh2LcIoCSs8_NgQ8NUQ7VU,3186
 robotcode/robot/diagnostics/diagnostics_modifier.py,sha256=6zJdXBd6g1QM12XJbsHd8gNNysECMnWlne3q8XNgBDo,9797
-robotcode/robot/diagnostics/document_cache_helper.py,sha256=5H0S7qDCeoEmqjMLUE7EQy9iZcZTYIUl5H1Pdvn5s5I,23886
-robotcode/robot/diagnostics/entities.py,sha256=ubjARNPP4fNGoOfv0Mm1RrbdpPfF3GC0Qn7Sz5Zeoc0,12449
-robotcode/robot/diagnostics/errors.py,sha256=irVOZIcnpf611c9BdWXWpRu2esEl6SSN0EvZjA7p3bY,2060
+robotcode/robot/diagnostics/document_cache_helper.py,sha256=PFvK4kpDLy-ONGPuIoxZgXV5ZlZ-Or8geGNqbdCk0s8,23768
+robotcode/robot/diagnostics/entities.py,sha256=8EM9IwJtgUD68PvmM5PjVwVWMF_tow2GYvMFebJgJM0,12514
+robotcode/robot/diagnostics/errors.py,sha256=bUreFflbNYKWccbaq6T84VmYozJhsCTOBoMq3xNAIkY,2122
 robotcode/robot/diagnostics/imports_manager.py,sha256=X7ZEMaLzplrVt_880NyxFnbKlTNKpvNHWQxZeMoaQd0,61167
-robotcode/robot/diagnostics/keyword_finder.py,sha256=TRYnbliYe0LPwqzdzABZawJEafksAsZBQ3pF3zYMdaA,18763
+robotcode/robot/diagnostics/keyword_finder.py,sha256=FHPxstUl_0gN5EmmCF0oEjqgxcRNzCDTbxZnmIIrqL8,18730
 robotcode/robot/diagnostics/library_doc.py,sha256=4Eio6ujJydBFnjJwiNKvw-0FM1LqBlFckclE7bzW6BQ,100764
 robotcode/robot/diagnostics/model_helper.py,sha256=RmKg1t5qsbSbW5uiehpFzJt157gDSQ1ayzXlur26AGI,31000
-robotcode/robot/diagnostics/namespace.py,sha256=dS8_1JZj-Vk-zX8JswkLJ5cKIg2J0FgEvnXRcnUCeZg,80960
-robotcode/robot/diagnostics/namespace_analyzer.py,sha256=qkOuyIhy8W7C1Ed77v1gl5evmYoO-a2vPtwVytkrKd8,78759
+robotcode/robot/diagnostics/namespace.py,sha256=NQseG4eG6gzBxEy2by3HbQd6DHAqflIovz0WooQHyAI,80960
+robotcode/robot/diagnostics/namespace_analyzer.py,sha256=arj0PWUyqJj0y1iVD4ty_5FIZAeqkMqgPClmstgSxuE,79634
 robotcode/robot/diagnostics/workspace_config.py,sha256=gyKR5z-HpnjxPAui3YujgeZqXX7RYBO_ErGVlk7vnGc,2689
 robotcode/robot/utils/__init__.py,sha256=HETwRb7y8SJSehSxygixKwkUGdiTKNgS4NjXVOUrUzE,361
 robotcode/robot/utils/ast.py,sha256=IdihPbvY2ERwm763mwPcDUZlS-si6AgNdF3ROqX48Pk,11417
@@ -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=RCmBdVWtwVkB058QCBE_Bj3_28H1sXmYs0lJF9bVc0w,7644
 robotcode/robot/utils/visitor.py,sha256=nP3O0qh3YYuxR6S8wYJRBFfNwIVgsgohURBlrnFkRYQ,2299
-robotcode_robot-1.5.0.dist-info/METADATA,sha256=J2MIioFEIpWVnpjKEJbO7qaqpraqfyHKXeGiT2JnCH8,2238
-robotcode_robot-1.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-robotcode_robot-1.5.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
-robotcode_robot-1.5.0.dist-info/RECORD,,
+robotcode_robot-1.7.0.dist-info/METADATA,sha256=6XRink3e-yJBIimMtrRzW9axRODZLKsvHTNz3n7p1dU,2238
+robotcode_robot-1.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+robotcode_robot-1.7.0.dist-info/licenses/LICENSE.txt,sha256=B05uMshqTA74s-0ltyHKI6yoPfJ3zYgQbvcXfDVGFf8,10280
+robotcode_robot-1.7.0.dist-info/RECORD,,