diff options
-rw-r--r-- | crates/ra_lsp_server/src/main.rs | 7 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 1 | ||||
-rw-r--r-- | editors/code/package.json | 2 |
3 files changed, 7 insertions, 3 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) { |
diff --git a/editors/code/package.json b/editors/code/package.json index 48ab886bf..98faf538f 100644 --- a/editors/code/package.json +++ b/editors/code/package.json | |||
@@ -199,7 +199,7 @@ | |||
199 | }, | 199 | }, |
200 | "rust-analyzer.excludeGlobs": { | 200 | "rust-analyzer.excludeGlobs": { |
201 | "type": "array", | 201 | "type": "array", |
202 | "default": "[]", | 202 | "default": [], |
203 | "description": "Paths to exclude from analysis" | 203 | "description": "Paths to exclude from analysis" |
204 | }, | 204 | }, |
205 | "rust-analyzer.cargo-watch.arguments": { | 205 | "rust-analyzer.cargo-watch.arguments": { |