From 18ec8adc7f24d0cde3d185202f8656b5cf7fefb0 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Mon, 22 Feb 2021 12:12:56 +0900
Subject: Simplify code a bit.

---
 helix-term/src/commands.rs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 8b7e3600..fee4f362 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -847,25 +847,21 @@ pub fn exit_select_mode(cx: &mut Context) {
 }
 
 pub fn goto_definition(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());
 
     // TODO: handle fails
-    let res = smol::block_on(language_server.goto_definition(cx.doc().identifier(), pos))
-        .unwrap_or_default();
-
-    println!("{:?}", res);
+    let res =
+        smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
 
-    cx.doc().mode = Mode::Normal;
+    doc.mode = Mode::Normal;
 }
 
 // NOTE: Transactions in this module get appended to history when we switch back to normal mode.
-- 
cgit v1.2.3-70-g09d2