fix(langserver): corrected highlightning of embedded arguments if there is a namespace given before the keyword

fixes #434

Author: d-biehl

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

@@ -528,7 +528,7 @@ def generate_sem_sub_tokens(
                                 Token.ARGUMENT,
                                 token.value[arg_start:arg_end],
                                 token.lineno,
-                                token.col_offset + arg_start,
+                                token.col_offset + kw_index + arg_start,
                             )
 
                             for sub_token in ModelHelper.tokenize_variables(

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_semantic_tokens.test[sematic_tokenizing.robot].out

@@ -2,6 +2,21 @@ result: !SemanticTokens
   data:
   - 0
   - 0
+  - 16
+  - 27
+  - 0
+  - 1
+  - 0
+  - 8
+  - 24
+  - 0
+  - 0
+  - 12
+  - 22
+  - 51
+  - 0
+  - 2
+  - 0
   - 18
   - 29
   - 0
@@ -152,6 +167,61 @@ result: !SemanticTokens
   - 0
   - 2
   - 0
+  - 27
+  - 33
+  - 1
+  - 1
+  - 4
+  - 3
+  - 39
+  - 0
+  - 0
+  - 3
+  - 4
+  - 36
+  - 2048
+  - 0
+  - 5
+  - 5
+  - 39
+  - 0
+  - 0
+  - 5
+  - 5
+  - 36
+  - 2048
+  - 1
+  - 4
+  - 13
+  - 51
+  - 0
+  - 0
+  - 13
+  - 1
+  - 21
+  - 0
+  - 0
+  - 1
+  - 3
+  - 39
+  - 0
+  - 0
+  - 3
+  - 4
+  - 36
+  - 2048
+  - 0
+  - 5
+  - 5
+  - 39
+  - 0
+  - 0
+  - 5
+  - 5
+  - 36
+  - 2048
+  - 2
+  - 0
   - 16
   - 32
   - 0

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_semantic_tokens.test[versions--rf61--__init__.robot].out renamed to tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_semantic_tokens.test[versions-rf61-__init__.robot].out

@@ -1379,6 +1379,51 @@ result:
     uri: duplicated_resources.robot
   name: first
   tags: null
+- !WorkspaceSymbol
+  container_name: embedded_args
+  data: null
+  kind: 13
+  location:
+    range:
+      end:
+        character: 10
+        line: 1
+      start:
+        character: 3
+        line: 1
+    uri: embedded_args.resource
+  name: ${task}
+  tags: null
+- !WorkspaceSymbol
+  container_name: embedded_args
+  data: null
+  kind: 13
+  location:
+    range:
+      end:
+        character: 24
+        line: 1
+      start:
+        character: 16
+        line: 1
+    uri: embedded_args.resource
+  name: ${thing}
+  tags: null
+- !WorkspaceSymbol
+  container_name: embedded_args
+  data: null
+  kind: 12
+  location:
+    range:
+      end:
+        character: 24
+        line: 1
+      start:
+        character: 0
+        line: 1
+    uri: embedded_args.resource
+  name: do ${task} with ${thing}
+  tags: null
 - !WorkspaceSymbol
   container_name: embedded_keywords
   data: null
@@ -4478,10 +4523,10 @@ result:
     range:
       end:
         character: 23
-        line: 24
+        line: 31
       start:
         character: 19
-        line: 24
+        line: 31
     uri: sematic_tokenizing.robot
   name: ${a}
   tags: null
@@ -4493,10 +4538,10 @@ result:
     range:
       end:
         character: 31
-        line: 24
+        line: 31
       start:
         character: 27
-        line: 24
+        line: 31
     uri: sematic_tokenizing.robot
   name: ${b}
   tags: null
@@ -4508,10 +4553,10 @@ result:
     range:
       end:
         character: 39
-        line: 24
+        line: 31
       start:
         character: 35
-        line: 24
+        line: 31
     uri: sematic_tokenizing.robot
   name: ${c}
   tags: null
@@ -4523,10 +4568,10 @@ result:
     range:
       end:
         character: 26
-        line: 19
+        line: 26
       start:
         character: 19
-        line: 19
+        line: 26
     uri: sematic_tokenizing.robot
   name: ${type}
   tags: null
@@ -4538,10 +4583,10 @@ result:
     range:
       end:
         character: 40
-        line: 1
+        line: 4
       start:
         character: 0
-        line: 1
+        line: 4
     uri: sematic_tokenizing.robot
   name: Continue when iteration limit is reached
   tags: null
@@ -4553,10 +4598,10 @@ result:
     range:
       end:
         character: 24
-        line: 7
+        line: 10
       start:
         character: 0
-        line: 7
+        line: 10
     uri: sematic_tokenizing.robot
   name: Limit as iteration count
   tags: null
@@ -4568,13 +4613,28 @@ result:
     range:
       end:
         character: 12
-        line: 18
+        line: 25
       start:
         character: 0
-        line: 18
+        line: 25
     uri: sematic_tokenizing.robot
   name: do something
   tags: null
+- !WorkspaceSymbol
+  container_name: sematic_tokenizing
+  data: null
+  kind: 5
+  location:
+    range:
+      end:
+        character: 27
+        line: 20
+      start:
+        character: 0
+        line: 20
+    uri: sematic_tokenizing.robot
+  name: some embedded args keywords
+  tags: null
 - !WorkspaceSymbol
   container_name: sematic_tokenizing
   data: null
@@ -4583,10 +4643,10 @@ result:
     range:
       end:
         character: 14
-        line: 12
+        line: 15
       start:
         character: 0
-        line: 12
+        line: 15
     uri: sematic_tokenizing.robot
   name: some templated
   tags: null
@@ -4598,10 +4658,10 @@ result:
     range:
       end:
         character: 8
-        line: 23
+        line: 30
       start:
         character: 0
-        line: 23
+        line: 30
     uri: sematic_tokenizing.robot
   name: template
   tags: null

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_semantic_tokens.test[versions--rf61--embedded_keywords.robot].out renamed to tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_semantic_tokens.test[versions-rf61-embedded_keywords.robot].out

@@ -359,6 +359,36 @@ result:
     uri: duplicated.resource
   name: a resource keyword B
   tags: null
+- !WorkspaceSymbol
+  container_name: embedded_args
+  data: null
+  kind: 13
+  location:
+    range:
+      end:
+        character: 10
+        line: 1
+      start:
+        character: 3
+        line: 1
+    uri: embedded_args.resource
+  name: ${task}
+  tags: null
+- !WorkspaceSymbol
+  container_name: embedded_args
+  data: null
+  kind: 12
+  location:
+    range:
+      end:
+        character: 24
+        line: 1
+      start:
+        character: 0
+        line: 1
+    uri: embedded_args.resource
+  name: do ${task} with ${thing}
+  tags: null
 - !WorkspaceSymbol
   container_name: embedded_keywords
   data: null
@@ -877,10 +907,10 @@ result:
     range:
       end:
         character: 40
-        line: 1
+        line: 4
       start:
         character: 0
-        line: 1
+        line: 4
     uri: sematic_tokenizing.robot
   name: Continue when iteration limit is reached
   tags: null
@@ -892,13 +922,28 @@ result:
     range:
       end:
         character: 24
-        line: 7
+        line: 10
       start:
         character: 0
-        line: 7
+        line: 10
     uri: sematic_tokenizing.robot
   name: Limit as iteration count
   tags: null
+- !WorkspaceSymbol
+  container_name: sematic_tokenizing
+  data: null
+  kind: 5
+  location:
+    range:
+      end:
+        character: 27
+        line: 20
+      start:
+        character: 0
+        line: 20
+    uri: sematic_tokenizing.robot
+  name: some embedded args keywords
+  tags: null
 - !WorkspaceSymbol
   container_name: some_tasks
   data: null