Enhance `DisplayMap` randomized test to change tab size

Antonio Scandurra created 3 years ago

This removes the need for a unit test.

Change summary

crates/editor/src/display_map.rs | 54 +++++++++++----------------------
1 file changed, 18 insertions(+), 36 deletions(-)

Detailed changes

crates/editor/src/display_map.rs

@@ -589,7 +589,7 @@ pub mod tests {
             .unwrap_or(10);
 
         let font_cache = cx.font_cache().clone();
-        let tab_size = rng.gen_range(1..=4);
+        let mut tab_size = rng.gen_range(1..=4);
         let buffer_start_excerpt_header_height = rng.gen_range(1..=5);
         let excerpt_header_height = rng.gen_range(1..=5);
         let family_id = font_cache.load_family(&["Helvetica"]).unwrap();
@@ -607,7 +607,11 @@ pub mod tests {
         log::info!("tab size: {}", tab_size);
         log::info!("wrap width: {:?}", wrap_width);
 
-        cx.update(|cx| cx.set_global(Settings::test(cx)));
+        cx.update(|cx| {
+            let mut settings = Settings::test(cx);
+            settings.editor_overrides.tab_size = NonZeroU32::new(tab_size);
+            cx.set_global(settings)
+        });
 
         let buffer = cx.update(|cx| {
             if rng.gen() {
@@ -653,7 +657,18 @@ pub mod tests {
                     log::info!("setting wrap width to {:?}", wrap_width);
                     map.update(cx, |map, cx| map.set_wrap_width(wrap_width, cx));
                 }
-                20..=44 => {
+                20..=29 => {
+                    let mut tab_sizes = vec![1, 2, 3, 4];
+                    tab_sizes.remove((tab_size - 1) as usize);
+                    tab_size = *tab_sizes.choose(&mut rng).unwrap();
+                    log::info!("setting tab size to {:?}", tab_size);
+                    cx.update(|cx| {
+                        let mut settings = Settings::test(cx);
+                        settings.editor_overrides.tab_size = NonZeroU32::new(tab_size);
+                        cx.set_global(settings)
+                    });
+                }
+                30..=44 => {
                     map.update(cx, |map, cx| {
                         if rng.gen() || blocks.is_empty() {
                             let buffer = map.snapshot(cx).buffer_snapshot;
@@ -1351,39 +1366,6 @@ pub mod tests {
         )
     }
 
-    #[gpui::test]
-    fn test_changing_tab_size(cx: &mut gpui::MutableAppContext) {
-        cx.set_global({
-            let mut settings = Settings::test(cx);
-            settings.editor_overrides.tab_size = Some(NonZeroU32::new(4).unwrap());
-            settings
-        });
-        let buffer = MultiBuffer::build_simple("\ta\n\tb\n\tc", cx);
-        let font_cache = cx.font_cache();
-        let family_id = font_cache.load_family(&["Helvetica"]).unwrap();
-        let font_id = font_cache
-            .select_font(family_id, &Default::default())
-            .unwrap();
-        let font_size = 14.0;
-
-        let map =
-            cx.add_model(|cx| DisplayMap::new(buffer.clone(), font_id, font_size, None, 1, 1, cx));
-        assert_eq!(
-            map.update(cx, |map, cx| map.snapshot(cx)).text(),
-            "    a\n    b\n    c"
-        );
-
-        cx.set_global({
-            let mut settings = Settings::test(cx);
-            settings.editor_overrides.tab_size = Some(NonZeroU32::new(2).unwrap());
-            settings
-        });
-        assert_eq!(
-            map.update(cx, |map, cx| map.snapshot(cx)).text(),
-            "  a\n  b\n  c"
-        );
-    }
-
     fn syntax_chunks<'a>(
         rows: Range<u32>,
         map: &ModelHandle<DisplayMap>,