ef532e0 · helix · git.iko.soy

git.iko.soy/helix

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

commitef532e0c0df3e9f8bf4ac5af74b54f32b7ea2728 authorKirawi <67773714+kirawi@users.noreply.github.com> dateWed 15 Sep 2021, 01:58 (5 years ago) parent51b7f40

2 files changed+17−5

compare with master

unifiedsplit

helix-lsp/src/lib.rs+9−1 helix-view/src/editor.rs+8−4

helix-lsp/src/lib.rs+9−1

@@ -318,7 +318,15 @@ impl Registry {

318318 let (client, incoming, initialize_notify) = Client::start(

319319 &config.command,

320320 &config.args,

321− serde_json::from_str(language_config.config.as_deref().unwrap_or("")).ok(),

321+ serde_json::from_str(language_config.config.as_deref().unwrap_or(""))

322+ .map_err(|e| {

323+ log::error!(

324+ "LSP Config, {}, in `languages.toml` for `{}`",

325+ e,

326+ language_config.scope()

327+ )

328+ })

329+ .ok(),

322330 id,

323331 )?;

324332 self.incoming.push(UnboundedReceiverStream::new(incoming));

helix-view/src/editor.rs+8−4

@@ -249,10 +249,14 @@ impl Editor {

249249 let mut doc = Document::open(&path, None, Some(&self.theme), Some(&self.syn_loader))?;

250250

251251 // try to find a language server based on the language name

252− let language_server = doc

253− .language

254− .as_ref()

255− .and_then(|language| self.language_servers.get(language).ok());

252+ let language_server = doc.language.as_ref().and_then(|language| {

253+ self.language_servers

254+ .get(language)

255+ .map_err(|e| {

256+ log::error!("Failed to get LSP, {}, for `{}`", e, language.scope())

257+ })

258+ .ok()

259+ });

256260

257261 if let Some(language_server) = language_server {

258262 let language_id = doc