andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 17:36:19 +04:00
Code Issues Projects Releases Wiki Activity

test: refactored selections and expectations util to return only 1 range

Browse Source
This commit is contained in:
Nikita Revenco 2024-11-14 14:41:57 +00:00
parent d24677da62
commit a88ffcd413
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
helix-core/src/surround.rs
View File

@ -855,18 +855,21 @@ fn rope_with_selections_and_expectations_tags(
text: &str, text: &str,
spec: &str, spec: &str,
tag_names: Vec<&str>, tag_names: Vec<&str>,
) -> (Rope, Selection, Result<Vec<((Range, Range), String)>>) { ) -> (Rope, Selection, Result<Vec<(Range, String)>>) {
if text.len() != spec.len() { if text.len() != spec.len() {
panic!("specification must match text length -- are newlines aligned?"); panic!("specification must match text length -- are newlines aligned?");
} }
let selections: SmallVec<[Range; 1]> = spec let selections: SmallVec<[Range; 1]> = spec
.match_indices('^') .match_indices('^')
.map(|(i, _)| Range::point(i)) .map(|(i, _)| Range::point(i))
.collect(); .collect();
let mut tag_names = tag_names.into_iter(); let mut tag_names = tag_names
.into_iter()
.flat_map(|tag_name| vec![tag_name, tag_name]);
let mut raw_ranges = spec let raw_ranges = spec
.char_indices() .char_indices()
.chain(std::iter::once((spec.len(), ' '))) .chain(std::iter::once((spec.len(), ' ')))
.fold(Vec::new(), |mut groups, (i, c)| { .fold(Vec::new(), |mut groups, (i, c)| {
@ -889,12 +892,12 @@ fn rope_with_selections_and_expectations_tags(
}) })
.into_iter(); .into_iter();
let range_and_tags = std::iter::from_fn(|| Some((raw_ranges.next()?, raw_ranges.next()?))) let range_and_tags = raw_ranges
.map(|((anchor1, head1), (anchor2, head2))| { .map(|(anchor, head)| {
let range1 = Range::new(anchor1, head1 + 1); (
let range2 = Range::new(anchor2, head2 + 1); Range::new(anchor, head + 1),
let next_tag_name = tag_names.next().unwrap(); String::from(tag_names.next().unwrap()),
((range1, range2), String::from(next_tag_name)) )
}) })
.collect(); .collect();