diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-03-12 16:02:55 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-03-12 16:02:55 +0000 |
commit | d98a5fab46c5850a484349c50dda7cb823cc179a (patch) | |
tree | 754340fc8f170ed6057e6302fef1386ae8fb52d9 /crates/rust-analyzer/src/main_loop.rs | |
parent | 944bd2cbc3af1a11eb6dbaec96fcc0030f42232a (diff) | |
parent | a153b9087520012b5f815b4df6c3657d490b30c8 (diff) |
Merge #3543
3543: Parameter inlay hint separate from variable type inlay? #2876 r=matklad a=slyngbaek
Add setting to allow enabling either type inlay hints or parameter
inlay hints or both. Group the the max inlay hint length option
into the object.
- Add a new type for the inlayHint options.
- Add tests to ensure the inlays don't happen on the server side
Co-authored-by: Steffen Lyngbaek <[email protected]>
Diffstat (limited to 'crates/rust-analyzer/src/main_loop.rs')
-rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 4f7aac754..495056da3 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs | |||
@@ -177,7 +177,7 @@ pub fn main_loop( | |||
177 | .and_then(|it| it.folding_range.as_ref()) | 177 | .and_then(|it| it.folding_range.as_ref()) |
178 | .and_then(|it| it.line_folding_only) | 178 | .and_then(|it| it.line_folding_only) |
179 | .unwrap_or(false), | 179 | .unwrap_or(false), |
180 | max_inlay_hint_length: config.max_inlay_hint_length, | 180 | inlay_hints: config.inlay_hints, |
181 | cargo_watch: CheckOptions { | 181 | cargo_watch: CheckOptions { |
182 | enable: config.cargo_watch_enable, | 182 | enable: config.cargo_watch_enable, |
183 | args: config.cargo_watch_args, | 183 | args: config.cargo_watch_args, |