diff options
| author | Kirawi | 2021-09-15 05:58:06 +0000 |
|---|---|---|
| committer | GitHub | 2021-09-15 05:58:06 +0000 |
| commit | ef532e0c0df3e9f8bf4ac5af74b54f32b7ea2728 (patch) | |
| tree | 932c976e224d9b345c5c7e9c141fc40b8b636d3b | |
| parent | 51b7f40da1e564d9ecb5263421306d5846d98566 (diff) | |
log errors produced when trying to initialize the LSP (#746)
| -rw-r--r-- | helix-lsp/src/lib.rs | 10 | ||||
| -rw-r--r-- | helix-view/src/editor.rs | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs index 7357c885..35cff754 100644 --- a/helix-lsp/src/lib.rs +++ b/helix-lsp/src/lib.rs @@ -318,7 +318,15 @@ impl Registry { let (client, incoming, initialize_notify) = Client::start( &config.command, &config.args, - serde_json::from_str(language_config.config.as_deref().unwrap_or("")).ok(), + serde_json::from_str(language_config.config.as_deref().unwrap_or("")) + .map_err(|e| { + log::error!( + "LSP Config, {}, in `languages.toml` for `{}`", + e, + language_config.scope() + ) + }) + .ok(), id, )?; self.incoming.push(UnboundedReceiverStream::new(incoming)); diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs index 52a0060c..a3d0d032 100644 --- a/helix-view/src/editor.rs +++ b/helix-view/src/editor.rs @@ -249,10 +249,14 @@ impl Editor { let mut doc = Document::open(&path, None, Some(&self.theme), Some(&self.syn_loader))?; // try to find a language server based on the language name - let language_server = doc - .language - .as_ref() - .and_then(|language| self.language_servers.get(language).ok()); + let language_server = doc.language.as_ref().and_then(|language| { + self.language_servers + .get(language) + .map_err(|e| { + log::error!("Failed to get LSP, {}, for `{}`", e, language.scope()) + }) + .ok() + }); if let Some(language_server) = language_server { let language_id = doc |