From 6ab85cc192dc32ee29ef7a0ba972b473f0133102 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 21 Aug 2019 17:30:58 +0300 Subject: fix default for the exlude key --- crates/ra_lsp_server/src/main.rs | 7 +++++-- crates/ra_lsp_server/src/main_loop.rs | 1 + 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<()> { 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 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( 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 48ab886bf..98faf538f 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": { -- cgit v1.2.3