diff options
author | Emil Lauridsen <[email protected]> | 2019-12-25 19:23:44 +0000 |
---|---|---|
committer | Emil Lauridsen <[email protected]> | 2019-12-25 19:26:06 +0000 |
commit | 0cdbd0814958e174c5481d6bf16bd2a7e53ec981 (patch) | |
tree | a58277467e67ebdf8584ad2edf398ca630d6fd35 /crates/ra_lsp_server/src/config.rs | |
parent | 71d2d81dcc879bbb7898df11ac00578e93b27ab5 (diff) |
Keep VSCode config mostly backwards compatible
Diffstat (limited to 'crates/ra_lsp_server/src/config.rs')
-rw-r--r-- | crates/ra_lsp_server/src/config.rs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/crates/ra_lsp_server/src/config.rs b/crates/ra_lsp_server/src/config.rs index 621f2238c..2d7948d74 100644 --- a/crates/ra_lsp_server/src/config.rs +++ b/crates/ra_lsp_server/src/config.rs | |||
@@ -32,9 +32,10 @@ pub struct ServerConfig { | |||
32 | 32 | ||
33 | pub max_inlay_hint_length: Option<usize>, | 33 | pub max_inlay_hint_length: Option<usize>, |
34 | 34 | ||
35 | pub cargo_check_enable: bool, | 35 | pub cargo_watch_enable: bool, |
36 | pub cargo_check_command: Option<String>, | 36 | pub cargo_watch_args: Vec<String>, |
37 | pub cargo_check_args: Vec<String>, | 37 | pub cargo_watch_command: String, |
38 | pub cargo_watch_all_targets: bool, | ||
38 | 39 | ||
39 | /// For internal usage to make integrated tests faster. | 40 | /// For internal usage to make integrated tests faster. |
40 | #[serde(deserialize_with = "nullable_bool_true")] | 41 | #[serde(deserialize_with = "nullable_bool_true")] |
@@ -55,9 +56,10 @@ impl Default for ServerConfig { | |||
55 | use_client_watching: false, | 56 | use_client_watching: false, |
56 | lru_capacity: None, | 57 | lru_capacity: None, |
57 | max_inlay_hint_length: None, | 58 | max_inlay_hint_length: None, |
58 | cargo_check_enable: true, | 59 | cargo_watch_enable: true, |
59 | cargo_check_command: None, | 60 | cargo_watch_args: Vec::new(), |
60 | cargo_check_args: vec![], | 61 | cargo_watch_command: "check".to_string(), |
62 | cargo_watch_all_targets: true, | ||
61 | with_sysroot: true, | 63 | with_sysroot: true, |
62 | feature_flags: FxHashMap::default(), | 64 | feature_flags: FxHashMap::default(), |
63 | cargo_features: Default::default(), | 65 | cargo_features: Default::default(), |