Merge #3363

3363: Cleanup highlighting tags r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 64 insertions, 20 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 6fc123ac0..b013c3f4a 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -400,24 +400,42 @@
         ],
         "semanticTokenTypes": [
             {
-                "id": "attribute"
+                "id": "attribute",
+                "description": "Style for attributes"
             },
             {
-                "id": "constant"
+                "id": "builtinType",
+                "description": "Style for builtin types"
+            },
+            {
+                "id": "lifetime",
+                "description": "Style for lifetimes"
+            },
+            {
+                "id": "typeAlias",
+                "description": "Style for type aliases"
+            },
+            {
+                "id": "union",
+                "description": "Style for C-style untagged unions"
             }
         ],
         "semanticTokenModifiers": [
             {
-                "id": "mutable"
+                "id": "constant",
+                "description": "Style for compile-time constants"
             },
             {
-                "id": "unsafe"
+                "id": "control",
+                "description": "Style for control flow keywords"
             },
             {
-                "id": "control"
+                "id": "mutable",
+                "description": "Style for mutable bindings"
             },
             {
-                "id": "builtin"
+                "id": "unsafe",
+                "description": "Style for unsafe operations"
             }
         ],
         "semanticTokenStyleDefaults": [
@@ -428,21 +446,29 @@
                 ]
             },
             {
-                "selector": "*.mutable",
-                "light": {
-                    "fontStyle": "underline"
-                },
-                "dark": {
-                    "fontStyle": "underline"
-                },
-                "highContrast": {
-                    "fontStyle": "underline"
-                }
+                "selector": "builtinType",
+                "scope": [
+                    "support.type.primitive"
+                ]
             },
             {
-                "selector": "constant",
+                "selector": "lifetime",
                 "scope": [
-                    "entity.name.constant"
+                    "entity.name.lifetime.rust"
+                ]
+            },
+            {
+                "selector": "typeAlias",
+                "scope": [
+                    "entity.name.type",
+                    "entity.name.typeAlias"
+                ]
+            },
+            {
+                "selector": "union",
+                "scope": [
+                    "entity.name.type",
+                    "entity.name.union"
                 ]
             },
             {
@@ -452,10 +478,28 @@
                 ]
             },
             {
-                "selector": "type.builtin",
+                "selector": "keyword.control",
                 "scope": [
-                    "support.type.builtin"
+                    "keyword.control"
                 ]
+            },
+            {
+                "selector": "variable.constant",
+                "scope": [
+                    "entity.name.constant"
+                ]
+            },
+            {
+                "selector": "*.mutable",
+                "light": {
+                    "fontStyle": "underline"
+                },
+                "dark": {
+                    "fontStyle": "underline"
+                },
+                "highContrast": {
+                    "fontStyle": "underline"
+                }
             }
         ]
     }