aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/rust-analyzer/src/config.rs4
-rw-r--r--editors/code/package.json2
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
index 3597a14e3..f60b805a4 100644
--- a/crates/rust-analyzer/src/config.rs
+++ b/crates/rust-analyzer/src/config.rs
@@ -118,7 +118,7 @@ impl Config {
118 self.client_caps = client_caps; 118 self.client_caps = client_caps;
119 119
120 set(value, "/withSysroot", &mut self.with_sysroot); 120 set(value, "/withSysroot", &mut self.with_sysroot);
121 set(value, "/featureFlags/lsp.diagnostics", &mut self.publish_diagnostics); 121 set(value, "/diagnostics/enable", &mut self.publish_diagnostics);
122 set(value, "/lruCapacity", &mut self.lru_capacity); 122 set(value, "/lruCapacity", &mut self.lru_capacity);
123 self.files.watcher = match get(value, "/files/watcher") { 123 self.files.watcher = match get(value, "/files/watcher") {
124 Some("client") => FilesWatcher::Client, 124 Some("client") => FilesWatcher::Client,
@@ -132,7 +132,7 @@ impl Config {
132 set(value, "/cargo/features", &mut self.cargo.features); 132 set(value, "/cargo/features", &mut self.cargo.features);
133 set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check); 133 set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
134 134
135 match get::<bool>(value, "/procMacro/enabled") { 135 match get::<bool>(value, "/procMacro/enable") {
136 Some(true) => { 136 Some(true) => {
137 if let Ok(path) = std::env::current_exe() { 137 if let Ok(path) = std::env::current_exe() {
138 self.proc_macro_srv = Some((path.to_string_lossy().to_string(), vec!["proc-macro".to_string()])); 138 self.proc_macro_srv = Some((path.to_string_lossy().to_string(), vec!["proc-macro".to_string()]));
diff --git a/editors/code/package.json b/editors/code/package.json
index cc74c92d3..ab0f25b2f 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -389,7 +389,7 @@
389 "type": "boolean", 389 "type": "boolean",
390 "default": false 390 "default": false
391 }, 391 },
392 "rust-analyzer.procMacro.enabled": { 392 "rust-analyzer.procMacro.enable": {
393 "description": "Enable Proc macro support, cargo.loadOutDirsFromCheck must be enabled.", 393 "description": "Enable Proc macro support, cargo.loadOutDirsFromCheck must be enabled.",
394 "type": "boolean", 394 "type": "boolean",
395 "default": false 395 "default": false