From cb8d667cdb61a58845c992f0033d16341033071d Mon Sep 17 00:00:00 2001
From: "gcp-cherry-pick-bot[bot]"
 <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:40:32 -0600
Subject: [PATCH] Scroll project diff into view always (cherry-pick #26379)
 (#26387)

Cherry-picked Scroll project diff into view always (#26379)

Closes #ISSUE

Release Notes:

- N/A

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/git_ui/src/git_panel.rs    | 1 +
 crates/git_ui/src/project_diff.rs | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs
index 61ad1d498da1c5ff884fa305fdf186557387c9b2..5f714aeeaef6e43e54933dbb75e4b32967eb96c9 100644
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -749,6 +749,7 @@ impl GitPanel {
                             .as_ref()
                     {
                         project_diff.focus_handle(cx).focus(window);
+                        project_diff.update(cx, |project_diff, cx| project_diff.autoscroll(cx));
                         return None;
                     }
                 }
diff --git a/crates/git_ui/src/project_diff.rs b/crates/git_ui/src/project_diff.rs
index d30d0469d90b687d13ffeab0ec445ef72ac2a490..1a1ba42548f11bd2a8eda078cde993906897b332 100644
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -125,6 +125,12 @@ impl ProjectDiff {
         }
     }
 
+    pub fn autoscroll(&self, cx: &mut Context<Self>) {
+        self.editor.update(cx, |editor, cx| {
+            editor.request_autoscroll(Autoscroll::fit(), cx);
+        })
+    }
+
     fn new(
         project: Entity<Project>,
         workspace: Entity<Workspace>,