mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 20:07:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use RopeSliceExt floor/ceil functions for goto_file_impl search cap

Browse source 
This is a good example use-case of the `floor_char_boundary` and
`ceil_char_boundary` functions added in the parent commit. In the
single-width, single-selection case in `goto_file` we cap the search
to either the current line or 1000 bytes before or after the cursor
(whichever case comes earlier). That byte index might not lie on a
character boundary so it needs to be fixed to either the prior or
later boundary.
This commit is contained in:
Michael Davis 2025-01-25 21:20:06 -05:00
parent 23b424a46d
commit 4919058e90
No known key found for this signature in database
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1286,7 +1286,7 @@ fn goto_file_vsplit(cx: &mut Context) {
/// Goto files in selection. /// Goto files in selection.
fn goto_file_impl(cx: &mut Context, action: Action) { fn goto_file_impl(cx: &mut Context, action: Action) {
let (view, doc) = current_ref!(cx.editor); let (view, doc) = current_ref!(cx.editor);
let text = doc.text(); let text = doc.text().slice(..);
let selections = doc.selection(view.id); let selections = doc.selection(view.id);
let primary = selections.primary(); let primary = selections.primary();
let rel_path = doc let rel_path = doc
@ -1295,14 +1295,15 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
.unwrap_or_default(); .unwrap_or_default();
let paths: Vec<_> = if selections.len() == 1 && primary.len() == 1 { let paths: Vec<_> = if selections.len() == 1 && primary.len() == 1 {
let mut pos = primary.cursor(text.slice(..)); // Cap the search at roughly 1k bytes around the cursor.
pos = text.char_to_byte(pos); let lookaround = 1000;
let pos = text.char_to_byte(primary.cursor(text));
let search_start = text let search_start = text
.line_to_byte(text.byte_to_line(pos)) .line_to_byte(text.byte_to_line(pos))
.max(pos.saturating_sub(1000)); .max(text.floor_char_boundary(pos.saturating_sub(lookaround)));
let search_end = text let search_end = text
.line_to_byte(text.byte_to_line(pos) + 1) .line_to_byte(text.byte_to_line(pos) + 1)
.min(pos + 1000); .min(text.ceil_char_boundary(pos + lookaround));
let search_range = text.byte_slice(search_start..search_end); let search_range = text.byte_slice(search_start..search_end);
// we also allow paths that are next to the cursor (can be ambiguous but // we also allow paths that are next to the cursor (can be ambiguous but
// rarely so in practice) so that gf on quoted/braced path works (not sure about this // rarely so in practice) so that gf on quoted/braced path works (not sure about this
@ -1312,12 +1313,12 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
.find(|range| pos <= search_start + range.end) .find(|range| pos <= search_start + range.end)
.map(|range| Cow::from(search_range.byte_slice(range))); .map(|range| Cow::from(search_range.byte_slice(range)));
log::debug!("goto_file auto-detected path: {path:?}"); log::debug!("goto_file auto-detected path: {path:?}");
let path = path.unwrap_or_else(|| primary.fragment(text.slice(..))); let path = path.unwrap_or_else(|| primary.fragment(text));
vec![path.into_owned()] vec![path.into_owned()]
} else { } else {
// Otherwise use each selection, trimmed. // Otherwise use each selection, trimmed.
selections selections
.fragments(text.slice(..)) .fragments(text)
.map(|sel| sel.trim().to_owned()) .map(|sel| sel.trim().to_owned())
.filter(|sel| !sel.is_empty()) .filter(|sel| !sel.is_empty())
.collect() .collect()