log errors produced when trying to initialize the LSP (#746)

helix-editor · Sep 15, 2021 · ef532e0 · ef532e0
1 parent 51b7f40
commit ef532e0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -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