From b0fc6da55b495dc5f43a934ee8b2d67eb1fbe62e Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 8 Aug 2023 02:37:27 +0200
Subject: [PATCH] Use display maps

---
 crates/editor/src/editor.rs  | 21 ++++++++++++---------
 crates/editor/src/element.rs |  6 +++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 0711e5eb02..8f4f97ad60 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -7554,7 +7554,7 @@ impl Editor {
         search_range: Range<Anchor>,
         display_snapshot: &DisplaySnapshot,
         count: usize,
-    ) -> Vec<RangeInclusive<u32>> {
+    ) -> Vec<RangeInclusive<DisplayPoint>> {
         let mut results = Vec::new();
         let buffer = &display_snapshot.buffer_snapshot;
         let Some((_, ranges)) = self.background_highlights
@@ -7573,24 +7573,27 @@ impl Editor {
             Ok(i) | Err(i) => i,
         };
         let end_ix = count.min(ranges.len());
-        let mut push_region = |start, end| {
+        let mut push_region = |start: Option<Point>, end: Option<Point>| {
             if let (Some(start_display), Some(end_display)) = (start, end) {
-                results.push(start_display..=end_display);
+                results.push(
+                    start_display.to_display_point(display_snapshot)
+                        ..=end_display.to_display_point(display_snapshot),
+                );
             }
         };
-        let mut start_row = None;
-        let mut end_row = None;
+        let mut start_row: Option<Point> = None;
+        let mut end_row: Option<Point> = None;
         for range in &ranges[start_ix..end_ix] {
             if range.start.cmp(&search_range.end, buffer).is_ge() {
                 break;
             }
-            let end = range.end.to_point(buffer).row;
+            let end = range.end.to_point(buffer);
             if let Some(current_row) = &end_row {
-                if end == *current_row {
+                if end.row == current_row.row {
                     continue;
                 }
             }
-            let start = range.start.to_point(buffer).row;
+            let start = range.start.to_point(buffer);
 
             if start_row.is_none() {
                 assert_eq!(end_row, None);
@@ -7599,7 +7602,7 @@ impl Editor {
                 continue;
             }
             if let Some(current_end) = end_row.as_mut() {
-                if start > *current_end + 1 {
+                if start.row > current_end.row + 1 {
                     push_region(start_row, end_row);
                     start_row = Some(start);
                     end_row = Some(end);
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index c3c8681bcf..30a9cba85c 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1117,9 +1117,9 @@ impl EditorElement {
                     bottom: false,
                     left: true,
                 };
-                let mut push_region = |start: u32, end: u32| {
-                    let start_y = y_for_row(start as f32);
-                    let mut end_y = y_for_row(end as f32);
+                let mut push_region = |start: DisplayPoint, end: DisplayPoint| {
+                    let start_y = y_for_row(start.row() as f32);
+                    let mut end_y = y_for_row(end.row() as f32);
                     if end_y - start_y < 1. {
                         end_y = start_y + 1.;
                     }