3 files changed, 14 insertions, 3 deletions

diff --git a/editors/code/.vscodeignore b/editors/code/.vscodeignore
index 17c378a49..ac411f8e2 100644
--- a/editors/code/.vscodeignore
+++ b/editors/code/.vscodeignore
@@ -2,5 +2,6 @@
 !out/main.js
 !package.json
 !package-lock.json
+!ra_syntax_tree.tmGrammar.json
 !icon.png
 !README.md
diff --git a/editors/code/package.json b/editors/code/package.json
index 88b7ee86a..f0d5127d4 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -211,10 +211,12 @@
                 },
                 "rust-analyzer.notifications.workspaceLoaded": {
                     "type": "boolean",
+                    "default": true,
                     "markdownDescription": "Whether to show `workspace loaded` message."
                 },
                 "rust-analyzer.notifications.cargoTomlNotFound": {
                     "type": "boolean",
+                    "default": true,
                     "markdownDescription": "Whether to show `can't find Cargo.toml` error message"
                 },
                 "rust-analyzer.cargo.noDefaultFeatures": {
@@ -253,6 +255,7 @@
                     "items": {
                         "type": "string"
                     },
+                    "default": [],
                     "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for formatting."
                 },
                 "rust-analyzer.checkOnSave.enable": {
@@ -278,6 +281,7 @@
                     "items": {
                         "type": "string"
                     },
+                    "default": [],
                     "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for checking. The command should include `--message=format=json` or similar option."
                 },
                 "rust-analyzer.checkOnSave.allTargets": {
@@ -327,6 +331,7 @@
                 },
                 "rust-analyzer.callInfo.full": {
                     "type": "boolean",
+                    "default": true,
                     "description": "Show function name and docs in parameter hints"
                 },
                 "rust-analyzer.highlighting.semanticTokens": {
@@ -488,7 +493,8 @@
             },
             {
                 "id": "builtinType",
-                "description": "Style for builtin types"
+                "description": "Style for builtin types",
+                "superType": "type"
             },
             {
                 "id": "lifetime",
@@ -496,11 +502,13 @@
             },
             {
                 "id": "typeAlias",
-                "description": "Style for type aliases"
+                "description": "Style for type aliases",
+                "superType": "type"
             },
             {
                 "id": "union",
-                "description": "Style for C-style untagged unions"
+                "description": "Style for C-style untagged unions",
+                "superType": "type"
             }
         ],
         "semanticTokenModifiers": [
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 4f3b89f44..efd56a84b 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -177,6 +177,8 @@ async function bootstrapServer(config: Config, state: PersistentState): Promise<
         );
     }
 
+    log.debug("Using server binary at", path);
+
     const res = spawnSync(path, ["--version"], { encoding: 'utf8' });
     log.debug("Checked binary availability via --version", res);
     log.debug(res, "--version output:", res.output);