From 9e16e2b279414201aed4bf15770df9029c9c442f Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 22 Apr 2020 17:22:59 +0200 Subject: [PATCH] Align the name of proc-macro enabling flag We use `enable`, not `enabled` elsewhere --- crates/rust-analyzer/src/config.rs | 2 +- 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 6e34ad374a..f60b805a4a 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -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::(value, "/procMacro/enabled") { + match get::(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()])); diff --git a/editors/code/package.json b/editors/code/package.json index 79410ad109..0726167bdc 100644 --- a/editors/code/package.json +++ b/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