diff options
author | Aleksey Kladov <[email protected]> | 2020-04-22 16:22:59 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-04-22 16:22:59 +0100 |
commit | 9e16e2b279414201aed4bf15770df9029c9c442f (patch) | |
tree | 437e3cfb55bfb680a31f4ff673eb0a5afc3599c5 | |
parent | d436beeb044661984879533170c4a35893176578 (diff) |
Align the name of proc-macro enabling flag
We use `enable`, not `enabled` elsewhere
-rw-r--r-- | crates/rust-analyzer/src/config.rs | 2 | ||||
-rw-r--r-- | editors/code/package.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 6e34ad374..f60b805a4 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs | |||
@@ -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 79410ad10..0726167bd 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 |