Merge #4090

4090: Fix config naming r=matklad a=matklad

bors r+
🤖

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

Author: bors[bot]

crates/rust-analyzer/src/config.rs

@@ -118,7 +118,7 @@ impl Config {
         self.client_caps = client_caps;
 
         set(value, "/withSysroot", &mut self.with_sysroot);
-        set(value, "/featureFlags/lsp.diagnostics", &mut self.publish_diagnostics);
+        set(value, "/diagnostics/enable", &mut self.publish_diagnostics);
         set(value, "/lruCapacity", &mut self.lru_capacity);
         self.files.watcher = match get(value, "/files/watcher") {
             Some("client") => FilesWatcher::Client,
@@ -132,7 +132,7 @@ impl Config {
         set(value, "/cargo/features", &mut self.cargo.features);
         set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
 
-        match get::<bool>(value, "/procMacro/enabled") {
+        match get::<bool>(value, "/procMacro/enable") {
             Some(true) => {
                 if let Ok(path) = std::env::current_exe() {
                     self.proc_macro_srv = Some((path.to_string_lossy().to_string(), vec!["proc-macro".to_string()]));

editors/code/package.json

@@ -389,7 +389,7 @@
                     "type": "boolean",
                     "default": false
                 },
-                "rust-analyzer.procMacro.enabled": {
+                "rust-analyzer.procMacro.enable": {
                     "description": "Enable Proc macro support, cargo.loadOutDirsFromCheck must be enabled.",
                     "type": "boolean",
                     "default": false