robotcode-robot 2.8.0.dev548__py3-none-any.whl → 2.8.0.dev631__py3-none-any.whl

robotcode/robot/__version__.py

@@ -1 +1 @@
-__version__ = "2.8.0-dev.548"
+__version__ = "2.8.0-dev.631"

robotcode/robot/diagnostics/library_doc.py

@@ -1930,13 +1930,16 @@ class LibraryDoc:
     def _get_title_markdown(self, header_level: int) -> str:
         result = f"#{'#' * header_level} {(self.type.capitalize()) if self.type else 'Unknown'} *{self.name}*\n\n"
 
-        if self.version or self.scope:
+        # resource and suite files show GLOBAL, as in Libdoc; variable files have no scope in Robot Framework
+        scope = self.scope if self.type != "VARIABLES" else ""
+
+        if self.version or scope:
             result += "|  |  |\n| :--- | :--- |\n"
 
             if self.version:
                 result += f"| **Library Version:** | {self.version} |\n"
-            if self.scope:
-                result += f"| **Library Scope:** | {self.scope} |\n"
+            if scope:
+                result += f"| **Library Scope:** | {scope} |\n"
 
             result += "\n\n"
 

robotcode/robot/diagnostics/namespace_analyzer.py

@@ -1458,7 +1458,10 @@ class NamespaceAnalyzer(Visitor):
                     ignore_errors=True,
                 )
 
-                if not matcher.is_assign(allow_assign_mark=True, allow_nested=True) or matcher.name is None:
+                if (
+                    not matcher.is_assign(allow_assign_mark=True, allow_nested=True, allow_items=True)
+                    or matcher.name is None
+                ):
                     return
 
                 if RF_VERSION >= (7, 0) and contains_variable(matcher.base, "$@&%"):
@@ -1496,6 +1499,19 @@ class NamespaceAnalyzer(Visitor):
                 stripped_name_token = strip_variable_token(assign_token, matcher=matcher, parse_type=True)
 
                 if matcher.items:
+                    # Robot Framework resolves the variables in the index; the search without types keeps a type
+                    # in the base, so the index starts after it
+                    raw = search_variable(matcher.string, ignore_errors=True)
+                    items_start = raw.start + len(raw.identifier) + len(raw.base) + 2
+                    items_token = Token(
+                        Token.ARGUMENT,
+                        matcher.string[items_start : raw.end],
+                        assign_token.lineno,
+                        assign_token.col_offset + items_start,
+                    )
+                    for var_token, var in self._iter_variables_from_token(items_token):
+                        self._handle_find_variable_result(var_token, var)
+
                     existing_var = self._find_variable(name)
                     if existing_var is None:
                         self._handle_find_variable_result(
@@ -1611,18 +1627,21 @@ class NamespaceAnalyzer(Visitor):
                 if not matcher.is_scalar_assign():
                     return
 
-                if (
-                    next(
-                        (
-                            k
-                            for k, v in self._variables.items()
-                            if k == matcher
-                            and v.type in [VariableDefinitionType.ARGUMENT, VariableDefinitionType.LOCAL_VARIABLE]
-                        ),
-                        None,
+                existing_var = next(
+                    (
+                        v
+                        for k, v in self._variables.items()
+                        if k == matcher
+                        and v.type in [VariableDefinitionType.ARGUMENT, VariableDefinitionType.LOCAL_VARIABLE]
+                    ),
+                    None,
+                )
+                if existing_var is not None:
+                    # EXCEPT AS sets the existing variable again, like a FOR variable of that name
+                    self._variable_references[existing_var].add(
+                        Location(self._document_uri, range_from_token(strip_variable_token(variable_token)))
                     )
-                    is None
-                ):
+                else:
                     var_def = LocalVariableDefinition(
                         name=variable_token.value,
                         name_token=strip_variable_token(variable_token),

robotcode/robot/diagnostics/semantic_analyzer/analyzer.py

@@ -405,6 +405,8 @@ class SemanticAnalyzer(Visitor):
             )
             self._logger.exception(e)
 
+        self._mark_argument_uses()
+
         # Build indexes
         self._semantic_model.build_index()
 
@@ -423,6 +425,38 @@ class SemanticAnalyzer(Visitor):
             semantic_model=self._semantic_model,
         )
 
+    def _mark_argument_uses(self) -> None:
+        """Mark every variable token whose name the analysis resolved to an argument from `[Arguments]`, the same
+        resolution Find References and Rename use; embedded arguments stay unmarked."""
+        starts = {
+            (location.range.start.line, location.range.start.character)
+            for var, locations in self._variable_references.items()
+            if isinstance(var, ArgumentDefinition) and not isinstance(var, EmbeddedArgumentDefinition)
+            for location in locations
+        }
+        if starts:
+            for stmt in self._semantic_model.statements:
+                self._mark_argument_uses_in_statement(stmt, starts)
+
+    def _mark_argument_uses_in_statement(self, stmt: SemanticStatement, starts: Set[Tuple[int, int]]) -> None:
+        for token in stmt.tokens:
+            self._mark_argument_uses_in_token(token, starts)
+        # the inner calls of a Run Keyword variant have tokens of their own
+        if isinstance(stmt, RunKeywordCallStatement):
+            for inner in stmt.inner_calls:
+                self._mark_argument_uses_in_statement(inner, starts)
+
+    def _mark_argument_uses_in_token(self, token: SemanticToken, starts: Set[Tuple[int, int]]) -> None:
+        for sub in token.sub_tokens or ():
+            self._mark_argument_uses_in_token(sub, starts)
+            # a reference covers the name of the variable, its base
+            if (
+                token.kind is TokenKind.VARIABLE
+                and sub.kind is TokenKind.VARIABLE_BASE
+                and (sub.range.start.line, sub.range.start.character) in starts
+            ):
+                token.modifiers = (token.modifiers or frozenset()) | {TokenModifier.ARGUMENT}
+
     # --- Semantic Model helpers ---
 
     # Statement kinds that act as the block-header for control-flow blocks.
@@ -3176,7 +3210,10 @@ class SemanticAnalyzer(Visitor):
                     ignore_errors=True,
                 )
 
-                if not matcher.is_assign(allow_assign_mark=True, allow_nested=True) or matcher.name is None:
+                if (
+                    not matcher.is_assign(allow_assign_mark=True, allow_nested=True, allow_items=True)
+                    or matcher.name is None
+                ):
                     return
 
                 if RF_VERSION >= (7, 0) and contains_variable(matcher.base, "$@&%"):
@@ -3220,6 +3257,19 @@ class SemanticAnalyzer(Visitor):
                 stripped_name_token = strip_variable_token(assign_token, matcher=matcher, parse_type=True)
 
                 if matcher.items:
+                    # Robot Framework resolves the variables in the index; the search without types keeps a type
+                    # in the base, so the index starts after it
+                    raw = search_variable(matcher.string, ignore_errors=True)
+                    items_start = raw.start + len(raw.identifier) + len(raw.base) + 2
+                    items_token = Token(
+                        Token.ARGUMENT,
+                        matcher.string[items_start : raw.end],
+                        assign_token.lineno,
+                        assign_token.col_offset + items_start,
+                    )
+                    for var_token, var in self._iter_variables_from_token(items_token):
+                        self._handle_find_variable_result(var_token, var)
+
                     existing_var = self._find_variable(name)
                     if existing_var is None:
                         self._handle_find_variable_result(
@@ -3468,18 +3518,21 @@ class SemanticAnalyzer(Visitor):
                 if not matcher.is_scalar_assign():
                     return
 
-                if (
-                    next(
-                        (
-                            k
-                            for k, v in self._variables.items()
-                            if k == matcher
-                            and v.type in [VariableDefinitionType.ARGUMENT, VariableDefinitionType.LOCAL_VARIABLE]
-                        ),
-                        None,
+                existing_var = next(
+                    (
+                        v
+                        for k, v in self._variables.items()
+                        if k == matcher
+                        and v.type in [VariableDefinitionType.ARGUMENT, VariableDefinitionType.LOCAL_VARIABLE]
+                    ),
+                    None,
+                )
+                if existing_var is not None:
+                    # EXCEPT AS sets the existing variable again, like a FOR variable of that name
+                    self._variable_references[existing_var].add(
+                        Location(self._document_uri, range_from_token(strip_variable_token(variable_token)))
                     )
-                    is None
-                ):
+                else:
                     var_def = LocalVariableDefinition(
                         name=variable_token.value,
                         name_token=strip_variable_token(variable_token),

robotcode/robot/diagnostics/semantic_analyzer/enums.py

@@ -194,6 +194,7 @@ class TokenModifier(Enum):
     EMBEDDED = "embedded"
     DECLARATION = "declaration"
     DOCUMENTATION = "documentation"
+    ARGUMENT = "argument"  # a variable that names an argument from the keyword's [Arguments], not an embedded one
 
 
 class ForFlavor(Enum):

{robotcode_robot-2.8.0.dev548.dist-info → robotcode_robot-2.8.0.dev631.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: robotcode-robot
-Version: 2.8.0-dev.548
+Version: 2.8.0-dev.631
 Summary: Support classes for RobotCode for handling Robot Framework projects.
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -27,7 +27,7 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Requires-Dist: platformdirs>=4.3
-Requires-Dist: robotcode-core==2.8.0-dev.548
+Requires-Dist: robotcode-core==2.8.0-dev.631
 Requires-Dist: robotframework>=5.0.0
 Requires-Dist: tomli>=1.1.0; python_version < '3.11'
 Description-Content-Type: text/markdown

{robotcode_robot-2.8.0.dev548.dist-info → robotcode_robot-2.8.0.dev631.dist-info}/RECORD

@@ -1,5 +1,5 @@
 robotcode/robot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robotcode/robot/__version__.py,sha256=4qGR5Sg7VszfoERVpnszHJ_tsWJ0G_bUZdheH0_dqx4,30
+robotcode/robot/__version__.py,sha256=9SGjqX5uvERIavT5Cjgw0TSLgQ-nKCFaQ13-E6K7MDA,30
 robotcode/robot/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
 robotcode/robot/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robotcode/robot/config/loader.py,sha256=HLbkZem8JiBuy9Q5naghZddAuMPOn8Tk6UBgN2T3Uyc,9073
@@ -16,17 +16,17 @@ robotcode/robot/diagnostics/errors.py,sha256=lqHDWrMNy3ZhuEIVxeEhaU0ns8PB6pVTQBf
 robotcode/robot/diagnostics/import_resolver.py,sha256=lqbJYm3i62nK-EB1tgQ-RZoUtJ6rkB9JX6AzSN-p9t4,33126
 robotcode/robot/diagnostics/imports_manager.py,sha256=SRSidp3KyPXvT7NollGu-nhYmVKon8hw2pXoQog9SlE,89243
 robotcode/robot/diagnostics/keyword_finder.py,sha256=nwTmjvhyu5H7HHzyk8gt-pny2K2xdH2qCNyKXwwXRnk,18998
-robotcode/robot/diagnostics/library_doc.py,sha256=GKeMFF17dH_Nq2B0xXNwNCMNXoUDCHUGguJTnPtXLVg,153417
+robotcode/robot/diagnostics/library_doc.py,sha256=MYztjgnOmXAPjXn7td651oWats2qDlPrLgCkmwpdSmU,153576
 robotcode/robot/diagnostics/model_helper.py,sha256=_ySXwerkK5xvjWa82T0DFy8jpxRzcaavTJiAHnk2lXQ,29740
 robotcode/robot/diagnostics/namespace.py,sha256=f2A4K2KURxyXr5unBBN622ayoJg34pkePQMbS79WhVA,35914
-robotcode/robot/diagnostics/namespace_analyzer.py,sha256=CeWWQLm1grZdFKXYlXSsgMnJS8kZE6K4UGdRociTk9s,102549
+robotcode/robot/diagnostics/namespace_analyzer.py,sha256=HrYdY6DM2DvR3Jh9wB-RggbxLDgez5CLk_NRSOZQRcQ,103678
 robotcode/robot/diagnostics/project_index.py,sha256=Oqs7kV279PixVS6rGeigPKXGJYGqJdTDmDBjU7ODDRA,11006
 robotcode/robot/diagnostics/scope_tree.py,sha256=UREHoFG7NWh6UTWxET1M5Jxz_XBjXaQJg1GUIYPctq0,8348
 robotcode/robot/diagnostics/variable_scope.py,sha256=bge49DM-1FfQYIeqK2DtBG7JAMm25mazZ_zjh0DoMmg,3096
 robotcode/robot/diagnostics/workspace_config.py,sha256=GlsR1VnUBHoLBvIZtUXkm1dBDFPT9qoiYZzwZlurmXM,3277
 robotcode/robot/diagnostics/semantic_analyzer/__init__.py,sha256=ObbJv-S8LDgkWKZtTZjISBodXxyoLdEiOjVYp5aYbT4,1689
-robotcode/robot/diagnostics/semantic_analyzer/analyzer.py,sha256=KgytESMxSZSo5Q-AV0wJptqflqPhV9EoZ1HhlBt_Zyg,202596
-robotcode/robot/diagnostics/semantic_analyzer/enums.py,sha256=YaKwB5rGnT0s-F-txWjHCblcEHW-6pTnEB4QzT4IlY4,8553
+robotcode/robot/diagnostics/semantic_analyzer/analyzer.py,sha256=PrWfgnA2AveDaVpXQUQ-pyx5aDeIcQwA7q2b7K39_Uo,205496
+robotcode/robot/diagnostics/semantic_analyzer/enums.py,sha256=FIf3bHHqYY2etzpNrZTpZxGFsdtBE15lTssI1g8T2ro,8668
 robotcode/robot/diagnostics/semantic_analyzer/json_dump.py,sha256=2Yq3CLAKF5IEqKeFDoIYn-Ize_1Ucgz82ORkx3wAguY,13836
 robotcode/robot/diagnostics/semantic_analyzer/model.py,sha256=YF8txeR5gXzhDLn3Fv3Y8hSo_vItEKkeLE2h3nx9Bmc,18465
 robotcode/robot/diagnostics/semantic_analyzer/nodes.py,sha256=lwXK648OLbNknFqAN9LP4Z-2k8tk-UuQqWYX-PZ8xIU,16379
@@ -43,6 +43,6 @@ robotcode/robot/utils/robot_path.py,sha256=ObLP8PqamTZAz5oi0eDXE_dnyZwAPXp4TJYm6
 robotcode/robot/utils/stubs.py,sha256=umugZYAyneFNgqRJBRMJPzm0u0B_TH8Sx_y-ykXnxpw,351
 robotcode/robot/utils/variables.py,sha256=M_JVe4DxV7ucL_iRW7VOQnSlY6I72NVhRfki4f3zMQY,9430
 robotcode/robot/utils/visitor.py,sha256=nP3O0qh3YYuxR6S8wYJRBFfNwIVgsgohURBlrnFkRYQ,2299
-robotcode_robot-2.8.0.dev548.dist-info/METADATA,sha256=n9eb-HI9tPFmJbVG3HNvEGioqRAx6KUDxFe76rg_F10,2960
-robotcode_robot-2.8.0.dev548.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-robotcode_robot-2.8.0.dev548.dist-info/RECORD,,
+robotcode_robot-2.8.0.dev631.dist-info/METADATA,sha256=EGKTTkjAa-1ACqJS7zvLOKWf6CAloJyQL-jCUAJFrC4,2960
+robotcode_robot-2.8.0.dev631.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+robotcode_robot-2.8.0.dev631.dist-info/RECORD,,