extend arguments parsing for arguments with default value

Author: d-biehl

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -20,6 +20,7 @@
     Tuple,
     cast,
 )
+import itertools
 
 from ....utils.async_itertools import async_chain
 from ....utils.logging import LoggingDescriptor
@@ -223,13 +224,26 @@ async def visit_Arguments(self, node: ast.AST) -> None:  # noqa: N802
         from robot.errors import VariableError
         from robot.parsing.lexer.tokens import Token as RobotToken
         from robot.parsing.model.statements import Arguments
-        from robot.variables.search import is_variable
 
         n = cast(Arguments, node)
         arguments = n.get_tokens(RobotToken.ARGUMENT)
-        for argument in (cast(RobotToken, e) for e in arguments):
+        for argument1 in (cast(RobotToken, e) for e in arguments):
             try:
-                if is_variable(argument.value):
+                argument = None
+                try:
+                    argument = next(
+                        (
+                            v
+                            for v in itertools.dropwhile(
+                                lambda t: t.type in RobotToken.NON_DATA_TOKENS, argument1.tokenize_variables()
+                            )
+                            if v.type == RobotToken.VARIABLE
+                        ),
+                        None,
+                    )
+                except VariableError:
+                    pass
+                if argument is not None:
                     self._results.append(
                         ArgumentDefinition(
                             name=argument.value,

robotcode/language_server/robotframework/parts/goto.py

@@ -87,6 +87,8 @@ async def collect(
     async def _definition_default(
         self, nodes: List[ast.AST], document: TextDocument, position: Position
     ) -> Union[Location, List[Location], List[LocationLink], None]:
+        from robot.api.parsing import Token as RobotToken
+
         namespace = await self.parent.documents_cache.get_namespace(document)
         if namespace is None:
             return None
@@ -103,7 +105,7 @@ async def _definition_default(
 
         for t in tokens:
             try:
-                for sub_token in t.tokenize_variables():
+                for sub_token in filter(lambda s: s.type == RobotToken.VARIABLE, t.tokenize_variables()):
                     range = range_from_token(sub_token)
 
                     if position.is_in_range(range):

robotcode/language_server/robotframework/parts/hover.py

@@ -76,6 +76,8 @@ async def collect(self, sender: Any, document: TextDocument, position: Position)
         return await self._hover_default(result_nodes, document, position)
 
     async def _hover_default(self, nodes: List[ast.AST], document: TextDocument, position: Position) -> Optional[Hover]:
+        from robot.api.parsing import Token as RobotToken
+
         namespace = await self.parent.documents_cache.get_namespace(document)
         if namespace is None:
             return None
@@ -91,7 +93,7 @@ async def _hover_default(self, nodes: List[ast.AST], document: TextDocument, pos
 
         for t in tokens:
             try:
-                for sub_token in t.tokenize_variables():
+                for sub_token in filter(lambda s: s.type == RobotToken.VARIABLE, t.tokenize_variables()):
                     range = range_from_token(sub_token)
 
                     if position.is_in_range(range):