From 0322c28e6bc1f3bf13842b7db47aafbe5752d45c Mon Sep 17 00:00:00 2001 From: Jan Hrastnik Date: Tue, 23 Feb 2021 23:56:06 +0100 Subject: [PATCH] gd now works for singular definition --- helix-lsp/src/client.rs | 2 -- helix-term/src/commands.rs | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs index f3d3b7e14..e0005c097 100644 --- a/helix-lsp/src/client.rs +++ b/helix-lsp/src/client.rs @@ -603,8 +603,6 @@ pub async fn goto_definition( let response = self.request::(params).await?; - println!("{:?}", response); - let items = match response { Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location], Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec, diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index fee4f3627..b2809f962 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -861,6 +861,14 @@ pub fn goto_definition(cx: &mut Context) { let res = smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default(); + if res.len() == 1 { + let definition_pos = res.get(0).unwrap().range.start; + let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos); + doc.set_selection(Selection::point(new_pos)); + } else { + // show menu picker i guess + } + doc.mode = Mode::Normal; }