kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Correctly identify pairs when cursor on pair

Browse source
This commit is contained in:
Gokul Soumya 2021-06-22 09:17:44 +05:30 • committed by Blaž Hrastnik
parent b00e9fc227
commit 892c80771a
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
helix-core/src/surround.rs
View file

@ -39,8 +39,9 @@ pub fn find_nth_pairs_pos(
n: usize,
) -> Option<(usize, usize)> {
let (open, close) = get_pair(ch);
let open_pos = search::find_nth_prev(text, open, pos, n, true)?;
let close_pos = search::find_nth_next(text, close, pos, n, true)?;
// find_nth* do not consider current character; +1/-1 to include them
let open_pos = search::find_nth_prev(text, open, pos + 1, n, true)?;
let close_pos = search::find_nth_next(text, close, pos - 1, n, true)?;
Some((open_pos, close_pos))
}
@ -86,7 +87,7 @@ mod test {
// cursor on so[m]e
assert_eq!(find_nth_pairs_pos(slice, '(', 2, 1), None);
// cursor on bracket itself
// assert_eq!(find_nth_pairs_pos(slice, '(', 5, 1), Some((5, 10)));
assert_eq!(find_nth_pairs_pos(slice, '(', 5, 1), Some((5, 10)));
}
#[test]
@ -134,10 +135,8 @@ mod test {
let doc = Rope::from("[some]\n(chars)xx\n(newline)");
let slice = doc.slice(..);
let selection = Selection::new(
SmallVec::from_slice(&[Range::point(2), Range::point(9)]),
0,
);
let selection =
Selection::new(SmallVec::from_slice(&[Range::point(2), Range::point(9)]), 0);
// cursor on s[o]me, c[h]ars
assert_eq!(
@ -152,7 +151,7 @@ mod test {
// cursor on [x]x, newli[n]e
assert_eq!(
get_surround_pos(slice, &selection, '(', 1),
None // overlapping surround chars
None // overlapping surround chars
);
}
}