diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs index 1a2ab1bc2f..36d4898bd9 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<()> { let opts = params .initialization_options - .and_then(|v| ServerConfig::deserialize(v).ok()) + .and_then(|v| { + ServerConfig::deserialize(v) + .map_err(|e| log::error!("failed to deserialize config: {}", e)) + .ok() + }) .unwrap_or_default(); - ra_lsp_server::main_loop(workspace_roots, params.capabilities, opts, r, s) })?; 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 3ee0ad6522..fcb7823861 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( sender: Sender, subscriptions: Vec, ) { + log::trace!("updating notifications for {:?}", subscriptions); pool.execute(move || { for file_id in subscriptions { match handlers::publish_diagnostics(&world, file_id) { diff --git a/editors/code/package.json b/editors/code/package.json index 48ab886bf8..98faf538f2 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -199,7 +199,7 @@ }, "rust-analyzer.excludeGlobs": { "type": "array", - "default": "[]", + "default": [], "description": "Paths to exclude from analysis" }, "rust-analyzer.cargo-watch.arguments": {