git.iko.soy/helix
on master help sign in
gd now works for singular definition
0322c28Jan Hrastnik
helix-lsp/src/client.rs−2
compare with master
unifiedsplit
@@ -603,8 +603,6 @@ impl Client {
603
603
604 let response = self.request::<lsp::request::GotoDefinition>(params).await?;
604 let response = self.request::<lsp::request::GotoDefinition>(params).await?;
605
605
606− println!("{:?}", response);
607−
608 let items = match response {
606 let items = match response {
609 Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location],
607 Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location],
610 Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec,
608 Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec,
helix-term/src/commands.rs+8
@@ -861,6 +861,14 @@ pub fn goto_definition(cx: &mut Context) {
861 let res =
861 let res =
862 smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
862 smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
863
863
864+ if res.len() == 1 {
865+ let definition_pos = res.get(0).unwrap().range.start;
866+ let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
867+ doc.set_selection(Selection::point(new_pos));
868+ } else {
869+ // show menu picker i guess
870+ }
871+
864 doc.mode = Mode::Normal;
872 doc.mode = Mode::Normal;
865}
873}
866
874