fix: correct hovering, goto, etc. for if/else if/inline if statements

Author: d-biehl

packages/language_server/src/robotcode/language_server/robotframework/parts/goto.py

@@ -149,15 +149,15 @@ async def _definition_default(
                     ]
         return None
 
-    async def definition_IfHeader(  # noqa: N802
+    async def _definition_IfElseHeader(  # noqa: N802
         self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position, collect_type: CollectType
     ) -> Union[Location, List[Location], List[LocationLink], None]:
         from robot.parsing.lexer.tokens import Token as RobotToken
-        from robot.parsing.model.statements import IfHeader
+        from robot.parsing.model.statements import Statement
 
         namespace = await self.parent.documents_cache.get_namespace(document)
 
-        header = cast(IfHeader, node)
+        header = cast(Statement, node)
 
         expression_token = header.get_token(RobotToken.ARGUMENT)
         if expression_token is not None and position in range_from_token(expression_token):
@@ -188,43 +188,20 @@ async def definition_IfHeader(  # noqa: N802
 
         return None
 
-    async def definition_WhileHeader(  # noqa: N802
+    async def definition_IfElseHeader(  # noqa: N802
         self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position, collect_type: CollectType
     ) -> Union[Location, List[Location], List[LocationLink], None]:
-        from robot.parsing.lexer.tokens import Token as RobotToken
-        from robot.parsing.model.statements import WhileHeader
-
-        namespace = await self.parent.documents_cache.get_namespace(document)
+        return await self._definition_IfElseHeader(node, nodes, document, position, collect_type)
 
-        header = cast(WhileHeader, node)
-
-        expression_token = header.get_token(RobotToken.ARGUMENT)
-        if expression_token is not None and position in range_from_token(expression_token):
-            token_and_var = await async_next(
-                (
-                    (var_token, var)
-                    async for var_token, var in self.iter_expression_variables_from_token(
-                        expression_token, namespace, nodes, position, skip_commandline_variables=True
-                    )
-                    if position in range_from_token(var_token)
-                ),
-                None,
-            )
-            if token_and_var is not None:
-                var_token, variable = token_and_var
+    async def definition_IfHeader(  # noqa: N802
+        self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position, collect_type: CollectType
+    ) -> Union[Location, List[Location], List[LocationLink], None]:
+        return await self._definition_IfElseHeader(node, nodes, document, position, collect_type)
 
-                if variable.source:
-                    return [
-                        LocationLink(
-                            origin_selection_range=range_from_token(var_token),
-                            target_uri=str(Uri.from_path(variable.source)),
-                            target_range=variable.range,
-                            target_selection_range=range_from_token(variable.name_token)
-                            if variable.name_token
-                            else variable.range,
-                        )
-                    ]
-        return None
+    async def definition_WhileHeader(  # noqa: N802
+        self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position, collect_type: CollectType
+    ) -> Union[Location, List[Location], List[LocationLink], None]:
+        return await self._definition_IfElseHeader(node, nodes, document, position, collect_type)
 
     async def definition_KeywordName(  # noqa: N802
         self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position, collect_type: CollectType

packages/language_server/src/robotcode/language_server/robotframework/parts/hover.py

@@ -138,17 +138,15 @@ async def _hover_default(self, nodes: List[ast.AST], document: TextDocument, pos
 
         return None
 
-    async def hover_IfHeader(  # noqa: N802
+    async def _hover_IfElseHeader(  # noqa: N802
         self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position
     ) -> Optional[Hover]:
         from robot.parsing.lexer.tokens import Token as RobotToken
-        from robot.parsing.model.statements import IfHeader
+        from robot.parsing.model.statements import Statement
 
         namespace = await self.parent.documents_cache.get_namespace(document)
 
-        header = cast(IfHeader, node)
-
-        expression_token = header.get_token(RobotToken.ARGUMENT)
+        expression_token = cast(Statement, node).get_token(RobotToken.ARGUMENT)
         if expression_token is not None and position in range_from_token(expression_token):
             token_and_var = await async_next(
                 (
@@ -187,54 +185,20 @@ async def hover_IfHeader(  # noqa: N802
 
         return None
 
-    async def hover_WhileHeader(  # noqa: N802
+    async def hover_IfElseHeader(  # noqa: N802
         self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position
     ) -> Optional[Hover]:
-        from robot.parsing.lexer.tokens import Token as RobotToken
-        from robot.parsing.model.statements import WhileHeader
-
-        namespace = await self.parent.documents_cache.get_namespace(document)
-
-        header = cast(WhileHeader, node)
+        return await self._hover_IfElseHeader(node, nodes, document, position)
 
-        expression_token = header.get_token(RobotToken.ARGUMENT)
-        if expression_token is not None and position in range_from_token(expression_token):
-            token_and_var = await async_next(
-                (
-                    (var_token, var)
-                    async for var_token, var in self.iter_expression_variables_from_token(
-                        expression_token, namespace, nodes, position
-                    )
-                    if position in range_from_token(var_token)
-                ),
-                None,
-            )
-            if token_and_var is not None:
-                var_token, variable = token_and_var
-
-                if variable.has_value or variable.resolvable:
-                    try:
-                        value = await namespace.imports_manager.resolve_variable(
-                            variable.name,
-                            str(document.uri.to_path().parent),
-                            await namespace.get_resolvable_variables(nodes, position),
-                        )
-                    except (asyncio.CancelledError, SystemExit, KeyboardInterrupt):
-                        raise
-                    except BaseException:
-                        value = ""
-                else:
-                    value = ""
-
-                return Hover(
-                    contents=MarkupContent(
-                        kind=MarkupKind.MARKDOWN,
-                        value=f"({variable.type.value}) {variable.name} {f'= `{value}`' if value else ''}",
-                    ),
-                    range=range_from_token(var_token),
-                )
+    async def hover_IfHeader(  # noqa: N802
+        self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position
+    ) -> Optional[Hover]:
+        return await self._hover_IfElseHeader(node, nodes, document, position)
 
-        return None
+    async def hover_WhileHeader(  # noqa: N802
+        self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position
+    ) -> Optional[Hover]:
+        return await self._hover_IfElseHeader(node, nodes, document, position)
 
     async def hover_KeywordCall(  # noqa: N802
         self, node: ast.AST, nodes: List[ast.AST], document: TextDocument, position: Position

packages/language_server/src/robotcode/language_server/robotframework/parts/model_helper.py

@@ -522,8 +522,8 @@ def get_expression_statement_types(cls) -> Tuple[Type[Any]]:
             cls.__expression_statement_types = (robot.parsing.model.statements.IfHeader,)
 
             if get_robot_version() >= (5, 0):
-                cls.__expression_statement_types = (  # type: ignore
-                    robot.parsing.model.statements.IfHeader,
+                cls.__expression_statement_types = (  # type: ignore[assignment]
+                    robot.parsing.model.statements.IfElseHeader,
                     robot.parsing.model.statements.WhileHeader,
                 )
 

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_document_highlight.test[document_highlight.robot-009-041-Variable_in_library_params].out

@@ -26,7 +26,7 @@ result:
   range:
     end:
       character: 44
-      line: 58
+      line: 60
     start:
       character: 37
-      line: 58
+      line: 60

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_document_highlight.test[document_highlight.robot-009-045-Variable_in_library_params].out

@@ -26,7 +26,7 @@ result:
   range:
     end:
       character: 44
-      line: 58
+      line: 60
     start:
       character: 37
-      line: 58
+      line: 60

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_document_highlight.test[document_highlight.robot-012-023-suite_fixture_keyword_call_with_namespace].out

@@ -26,52 +26,52 @@ result:
   range:
     end:
       character: 29
-      line: 26
+      line: 28
     start:
       character: 15
-      line: 26
+      line: 28
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 40
-      line: 28
+      line: 30
     start:
       character: 26
-      line: 28
+      line: 30
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 18
-      line: 32
+      line: 34
     start:
       character: 4
-      line: 32
+      line: 34
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 26
-      line: 34
+      line: 36
     start:
       character: 12
-      line: 34
+      line: 36
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 32
-      line: 41
+      line: 43
     start:
       character: 18
-      line: 41
+      line: 43
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 40
-      line: 47
+      line: 49
     start:
       character: 26
-      line: 47
+      line: 49

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_document_highlight.test[document_highlight.robot-012-030-suite_fixture_keyword_call_with_namespace].out

@@ -26,52 +26,52 @@ result:
   range:
     end:
       character: 29
-      line: 26
+      line: 28
     start:
       character: 15
-      line: 26
+      line: 28
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 40
-      line: 28
+      line: 30
     start:
       character: 26
-      line: 28
+      line: 30
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 18
-      line: 32
+      line: 34
     start:
       character: 4
-      line: 32
+      line: 34
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 26
-      line: 34
+      line: 36
     start:
       character: 12
-      line: 34
+      line: 36
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 32
-      line: 41
+      line: 43
     start:
       character: 18
-      line: 41
+      line: 43
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 40
-      line: 47
+      line: 49
     start:
       character: 26
-      line: 47
+      line: 49

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_document_highlight.test[document_highlight.robot-012-036-suite_fixture_keyword_call_with_namespace].out

@@ -26,52 +26,52 @@ result:
   range:
     end:
       character: 29
-      line: 26
+      line: 28
     start:
       character: 15
-      line: 26
+      line: 28
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 40
-      line: 28
+      line: 30
     start:
       character: 26
-      line: 28
+      line: 30
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 18
-      line: 32
+      line: 34
     start:
       character: 4
-      line: 32
+      line: 34
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 26
-      line: 34
+      line: 36
     start:
       character: 12
-      line: 34
+      line: 36
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 32
-      line: 41
+      line: 43
     start:
       character: 18
-      line: 41
+      line: 43
 - !DocumentHighlight
   kind: !DocumentHighlightKind 'TEXT'
   range:
     end:
       character: 40
-      line: 47
+      line: 49
     start:
       character: 26
-      line: 47
+      line: 49