Move highlights from fold to inlay randomized tests

Kirill Bulatov created 2 years ago

Change summary

crates/editor/src/display_map/fold_map.rs  | 24 ++----------------------
crates/editor/src/display_map/inlay_map.rs | 24 ++++++++++++++++++++++--
2 files changed, 24 insertions(+), 24 deletions(-)

Detailed changes

crates/editor/src/display_map/fold_map.rs

@@ -1125,8 +1125,7 @@ mod tests {
     use collections::HashSet;
     use rand::prelude::*;
     use settings::SettingsStore;
-    use std::{cmp::Reverse, env, mem, sync::Arc};
-    use sum_tree::TreeMap;
+    use std::{env, mem};
     use text::Patch;
     use util::test::sample_text;
     use util::RandomCharIter;
@@ -1354,25 +1353,6 @@ mod tests {
         let (mut initial_snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
         let mut snapshot_edits = Vec::new();
 
-        let mut highlights = TreeMap::default();
-        let highlight_count = rng.gen_range(0_usize..10);
-        let mut highlight_ranges = (0..highlight_count)
-            .map(|_| buffer_snapshot.random_byte_range(0, &mut rng))
-            .collect::<Vec<_>>();
-        highlight_ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
-        log::info!("highlighting ranges {:?}", highlight_ranges);
-        let highlight_ranges = highlight_ranges
-            .into_iter()
-            .map(|range| {
-                buffer_snapshot.anchor_before(range.start)..buffer_snapshot.anchor_after(range.end)
-            })
-            .collect::<Vec<_>>();
-
-        highlights.insert(
-            Some(TypeId::of::<()>()),
-            Arc::new((HighlightStyle::default(), highlight_ranges)),
-        );
-
         let mut next_inlay_id = 0;
         for _ in 0..operations {
             log::info!("text: {:?}", buffer_snapshot.text());
@@ -1516,7 +1496,7 @@ mod tests {
                 let text = &expected_text[start.0..end.0];
                 assert_eq!(
                     snapshot
-                        .chunks(start..end, false, Some(&highlights), None, None)
+                        .chunks(start..end, false, None, None, None)
                         .map(|c| c.text)
                         .collect::<String>(),
                     text,

crates/editor/src/display_map/inlay_map.rs

@@ -1076,7 +1076,8 @@ mod tests {
     use gpui::AppContext;
     use rand::prelude::*;
     use settings::SettingsStore;
-    use std::env;
+    use std::{cmp::Reverse, env, sync::Arc};
+    use sum_tree::TreeMap;
     use text::Patch;
     use util::post_inc;
 
@@ -1433,6 +1434,25 @@ mod tests {
         let mut next_inlay_id = 0;
         log::info!("buffer text: {:?}", buffer_snapshot.text());
 
+        let mut highlights = TreeMap::default();
+        let highlight_count = rng.gen_range(0_usize..10);
+        let mut highlight_ranges = (0..highlight_count)
+            .map(|_| buffer_snapshot.random_byte_range(0, &mut rng))
+            .collect::<Vec<_>>();
+        highlight_ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
+        log::info!("highlighting ranges {:?}", highlight_ranges);
+        let highlight_ranges = highlight_ranges
+            .into_iter()
+            .map(|range| {
+                buffer_snapshot.anchor_before(range.start)..buffer_snapshot.anchor_after(range.end)
+            })
+            .collect::<Vec<_>>();
+
+        highlights.insert(
+            Some(TypeId::of::<()>()),
+            Arc::new((HighlightStyle::default(), highlight_ranges)),
+        );
+
         let (mut inlay_map, mut inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
         for _ in 0..operations {
             let mut inlay_edits = Patch::default();
@@ -1505,7 +1525,7 @@ mod tests {
                     .chunks(
                         InlayOffset(start)..InlayOffset(end),
                         false,
-                        None,
+                        Some(&highlights),
                         None,
                         None,
                     )