semantic tokens now highlight run keywords

Author: d-biehl

CHANGELOG.md

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

package.json

@@ -71,7 +71,7 @@
         "id": "builtin",
         "description": "built in library, keyword or variable"
       }
-    ],    
+    ],        
     "semanticTokenScopes": [
       {
         "language": "robotframework",
@@ -118,11 +118,14 @@
           "variable": [
             "variable.other.readwrite.robotframework"
           ],
-          "keywordCall": [
-            "meta.function-call.keyword.robotframework"
+          "keywordCall": [            
+            "variable.function.keyword-call.robotframework"
           ],
-          "nameCall": [
-            "meta.function-call.name.robotframework"
+          "keywordCallInner": [            
+            "variable.function.keyword-call.inner.robotframework"
+          ],
+          "nameCall": [            
+            "variable.function.keyword-call.robotframework"
           ],
           "continuation": [
             "punctuation.separator.continuation.robotframework"

robotcode/language_server/robotframework/parts/references.py

@@ -347,12 +347,16 @@ async def get_keyword_references_from_tokens(
         node: ast.AST,
         kw_token: Optional[Token],
         arguments: Optional[List[Token]],
+        unescape_kw_token: bool = False,
     ) -> AsyncGenerator[Location, None]:
+        from robot.utils.escaping import unescape
+
         if kw_token is not None and is_not_variable_token(kw_token):
             kw: Optional[KeywordDoc] = None
             kw_matcher = KeywordMatcher(kw_doc.name)
+            kw_name = unescape(kw_token.value) if unescape_kw_token else kw_token.value
 
-            for lib, name in yield_owner_and_kw_names(kw_token.value):
+            for lib, name in yield_owner_and_kw_names(kw_name):
                 if lib is not None:
                     lib_matcher = KeywordMatcher(lib)
                     if (
@@ -364,7 +368,7 @@ async def get_keyword_references_from_tokens(
                 if name is not None:
                     name_matcher = KeywordMatcher(name)
                     if kw_matcher == name_matcher:
-                        kw = await namespace.find_keyword(str(kw_token.value))
+                        kw = await namespace.find_keyword(kw_name)
 
                         if kw is not None and kw == kw_doc:
                             yield Location(
@@ -386,7 +390,6 @@ async def get_keyword_references_from_any_run_keyword(
         kw_token: Token,
         arguments: List[Token],
     ) -> AsyncGenerator[Location, None]:
-
         if kw_token is None or not is_not_variable_token(kw_token):
             return
 
@@ -402,11 +405,11 @@ async def get_keyword_references_from_any_run_keyword(
                 yield e
         elif kw.is_run_keyword_with_condition() and len(arguments) > 1 and is_not_variable_token(arguments[1]):
             async for e in self.get_keyword_references_from_tokens(
-                namespace, kw_doc, node, arguments[1], arguments[2:]
+                namespace, kw_doc, node, arguments[1], arguments[2:], True
             ):
                 yield e
         elif kw.is_run_keywords():
-
+            has_separator = False
             while arguments:
 
                 t = arguments[0]
@@ -419,9 +422,13 @@ async def get_keyword_references_from_any_run_keyword(
                 if separator_token is not None:
                     args = arguments[: arguments.index(separator_token)]
                     arguments = arguments[arguments.index(separator_token) + 1 :]
+                    has_separator = True
+                else:
+                    if has_separator:
+                        args = arguments
 
                 if is_not_variable_token(t):
-                    async for e in self.get_keyword_references_from_tokens(namespace, kw_doc, node, t, args):
+                    async for e in self.get_keyword_references_from_tokens(namespace, kw_doc, node, t, args, True):
                         yield e
         elif kw.is_run_keyword_if() and len(arguments) > 1:
             arguments = arguments[1:]
@@ -442,7 +449,7 @@ async def get_keyword_references_from_any_run_keyword(
                         arguments = arguments[1:]
 
                 if is_not_variable_token(t):
-                    async for e in self.get_keyword_references_from_tokens(namespace, kw_doc, node, t, args):
+                    async for e in self.get_keyword_references_from_tokens(namespace, kw_doc, node, t, args, True):
                         yield e
 
     async def _find_keyword_references(self, document: TextDocument, kw_doc: KeywordDoc) -> List[Location]: