diff options
author | Omer Ben-Amram <[email protected]> | 2019-12-14 15:29:30 +0000 |
---|---|---|
committer | Omer Ben-Amram <[email protected]> | 2019-12-14 15:29:30 +0000 |
commit | 5e4e713fc9c201852fc5fbafd57e5b9243149a78 (patch) | |
tree | 996b679a9ae1d07be1edd9eb04e93d433c6524a3 /crates/ra_lsp_server/src/config.rs | |
parent | 083010f6339e558184f06ce76a18e1ad0b0ee936 (diff) | |
parent | 77db6177658b32f69ad7ebfdef96c1b3b2893fdd (diff) |
Merge branch 'refs/heads/master' into feature/granular-scopes
Diffstat (limited to 'crates/ra_lsp_server/src/config.rs')
-rw-r--r-- | crates/ra_lsp_server/src/config.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crates/ra_lsp_server/src/config.rs b/crates/ra_lsp_server/src/config.rs index 8045f3d60..67942aa41 100644 --- a/crates/ra_lsp_server/src/config.rs +++ b/crates/ra_lsp_server/src/config.rs | |||
@@ -9,6 +9,7 @@ | |||
9 | 9 | ||
10 | use rustc_hash::FxHashMap; | 10 | use rustc_hash::FxHashMap; |
11 | 11 | ||
12 | use ra_project_model::CargoFeatures; | ||
12 | use serde::{Deserialize, Deserializer}; | 13 | use serde::{Deserialize, Deserializer}; |
13 | 14 | ||
14 | /// Client provided initialization options | 15 | /// Client provided initialization options |
@@ -37,6 +38,9 @@ pub struct ServerConfig { | |||
37 | 38 | ||
38 | /// Fine grained feature flags to disable specific features. | 39 | /// Fine grained feature flags to disable specific features. |
39 | pub feature_flags: FxHashMap<String, bool>, | 40 | pub feature_flags: FxHashMap<String, bool>, |
41 | |||
42 | /// Cargo feature configurations. | ||
43 | pub cargo_features: CargoFeatures, | ||
40 | } | 44 | } |
41 | 45 | ||
42 | impl Default for ServerConfig { | 46 | impl Default for ServerConfig { |
@@ -49,6 +53,7 @@ impl Default for ServerConfig { | |||
49 | max_inlay_hint_length: None, | 53 | max_inlay_hint_length: None, |
50 | with_sysroot: true, | 54 | with_sysroot: true, |
51 | feature_flags: FxHashMap::default(), | 55 | feature_flags: FxHashMap::default(), |
56 | cargo_features: Default::default(), | ||
52 | } | 57 | } |
53 | } | 58 | } |
54 | } | 59 | } |