aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-04-22 16:26:47 +0100
committerGitHub <[email protected]>2020-04-22 16:26:47 +0100
commit3f1f3a835a07983344f6f3becf7a0c32b96d68bc (patch)
treedb71d7564bc962065519413c0fd12480b8ee7f35 /crates
parent0f8ae29cd6d004011a3f9e1a4dddc2ad9219ad44 (diff)
parent9e16e2b279414201aed4bf15770df9029c9c442f (diff)
Merge #4090
4090: Fix config naming r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/rust-analyzer/src/config.rs4
1 files changed, 2 insertions, 2 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()]));