feat(analyzer): support for types in embedded arguments

Author: d-biehl

packages/robot/src/robotcode/robot/diagnostics/entities.py

@@ -275,6 +275,15 @@ def __hash__(self) -> int:
         return hash((type(self), self.name, self.type, self.range, self.source))
 
 
+@dataclass
+class EmbeddedArgumentDefinition(ArgumentDefinition):
+    pattern: Optional[str] = field(default=None, compare=False)
+
+    @single_call
+    def __hash__(self) -> int:
+        return hash((type(self), self.name, self.type, self.range, self.source))
+
+
 @dataclass
 class LibraryArgumentDefinition(ArgumentDefinition):
     @single_call

packages/robot/src/robotcode/robot/diagnostics/namespace_analyzer.py

@@ -1,6 +1,7 @@
 import ast
 import functools
 import os
+import re
 import token as python_token
 from collections import defaultdict
 from concurrent.futures import CancelledError
@@ -64,6 +65,7 @@
 from ..utils.visitor import Visitor
 from .entities import (
     ArgumentDefinition,
+    EmbeddedArgumentDefinition,
     EnvironmentVariableDefinition,
     GlobalVariableDefinition,
     LibraryEntry,
@@ -1135,6 +1137,8 @@ def visit_Keyword(self, node: Keyword) -> None:  # noqa: N802
             self._current_testcase_or_keyword_name = None
             self._current_keyword_doc = None
 
+    EMBEDDED_ARGUMENTS_MATCHER = re.compile("([^:]+): ([^:]+)(:(.*))?")
+
     def visit_KeywordName(self, node: KeywordName) -> None:  # noqa: N802
         name_token = node.get_token(Token.KEYWORD_NAME)
 
@@ -1144,14 +1148,28 @@ def visit_KeywordName(self, node: KeywordName) -> None:  # noqa: N802
                 tokenize_variables(name_token, identifiers="$", ignore_errors=True),
             ):
                 if variable_token.value:
-                    match = search_variable(variable_token.value, "$", ignore_errors=True)
-                    if match.base is None:
+                    matcher = search_variable(variable_token.value, "$", ignore_errors=True)
+                    if matcher.base is None:
                         continue
-                    name = match.base.split(":", 1)[0]
-                    full_name = f"{match.identifier}{{{name}}}"
+                    if ":" not in matcher.base:
+                        name = matcher.base
+                        pattern = None
+                        type = None
+                    elif get_robot_version() >= (7, 3):
+                        re_match = self.EMBEDDED_ARGUMENTS_MATCHER.fullmatch(matcher.base)
+                        if re_match:
+                            name, type, _, pattern = re_match.groups()
+                        else:
+                            name, pattern = matcher.base.split(":", 1)
+                            type = None
+                    else:
+                        name, pattern = matcher.base.split(":", 1)
+                        type = None
+
+                    full_name = f"{matcher.identifier}{{{name}}}"
                     var_token = strip_variable_token(variable_token)
                     var_token.value = name
-                    arg_def = ArgumentDefinition(
+                    arg_def = EmbeddedArgumentDefinition(
                         name=full_name,
                         name_token=var_token,
                         line_no=variable_token.lineno,
@@ -1160,6 +1178,8 @@ def visit_KeywordName(self, node: KeywordName) -> None:  # noqa: N802
                         end_col_offset=variable_token.end_col_offset,
                         source=self._namespace.source,
                         keyword_doc=self._current_keyword_doc,
+                        value_type=type,
+                        pattern=pattern,
                     )
 
                     self._variables[arg_def.matcher] = arg_def

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-036-004-simple_keyword_call].out

@@ -219,15 +219,6 @@ result:
       character: 4
       line: 55
   uri: rf70/vartest.robot
-- !Location
-  range:
-    end:
-      character: 7
-      line: 10
-    start:
-      character: 4
-      line: 10
-  uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
@@ -277,10 +268,10 @@ result:
   range:
     end:
       character: 7
-      line: 25
+      line: 16
     start:
       character: 4
-      line: 25
+      line: 16
   uri: rf73/variable_conversion.robot
 - !Location
   range:
@@ -295,109 +286,118 @@ result:
   range:
     end:
       character: 7
-      line: 30
+      line: 27
     start:
       character: 4
-      line: 30
+      line: 27
+  uri: rf73/variable_conversion.robot
+- !Location
+  range:
+    end:
+      character: 7
+      line: 31
+    start:
+      character: 4
+      line: 31
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 11
-      line: 36
+      line: 37
     start:
       character: 8
-      line: 36
+      line: 37
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 11
-      line: 40
+      line: 41
     start:
       character: 8
-      line: 40
+      line: 41
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 45
+      line: 46
     start:
       character: 4
-      line: 45
+      line: 46
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 55
+      line: 57
     start:
       character: 4
-      line: 55
+      line: 57
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 56
+      line: 58
     start:
       character: 4
-      line: 56
+      line: 58
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 57
+      line: 59
     start:
       character: 4
-      line: 57
+      line: 59
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 58
+      line: 60
     start:
       character: 4
-      line: 58
+      line: 60
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 62
+      line: 64
     start:
       character: 4
-      line: 62
+      line: 64
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 63
+      line: 65
     start:
       character: 4
-      line: 63
+      line: 65
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 67
+      line: 69
     start:
       character: 4
-      line: 67
+      line: 69
   uri: rf73/variable_conversion.robot
 - !Location
   range:
     end:
       character: 7
-      line: 81
+      line: 83
     start:
       character: 4
-      line: 81
+      line: 83
   uri: rf73/variable_conversion.robot
 - !Location
   range: