6dc017b · helix · git.iko.soy

Jump to symbol ranges in LSP goto commands (#5986)

This follows prior changes like 42ad1a9e: we select the range given by the language server rather than the starting point.

commit6dc017b9e23be4f9331bfac8d10f39cdfa54e7bd authorMichael Davis <mcarsondavis@gmail.com> dateTue 7 Mar 2023, 19:51 (4 years ago) parent1705931

1 file changed+9−9

unifiedsplit

helix-term/src/commands/lsp.rs+9−9

@@ -5,7 +5,7 @@ use helix_lsp::{

55 self, CodeAction, CodeActionOrCommand, CodeActionTriggerKind, DiagnosticSeverity,

66 NumberOrString,

77 },

8− util::{diagnostic_to_lsp_diagnostic, lsp_pos_to_pos, lsp_range_to_range, range_to_lsp_range},

8+ util::{diagnostic_to_lsp_diagnostic, lsp_range_to_range, range_to_lsp_range},

99 OffsetEncoding,

1010};

1111use tui::{

@@ -196,15 +196,15 @@ fn jump_to_location(

196196 }

197197 }

198198 let (view, doc) = current!(editor);

199− let definition_pos = location.range.start;

200199 // TODO: convert inside server

201− let new_pos = if let Some(new_pos) = lsp_pos_to_pos(doc.text(), definition_pos, offset_encoding)

202− {

203− new_pos

204− } else {

205− return;

206− };

207− doc.set_selection(view.id, Selection::point(new_pos));

200+ let new_range =

201+ if let Some(new_range) = lsp_range_to_range(doc.text(), location.range, offset_encoding) {

202+ new_range

203+ } else {

204+ log::warn!("lsp position out of bounds - {:?}", location.range);

205+ return;

206+ };

207+ doc.set_selection(view.id, Selection::single(new_range.anchor, new_range.head));

208208 align_view(doc, view, Align::Center);

209209}

210210