6dc017b · helix · git.iko.soy

on master help sign in

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

6dc017bMichael Davis4 years ago

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

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

5 self, CodeAction, CodeActionOrCommand, CodeActionTriggerKind, DiagnosticSeverity,

6 NumberOrString,

7 },

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},

9 OffsetEncoding,

10};

11use tui::{

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

196 }

197 }

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

199− let definition_pos = location.range.start;

200 // TODO: convert inside server

199 // TODO: convert inside server

200+ let new_range =

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

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

202− {

202+ new_range

203− new_pos

204− } else {

203+ } else {

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

205− return;

205+ return;

206− };

206+ };

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

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

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

209}

210