From f7e46689d31a23af83b40e2489c4e6bf12810950 Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Fri, 20 Feb 2026 03:20:58 +0000
Subject: [PATCH] git: Mitigate panic in split diff spacer calculation (#49674)
 (cherry-pick to preview) (#49677)

Cherry-pick of #49674 to preview

----
Release Notes:

- N/A

Co-authored-by: Cole Miller <cole@zed.dev>
---
 crates/editor/src/display_map/block_map.rs | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 85dbcd22e92aa97234ca8f3fae18842489dcff2d..a0b7f0d28d167419b5ae22eff6297541ef797327 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -1252,11 +1252,6 @@ impl BlockMap {
         let mut our_tab_point_cursor = wrap_snapshot.tab_point_cursor();
         let mut our_wrap_point_cursor = wrap_snapshot.wrap_point_cursor();
 
-        let mut companion_inlay_point_cursor = companion_snapshot.inlay_point_cursor();
-        let mut companion_fold_point_cursor = companion_snapshot.fold_point_cursor();
-        let mut companion_tab_point_cursor = companion_snapshot.tab_point_cursor();
-        let mut companion_wrap_point_cursor = companion_snapshot.wrap_point_cursor();
-
         let mut our_wrapper = |our_point: Point, bias: Bias| {
             our_wrap_point_cursor
                 .map(our_tab_point_cursor.map(
@@ -1265,14 +1260,14 @@ impl BlockMap {
                 .row()
         };
         let mut companion_wrapper = |their_point: Point, bias: Bias| {
-            companion_wrap_point_cursor
-                .map(
-                    companion_tab_point_cursor.map(
-                        companion_fold_point_cursor
-                            .map(companion_inlay_point_cursor.map(their_point, bias), bias),
-                    ),
-                )
-                .row()
+            // TODO(split-diff) fix companion points being passed in decreasing order
+            let inlay_point = companion_snapshot
+                .inlay_snapshot
+                .inlay_point_cursor()
+                .map(their_point, bias);
+            let fold_point = companion_snapshot.to_fold_point(inlay_point, bias);
+            let tab_point = companion_snapshot.fold_point_to_tab_point(fold_point);
+            companion_snapshot.tab_point_to_wrap_point(tab_point).row()
         };
         fn determine_spacer(
             our_wrapper: &mut dyn FnMut(Point, Bias) -> WrapRow,