From 5096bdad331610994b90e31e7a53c94b6bc831ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= Date: Mon, 22 Feb 2021 11:42:47 +0900 Subject: [PATCH] completion: Use the language server bound to the document. --- helix-term/src/commands.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index bf6f0c88..b6d8d818 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -900,15 +900,13 @@ pub fn save(cx: &mut Context) { } pub fn completion(cx: &mut Context) { - let language_server = cx - .editor - .language_servers - .get("source.rust", &cx.executor) - .unwrap(); - use log::info; - let doc = cx.doc(); + let language_server = match doc.language_server.as_ref() { + Some(language_server) => language_server, + None => return, + }; + // TODO: blocking here is not ideal let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());