aboutsummaryrefslogtreecommitdiff
path: root/crates/rust-analyzer/src/main_loop.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-03-12 17:01:36 +0000
committerAleksey Kladov <[email protected]>2020-03-12 17:01:36 +0000
commitb3fa7312a77f92b37a5e9b19bdcc89b8510675b4 (patch)
tree84e5bb3f1ffaa59ba6fe9768a9350bca6e2995c5 /crates/rust-analyzer/src/main_loop.rs
parentfd3ece2b739b2e8d97626d6c5a6cb91b70df1071 (diff)
Simpler deserialization
Diffstat (limited to 'crates/rust-analyzer/src/main_loop.rs')
-rw-r--r--crates/rust-analyzer/src/main_loop.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 495056da3..2b3b16d35 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -18,7 +18,7 @@ use crossbeam_channel::{select, unbounded, RecvError, Sender};
18use lsp_server::{Connection, ErrorCode, Message, Notification, Request, RequestId, Response}; 18use lsp_server::{Connection, ErrorCode, Message, Notification, Request, RequestId, Response};
19use lsp_types::{ClientCapabilities, NumberOrString}; 19use lsp_types::{ClientCapabilities, NumberOrString};
20use ra_cargo_watch::{url_from_path_with_drive_lowercasing, CheckOptions, CheckTask}; 20use ra_cargo_watch::{url_from_path_with_drive_lowercasing, CheckOptions, CheckTask};
21use ra_ide::{Canceled, FileId, LibraryData, SourceRootId}; 21use ra_ide::{Canceled, FileId, InlayHintsOptions, LibraryData, SourceRootId};
22use ra_prof::profile; 22use ra_prof::profile;
23use ra_vfs::{VfsFile, VfsTask, Watch}; 23use ra_vfs::{VfsFile, VfsTask, Watch};
24use relative_path::RelativePathBuf; 24use relative_path::RelativePathBuf;
@@ -177,7 +177,11 @@ 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 inlay_hints: config.inlay_hints, 180 inlay_hints: InlayHintsOptions {
181 type_hints: config.inlay_hints_type,
182 parameter_hints: config.inlay_hints_parameter,
183 max_length: config.inlay_hints_max_length,
184 },
181 cargo_watch: CheckOptions { 185 cargo_watch: CheckOptions {
182 enable: config.cargo_watch_enable, 186 enable: config.cargo_watch_enable,
183 args: config.cargo_watch_args, 187 args: config.cargo_watch_args,