kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

gd now works for singular definition

Browse source
This commit is contained in:
Jan Hrastnik 2021-02-23 23:56:06 +01:00 • committed by Blaž Hrastnik
parent 18ec8adc7f
commit 0322c28e6b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
helix-lsp/src/client.rs
View file

@ -603,8 +603,6 @@ impl Client {
let response = self.request::<lsp::request::GotoDefinition>(params).await?; let response = self.request::<lsp::request::GotoDefinition>(params).await?;
println!("{:?}", response);
let items = match response { let items = match response {
Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location], Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location],
Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec, Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec,

8
helix-term/src/commands.rs
View file

@ -861,6 +861,14 @@ pub fn goto_definition(cx: &mut Context) {
let res = let res =
smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default(); 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; doc.mode = Mode::Normal;
} }