1 files changed, 62 insertions, 25 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index e484467b0..862de3210 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -155,11 +155,6 @@
                 "when": "editorTextFocus && editorLangId == rust"
             },
             {
-                "command": "rust-analyzer.run",
-                "key": "ctrl+r",
-                "when": "editorTextFocus && editorLangId == rust"
-            },
-            {
                 "command": "rust-analyzer.onEnter",
                 "key": "enter",
                 "when": "editorTextFocus && !suggestWidgetVisible && editorLangId == rust && !vim.active || vim.mode == 'Insert' && editorTextFocus && !suggestWidgetVisible && editorLangId == rust"
@@ -405,24 +400,42 @@
         ],
         "semanticTokenTypes": [
             {
-                "id": "attribute"
+                "id": "attribute",
+                "description": "Style for attributes"
+            },
+            {
+                "id": "builtinType",
+                "description": "Style for builtin types"
             },
             {
-                "id": "constant"
+                "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": [
@@ -433,21 +446,27 @@
                 ]
             },
             {
-                "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.typeAlias"
+                ]
+            },
+            {
+                "selector": "union",
+                "scope": [
+                    "entity.name.union"
                 ]
             },
             {
@@ -457,10 +476,28 @@
                 ]
             },
             {
-                "selector": "type.builtin",
+                "selector": "keyword.control",
+                "scope": [
+                    "keyword.control"
+                ]
+            },
+            {
+                "selector": "variable.constant",
                 "scope": [
-                    "support.type.builtin"
+                    "entity.name.constant"
                 ]
+            },
+            {
+                "selector": "*.mutable",
+                "light": {
+                    "fontStyle": "underline"
+                },
+                "dark": {
+                    "fontStyle": "underline"
+                },
+                "highContrast": {
+                    "fontStyle": "underline"
+                }
             }
         ]
     }