From c532d9506bb32f0b29d4e57acfe9aeb60123e4e1 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 7 Feb 2025 13:59:26 -0500 Subject: [PATCH] Revert "Fix panic when deleting an empty line after a deleted hunk (cherry-pick #24255) (#24282)" This reverts commit 79714fca98124d85b4f759196c4f5e8c75bcd4ca. --- crates/editor/src/display_map.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index 4e3a7e646040b83adfdf4a9dc5f7264f68cc5813..538ec3d3b7a829d65c710d718f70ef6e98ef2105 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -1142,7 +1142,12 @@ impl DisplaySnapshot { } pub fn line_indent_for_buffer_row(&self, buffer_row: MultiBufferRow) -> LineIndent { - self.buffer_snapshot.line_indent_for_row(buffer_row) + let (buffer, range) = self + .buffer_snapshot + .buffer_line_for_row(buffer_row) + .unwrap(); + + buffer.line_indent_for_row(range.start.row) } pub fn line_len(&self, row: DisplayRow) -> u32 {