Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #984 from zed-industries/deterministic-marked-text-ranges

Browse source 
Order returned ranges from marked_text_ranges by start index
This commit is contained in:
Keith Simmons 2022-05-11 10:31:33 -07:00 • committed by GitHub
commit 61b4a4202f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/util/src/test/marked_text.rs
View file

@ -61,12 +61,12 @@ pub fn marked_text_ranges(full_marked_text: &str) -> (String, Vec<Range<usize>>)
let (range_marked_text, empty_offsets) = marked_text(full_marked_text); let (range_marked_text, empty_offsets) = marked_text(full_marked_text);
let (unmarked, range_lookup) = let (unmarked, range_lookup) =
marked_text_ranges_by(&range_marked_text, vec![('[', ']'), ('(', ')'), ('<', '>')]); marked_text_ranges_by(&range_marked_text, vec![('[', ']'), ('(', ')'), ('<', '>')]);
( let mut combined_ranges: Vec<_> = range_lookup
unmarked, .into_values()
range_lookup .flatten()
.into_values() .chain(empty_offsets.into_iter().map(|offset| offset..offset))
.flatten() .collect();
.chain(empty_offsets.into_iter().map(|offset| offset..offset))
.collect(), combined_ranges.sort_by_key(|range| range.start);
) (unmarked, combined_ranges)
} }