From 79714fca98124d85b4f759196c4f5e8c75bcd4ca 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 11:07:04 -0500 Subject: [PATCH] Fix panic when deleting an empty line after a deleted hunk (cherry-pick #24255) (#24282) 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 538ec3d3b7a829d65c710d718f70ef6e98ef2105..4e3a7e646040b83adfdf4a9dc5f7264f68cc5813 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -1142,12 +1142,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 {