From 2618f2922f0b2e36ef3098bf8104f342e7dea7f6 Mon Sep 17 00:00:00 2001 From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com> Date: Fri, 16 Jan 2026 00:00:27 -0300 Subject: [PATCH] Don't show diff review button on folded buffers (#46968) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were incorrectly leaking the display of this button when the file was folded in the multibuffer: | Before | After | |--------|--------| | Screenshot 2026-01-15 at 11  42@2x | Screenshot 2026-01-15 at 11  41@2x | Release Notes: - N/A --- crates/editor/src/element.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index 1ecb03e22465327a175bb6842ff8c3db07f6e81a..7f29097c152ae2acf5c4b514100b6c977d7bc576 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -3112,12 +3112,21 @@ impl EditorElement { let display_row = indicator.display_row; let row_index = (display_row.0.saturating_sub(range.start.0)) as usize; - // Don't show on rows with expand excerpt buttons let row_info = row_infos.get(row_index); if row_info.is_some_and(|row_info| row_info.expand_info.is_some()) { return None; } + let buffer_id = row_info.and_then(|info| info.buffer_id); + if buffer_id.is_none() { + return None; + } + + let editor = self.editor.read(cx); + if buffer_id.is_some_and(|buffer_id| editor.is_buffer_folded(buffer_id, cx)) { + return None; + } + let buffer_row = row_info.and_then(|info| info.buffer_row); Some((display_row, buffer_row)) }