diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-08-21 15:31:35 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-08-21 15:31:35 +0100 |
commit | 5fd9a5be0984faa138281e46dd4b73cfdad073b1 (patch) | |
tree | 5f108ba6ce0f81dca73f7d22239da8a0fab2f7e9 /crates/ra_lsp_server/src | |
parent | 8521f0456f442eff2d7010f055d98147874a5413 (diff) | |
parent | 6ab85cc192dc32ee29ef7a0ba972b473f0133102 (diff) |
Merge #1712
1712: fix default for the exlude key r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src')
-rw-r--r-- | crates/ra_lsp_server/src/main.rs | 7 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs index 1a2ab1bc2..36d4898bd 100644 --- a/crates/ra_lsp_server/src/main.rs +++ b/crates/ra_lsp_server/src/main.rs | |||
@@ -48,9 +48,12 @@ fn main_inner() -> Result<()> { | |||
48 | 48 | ||
49 | let opts = params | 49 | let opts = params |
50 | .initialization_options | 50 | .initialization_options |
51 | .and_then(|v| ServerConfig::deserialize(v).ok()) | 51 | .and_then(|v| { |
52 | ServerConfig::deserialize(v) | ||
53 | .map_err(|e| log::error!("failed to deserialize config: {}", e)) | ||
54 | .ok() | ||
55 | }) | ||
52 | .unwrap_or_default(); | 56 | .unwrap_or_default(); |
53 | |||
54 | ra_lsp_server::main_loop(workspace_roots, params.capabilities, opts, r, s) | 57 | ra_lsp_server::main_loop(workspace_roots, params.capabilities, opts, r, s) |
55 | })?; | 58 | })?; |
56 | log::info!("shutting down IO..."); | 59 | log::info!("shutting down IO..."); |
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 3ee0ad652..fcb782386 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
@@ -586,6 +586,7 @@ fn update_file_notifications_on_threadpool( | |||
586 | sender: Sender<Task>, | 586 | sender: Sender<Task>, |
587 | subscriptions: Vec<FileId>, | 587 | subscriptions: Vec<FileId>, |
588 | ) { | 588 | ) { |
589 | log::trace!("updating notifications for {:?}", subscriptions); | ||
589 | pool.execute(move || { | 590 | pool.execute(move || { |
590 | for file_id in subscriptions { | 591 | for file_id in subscriptions { |
591 | match handlers::publish_diagnostics(&world, file_id) { | 592 | match handlers::publish_diagnostics(&world, file_id) { |