From a33ef65f57033d6e758a30fa4a26a8b446025391 Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Wed, 11 May 2022 10:18:40 -0700 Subject: [PATCH] Order returned ranges from marked_text_ranges by start index --- crates/util/src/test/marked_text.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/util/src/test/marked_text.rs b/crates/util/src/test/marked_text.rs index 23aa2d5806..23ac35ce86 100644 --- a/crates/util/src/test/marked_text.rs +++ b/crates/util/src/test/marked_text.rs @@ -61,12 +61,12 @@ pub fn marked_text_ranges(full_marked_text: &str) -> (String, Vec>) let (range_marked_text, empty_offsets) = marked_text(full_marked_text); let (unmarked, range_lookup) = marked_text_ranges_by(&range_marked_text, vec![('[', ']'), ('(', ')'), ('<', '>')]); - ( - unmarked, - range_lookup - .into_values() - .flatten() - .chain(empty_offsets.into_iter().map(|offset| offset..offset)) - .collect(), - ) + let mut combined_ranges: Vec<_> = range_lookup + .into_values() + .flatten() + .chain(empty_offsets.into_iter().map(|offset| offset..offset)) + .collect(); + + combined_ranges.sort_by_key(|range| range.start); + (unmarked, combined_ranges) }