From 6dc017b9e23be4f9331bfac8d10f39cdfa54e7bd Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 7 Mar 2023 19:51:29 -0600
Subject: [PATCH] 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.
---
helix-term/src/commands/lsp.rs | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 3b94c9bd..d59eebdb 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -5,7 +5,7 @@ use helix_lsp::{
self, CodeAction, CodeActionOrCommand, CodeActionTriggerKind, DiagnosticSeverity,
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,
};
use tui::{
@@ -196,15 +196,15 @@ fn jump_to_location(
}
}
let (view, doc) = current!(editor);
- let definition_pos = location.range.start;
// TODO: convert inside server
- let new_pos = if let Some(new_pos) = lsp_pos_to_pos(doc.text(), definition_pos, offset_encoding)
- {
- new_pos
- } else {
- return;
- };
- doc.set_selection(view.id, Selection::point(new_pos));
+ let new_range =
+ if let Some(new_range) = lsp_range_to_range(doc.text(), location.range, offset_encoding) {
+ new_range
+ } else {
+ log::warn!("lsp position out of bounds - {:?}", location.range);
+ return;
+ };
+ doc.set_selection(view.id, Selection::single(new_range.anchor, new_range.head));
align_view(doc, view, Align::Center);
}