suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
pull/6224/head
Michael Davis 2023-03-07 19:51:29 -06:00 committed by GitHub
parent 170593161c
commit 6dc017b9e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helix-term/src/commands/lsp.rs
View File

@ -5,7 +5,7 @@ use helix_lsp::{
self, CodeAction, CodeActionOrCommand, CodeActionTriggerKind, DiagnosticSeverity, self, CodeAction, CodeActionOrCommand, CodeActionTriggerKind, DiagnosticSeverity,
NumberOrString, NumberOrString,
}, },
util::{diagnostic_to_lsp_diagnostic, lsp_pos_to_pos, lsp_range_to_range, range_to_lsp_range}, util::{diagnostic_to_lsp_diagnostic, lsp_range_to_range, range_to_lsp_range},
OffsetEncoding, OffsetEncoding,
}; };
use tui::{ use tui::{
@ -196,15 +196,15 @@ fn jump_to_location(
} }
} }
let (view, doc) = current!(editor); let (view, doc) = current!(editor);
let definition_pos = location.range.start;
// TODO: convert inside server // TODO: convert inside server
let new_pos = if let Some(new_pos) = lsp_pos_to_pos(doc.text(), definition_pos, offset_encoding) let new_range =
{ if let Some(new_range) = lsp_range_to_range(doc.text(), location.range, offset_encoding) {
new_pos new_range
} else { } else {
log::warn!("lsp position out of bounds - {:?}", location.range);
return; return;
}; };
doc.set_selection(view.id, Selection::point(new_pos)); doc.set_selection(view.id, Selection::single(new_range.anchor, new_range.head));
align_view(doc, view, Align::Center); align_view(doc, view, Align::Center);
} }