analysing run keywords now correctly unescape keywords

Author: d-biehl

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to the "robotcode" extension will be documented in this file
 
 - some refactoring to speedup loading and parsing documents
 - semantic tokens now highlight builtin keywords
+- analysing run keywords now correctly unescape keywords
 
 ##  0.3.2
 

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -597,20 +597,25 @@ async def _analyze_keyword_call(
     async def _analyse_run_keyword(
         self, keyword_doc: Optional[KeywordDoc], node: ast.AST, argument_tokens: List[Token]
     ) -> List[Token]:
+        from robot.utils.escaping import unescape
 
         if keyword_doc is None or not keyword_doc.is_any_run_keyword():
             return argument_tokens
 
         if keyword_doc.is_run_keyword() and len(argument_tokens) > 0 and is_not_variable_token(argument_tokens[0]):
-            await self._analyze_keyword_call(argument_tokens[0].value, node, argument_tokens[0], argument_tokens[1:])
+            await self._analyze_keyword_call(
+                unescape(argument_tokens[0].value), node, argument_tokens[0], argument_tokens[1:]
+            )
 
             return argument_tokens[1:]
         elif (
             keyword_doc.is_run_keyword_with_condition()
             and len(argument_tokens) > 1
             and is_not_variable_token(argument_tokens[1])
         ):
-            await self._analyze_keyword_call(argument_tokens[1].value, node, argument_tokens[1], argument_tokens[2:])
+            await self._analyze_keyword_call(
+                unescape(argument_tokens[1].value), node, argument_tokens[1], argument_tokens[2:]
+            )
             return argument_tokens[2:]
         elif keyword_doc.is_run_keywords():
             has_and = False
@@ -642,7 +647,7 @@ async def _analyse_run_keyword(
                     args = argument_tokens
                     argument_tokens = []
 
-                await self._analyze_keyword_call(t.value, node, t, args)
+                await self._analyze_keyword_call(unescape(t.value), node, t, args)
 
             return []
 
@@ -658,7 +663,7 @@ def skip_args() -> None:
 
             result = (
                 await self._analyze_keyword_call(
-                    argument_tokens[1].value,
+                    unescape(argument_tokens[1].value),
                     node,
                     argument_tokens[1],
                     argument_tokens[2:],
@@ -679,7 +684,7 @@ def skip_args() -> None:
                 if argument_tokens[0].value == "ELSE" and len(argument_tokens) > 1:
 
                     result = await self._analyze_keyword_call(
-                        argument_tokens[1].value,
+                        unescape(argument_tokens[1].value),
                         node,
                         argument_tokens[1],
                         argument_tokens[2:],
@@ -697,7 +702,7 @@ def skip_args() -> None:
                 elif argument_tokens[0].value == "ELSE IF" and len(argument_tokens) > 2:
 
                     result = await self._analyze_keyword_call(
-                        argument_tokens[2].value,
+                        unescape(argument_tokens[2].value),
                         node,
                         argument_tokens[2],
                         argument_tokens[3:],

robotcode/language_server/robotframework/parts/model_helper.py

@@ -16,13 +16,14 @@ async def get_run_keyword_keyworddoc_and_token_from_position(
         namespace: Namespace,
         position: Position,
     ) -> Tuple[Optional[Tuple[Optional[KeywordDoc], Token]], List[Token]]:
+        from robot.utils.escaping import unescape
 
         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]):
             result = await self.get_keyworddoc_and_token_from_position(
-                argument_tokens[0].value, argument_tokens[0], argument_tokens[1:], namespace, position
+                unescape(argument_tokens[0].value), argument_tokens[0], argument_tokens[1:], namespace, position
             )
 
             return result, argument_tokens[1:]
@@ -32,7 +33,7 @@ async def get_run_keyword_keyworddoc_and_token_from_position(
             and is_not_variable_token(argument_tokens[1])
         ):
             result = await self.get_keyworddoc_and_token_from_position(
-                argument_tokens[1].value, argument_tokens[1], argument_tokens[2:], namespace, position
+                unescape(argument_tokens[1].value), argument_tokens[1], argument_tokens[2:], namespace, position
             )
 
             return result, argument_tokens[2:]
@@ -55,7 +56,9 @@ async def get_run_keyword_keyworddoc_and_token_from_position(
                     else:
                         args = []
 
-                result = await self.get_keyworddoc_and_token_from_position(t.value, t, args, namespace, position)
+                result = await self.get_keyworddoc_and_token_from_position(
+                    unescape(t.value), t, args, namespace, position
+                )
                 if result is not None and result[0] is not None:
                     return result, []
 
@@ -99,7 +102,7 @@ def skip_args() -> None:
 
             while argument_tokens:
                 if argument_tokens[0].value == "ELSE" and len(argument_tokens) > 1:
-                    inner_keyword_doc = await namespace.find_keyword(argument_tokens[1].value)
+                    inner_keyword_doc = await namespace.find_keyword(unescape(argument_tokens[1].value))
 
                     if position.is_in_range(range_from_token(argument_tokens[1])):
                         return (inner_keyword_doc, argument_tokens[1]), argument_tokens[2:]
@@ -119,7 +122,7 @@ def skip_args() -> None:
 
                     break
                 elif argument_tokens[0].value == "ELSE IF" and len(argument_tokens) > 2:
-                    inner_keyword_doc = await namespace.find_keyword(argument_tokens[2].value)
+                    inner_keyword_doc = await namespace.find_keyword(unescape(argument_tokens[2].value))
 
                     if position.is_in_range(range_from_token(argument_tokens[2])):
                         return (inner_keyword_doc, argument_tokens[2]), argument_tokens[3:]