From 3c405afff48fa4aad1a559d29e622b24df514667 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 10:58:08 -0500 Subject: [PATCH] Fix panic when deleting an empty line after a deleted hunk (cherry-pick #24255) (#24280) Cherry-picked Fix panic when deleting an empty line after a deleted hunk (#24255) Release Notes: - Fix a panic when deleting text after a deletion hunk Co-authored-by: Cole Miller --- crates/editor/src/display_map.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index b9d59d65df602315912caa6f2523eabd8787cb49..d0d90063623d409ab5f647b65ba5a21cd3e01f6f 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -1140,12 +1140,7 @@ impl DisplaySnapshot { } pub fn line_indent_for_buffer_row(&self, buffer_row: MultiBufferRow) -> LineIndent { - let (buffer, range) = self - .buffer_snapshot - .buffer_line_for_row(buffer_row) - .unwrap(); - - buffer.line_indent_for_row(range.start.row) + self.buffer_snapshot.line_indent_for_row(buffer_row) } pub fn line_len(&self, row: DisplayRow) -> u32 {