correct handling of templates with embedded arguments

Author: d-biehl

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to the "robotcode" extension will be documented in this file
 - support for progress feature of language server protocol
 - correct WHILE snippets
 - handle invalid regular expressions in embedded keywords
+- correct handling of templates with embedded arguments
 
 ##  0.11.6
 

robotcode/language_server/robotframework/diagnostics/analyzer.py

@@ -55,12 +55,17 @@ async def run(self) -> List[Diagnostic]:
 
     async def visit(self, node: ast.AST) -> None:
         from robot.parsing.lexer.tokens import Token as RobotToken
-        from robot.parsing.model.statements import DocumentationOrMetadata, KeywordCall
+        from robot.parsing.model.statements import (
+            DocumentationOrMetadata,
+            KeywordCall,
+            Template,
+            TestTemplate,
+        )
         from robot.variables.search import contains_variable
 
         self.node_stack.append(node)
         try:
-            if isinstance(node, HasTokens):
+            if isinstance(node, HasTokens) and not isinstance(node, (TestTemplate, Template)):
                 for token in (
                     t
                     for t in node.tokens
@@ -185,13 +190,14 @@ async def _analyze_keyword_call(
         keyword_token: Token,
         argument_tokens: List[Token],
         analyse_run_keywords: bool = True,
+        allow_variables: bool = False,
     ) -> Optional[KeywordDoc]:
         from robot.parsing.model.statements import Template, TestTemplate
 
         result: Optional[KeywordDoc] = None
 
         try:
-            if not is_not_variable_token(keyword_token):
+            if not allow_variables and not is_not_variable_token(keyword_token):
                 return None
 
             result = await self.finder.find_keyword(keyword)
@@ -475,14 +481,10 @@ async def visit_TestTemplate(self, node: ast.AST) -> None:  # noqa: N802
         value = cast(TestTemplate, node)
         keyword_token = cast(Token, value.get_token(RobotToken.NAME))
 
-        # TODO: calculate possible variables in NAME
-
-        if (
-            keyword_token is not None
-            and is_not_variable_token(keyword_token)
-            and keyword_token.value.upper() not in ("", "NONE")
-        ):
-            await self._analyze_keyword_call(value.value, value, keyword_token, [])
+        if keyword_token is not None and keyword_token.value.upper() not in ("", "NONE"):
+            await self._analyze_keyword_call(
+                value.value, value, keyword_token, [], analyse_run_keywords=False, allow_variables=True
+            )
 
         self.test_template = value
         await self.generic_visit(node)
@@ -494,14 +496,10 @@ async def visit_Template(self, node: ast.AST) -> None:  # noqa: N802
         value = cast(Template, node)
         keyword_token = cast(Token, value.get_token(RobotToken.NAME))
 
-        # TODO: calculate possible variables in NAME
-
-        if (
-            keyword_token is not None
-            and is_not_variable_token(keyword_token)
-            and keyword_token.value.upper() not in ("", "NONE")
-        ):
-            await self._analyze_keyword_call(value.value, value, keyword_token, [])
+        if keyword_token is not None and keyword_token.value.upper() not in ("", "NONE"):
+            await self._analyze_keyword_call(
+                value.value, value, keyword_token, [], analyse_run_keywords=False, allow_variables=True
+            )
 
         await self.generic_visit(node)