3 files changed, 15 insertions, 9 deletions

diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 04f5bb473..b6a015790 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -120,12 +120,10 @@ impl Config {
         set(value, "/withSysroot", &mut self.with_sysroot);
         set(value, "/featureFlags/lsp.diagnostics", &mut self.publish_diagnostics);
         set(value, "/lruCapacity", &mut self.lru_capacity);
-        if let Some(watcher) =  get::<String>(value, "/files/watcher") {
-            self.files.watcher = match watcher.as_str() {
-                "client" => FilesWatcher::Client,
-                "notify"| _ => FilesWatcher::Notify,
-            }
-        }
+        self.files.watcher = match get(value, "/files/watcher") {
+            Some("client") => FilesWatcher::Client,
+            Some("notify") | _ => FilesWatcher::Notify
+        };
         set(value, "/notifications/workspaceLoaded", &mut self.notifications.workspace_loaded);
         set(value, "/notifications/cargoTomlNotFound", &mut self.notifications.cargo_toml_not_found);
 
@@ -144,8 +142,9 @@ impl Config {
         } else if let RustfmtConfig::Rustfmt { extra_args } = &mut self.rustfmt {
             set(value, "/rustfmt/extraArgs", extra_args);
         }
+
         if let Some(false) = get(value, "/checkOnSave/enable") {
-            self.check = None
+            self.check = None;
         } else {
             if let Some(mut args) = get::<Vec<String>>(value, "/checkOnSave/overrideCommand") {
                 if !args.is_empty() {
@@ -153,7 +152,7 @@ impl Config {
                     self.check = Some(FlycheckConfig::CustomCommand {
                         command,
                         args,
-                    })
+                    });
                 }
 
             } else if let Some(FlycheckConfig::CargoCommand { command, extra_args, all_targets }) = &mut self.check
@@ -179,7 +178,7 @@ impl Config {
             value.pointer(pointer).and_then(|it| T::deserialize(it).ok())
         }
 
-        fn set<'a, T: Deserialize<'a> + std::fmt::Debug>(value: &'a serde_json::Value, pointer: &str, slot: &mut T) {
+        fn set<'a, T: Deserialize<'a>>(value: &'a serde_json::Value, pointer: &str, slot: &mut T) {
             if let Some(new_value) = get(value, pointer) {
                 *slot = new_value
             }
diff --git a/editors/code/package.json b/editors/code/package.json
index 595d6e378..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": {
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);