fix(robotlangserver): try to hover, goto, ... for keyword with variables in names

Author: d-biehl

robotcode/language_server/robotframework/parts/model_helper.py

@@ -23,7 +23,6 @@
 from ..diagnostics.namespace import DEFAULT_BDD_PREFIXES, LibraryEntry, Namespace
 from ..utils.ast_utils import (
     Token,
-    is_not_variable_token,
     iter_over_keyword_names_and_owners,
     range_from_token,
     strip_variable_token,
@@ -46,16 +45,14 @@ async def get_run_keyword_keyworddoc_and_token_from_position(
         if keyword_doc is None or not keyword_doc.is_any_run_keyword():
             return None, argument_tokens
 
-        if keyword_doc.is_run_keyword() and len(argument_tokens) > 0 and is_not_variable_token(argument_tokens[0]):
+        if keyword_doc.is_run_keyword() and len(argument_tokens) > 0:
             result = await cls.get_keyworddoc_and_token_from_position(
                 unescape(argument_tokens[0].value), argument_tokens[0], argument_tokens[1:], namespace, position
             )
 
             return result, argument_tokens[1:]
-        elif (
-            keyword_doc.is_run_keyword_with_condition()
-            and len(argument_tokens) > (cond_count := keyword_doc.run_keyword_condition_count())
-            and is_not_variable_token(argument_tokens[1])
+        elif keyword_doc.is_run_keyword_with_condition() and len(argument_tokens) > (
+            cond_count := keyword_doc.run_keyword_condition_count()
         ):
             result = await cls.get_keyworddoc_and_token_from_position(
                 unescape(argument_tokens[cond_count].value),
@@ -107,11 +104,7 @@ def skip_args() -> None:
                         break
                     argument_tokens = argument_tokens[1:]
 
-            inner_keyword_doc = (
-                await namespace.find_keyword(argument_tokens[1].value)
-                if is_not_variable_token(argument_tokens[1])
-                else None
-            )
+            inner_keyword_doc = await namespace.find_keyword(argument_tokens[1].value, raise_keyword_error=False)
 
             if position.is_in_range(range_from_token(argument_tokens[1])):
                 return (inner_keyword_doc, argument_tokens[1]), argument_tokens[2:]

robotcode/language_server/robotframework/parts/semantic_tokens.py

@@ -51,7 +51,6 @@
 from ..utils.ast_utils import (
     HasTokens,
     Token,
-    is_not_variable_token,
     iter_over_keyword_names_and_owners,
     token_in_range,
 )
@@ -545,7 +544,7 @@ async def skip_non_data_tokens() -> AsyncGenerator[Tuple[Token, ast.AST], None]:
                     builtin_library_doc,
                     libraries_matchers,
                     resources_matchers,
-                    await namespace.find_keyword(unescape(token.value)) if is_not_variable_token(token) else None,
+                    await namespace.find_keyword(unescape(token.value), raise_keyword_error=False),
                     RobotToken(ROBOT_KEYWORD_INNER, token.value, token.lineno, token.col_offset, token.error),
                     arguments[1:],
                     node,
@@ -567,7 +566,7 @@ async def skip_non_data_tokens() -> AsyncGenerator[Tuple[Token, ast.AST], None]:
                         builtin_library_doc,
                         libraries_matchers,
                         resources_matchers,
-                        await namespace.find_keyword(unescape(token.value)) if is_not_variable_token(token) else None,
+                        await namespace.find_keyword(unescape(token.value), raise_keyword_error=False),
                         RobotToken(ROBOT_KEYWORD_INNER, token.value, token.lineno, token.col_offset, token.error),
                         arguments[1:],
                         node,
@@ -607,7 +606,7 @@ async def skip_non_data_tokens() -> AsyncGenerator[Tuple[Token, ast.AST], None]:
                         builtin_library_doc,
                         libraries_matchers,
                         resources_matchers,
-                        await namespace.find_keyword(unescape(token.value)) if is_not_variable_token(token) else None,
+                        await namespace.find_keyword(unescape(token.value), raise_keyword_error=False),
                         RobotToken(ROBOT_KEYWORD_INNER, token.value, token.lineno, token.col_offset, token.error),
                         args,
                         node,
@@ -647,11 +646,7 @@ async def generate_run_kw_if() -> AsyncGenerator[Tuple[Token, ast.AST], None]:
                                 arguments = arguments[1:]
                             continue
 
-                        inner_kw_doc = (
-                            await namespace.find_keyword(unescape(token.value))
-                            if is_not_variable_token(token)
-                            else None
-                        )
+                        inner_kw_doc = await namespace.find_keyword(unescape(token.value), raise_keyword_error=False)
 
                         if inner_kw_doc is not None and inner_kw_doc.is_run_keyword_if():
                             yield RobotToken(