robotcode-robot 1.5.0__tar.gz → 1.7.0__tar.gz

{robotcode_robot-1.5.0 → robotcode_robot-1.7.0}/PKG-INFO

@@ -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 → robotcode_robot-1.7.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==1.5.0",
+  "robotcode-core==1.7.0",
 ]
 dynamic = ["version"]
 

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

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

{robotcode_robot-1.5.0 → robotcode_robot-1.7.0}/src/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-1.5.0 → robotcode_robot-1.7.0}/src/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-1.5.0 → robotcode_robot-1.7.0}/src/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-1.5.0 → robotcode_robot-1.7.0}/src/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-1.5.0 → robotcode_robot-1.7.0}/src/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/src/robotcode/robot/__version__.py

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

{robotcode_robot-1.5.0 → robotcode_robot-1.7.0}/src/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(),
             )
         )