From 1f5ac4710a9a37e66775054c3c69f03bf98ce0ee Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Fri, 22 Nov 2024 01:16:06 +0200
Subject: [PATCH] Remove redundant update part

---
 crates/editor/src/editor.rs             | 3 +--
 crates/editor/src/git/project_diff.rs   | 2 +-
 crates/git/src/status.rs                | 1 -
 crates/multi_buffer/src/multi_buffer.rs | 6 ++----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 32fdb00a71..0d5e2f4bee 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -12708,9 +12708,8 @@ impl Editor {
             multi_buffer::Event::FileHandleChanged | multi_buffer::Event::Reloaded => {
                 cx.emit(EditorEvent::TitleChanged)
             }
-            multi_buffer::Event::DiffBaseChanged { buffer } => {
+            multi_buffer::Event::DiffBaseChanged => {
                 self.scrollbar_marker_state.dirty = true;
-                self.sync_expanded_diff_hunks(buffer.clone(), cx);
                 cx.emit(EditorEvent::DiffBaseChanged);
                 cx.notify();
             }
diff --git a/crates/editor/src/git/project_diff.rs b/crates/editor/src/git/project_diff.rs
index 4f7cd61312..5c6304202e 100644
--- a/crates/editor/src/git/project_diff.rs
+++ b/crates/editor/src/git/project_diff.rs
@@ -1061,7 +1061,7 @@ impl Item for ProjectDiffEditor {
         }
     }
 
-    fn breadcrumb_location(&self) -> ToolbarItemLocation {
+    fn breadcrumb_location(&self, _: &AppContext) -> ToolbarItemLocation {
         ToolbarItemLocation::PrimaryLeft
     }
 
diff --git a/crates/git/src/status.rs b/crates/git/src/status.rs
index d2e70fd1a1..f8ffdc6714 100644
--- a/crates/git/src/status.rs
+++ b/crates/git/src/status.rs
@@ -57,7 +57,6 @@ impl GitStatus {
                     Some((
                         RepoPath(PathBuf::from(path)),
                         match status {
-                            // TODO kb more: deleted, renamed, copied, etc.
                             "A" | "??" => GitFileStatus::Added,
                             "M" => GitFileStatus::Modified,
                             _ => return None,
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index d990411f6f..b6ba702b4e 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -95,9 +95,7 @@ pub enum Event {
     },
     Reloaded,
     ReloadNeeded,
-    DiffBaseChanged {
-        buffer: Model<Buffer>,
-    },
+    DiffBaseChanged,
     DiffUpdated {
         buffer: Model<Buffer>,
     },
@@ -1745,7 +1743,7 @@ impl MultiBuffer {
             language::BufferEvent::FileHandleChanged => Event::FileHandleChanged,
             language::BufferEvent::Reloaded => Event::Reloaded,
             language::BufferEvent::ReloadNeeded => Event::ReloadNeeded,
-            language::BufferEvent::DiffBaseChanged => Event::DiffBaseChanged { buffer },
+            language::BufferEvent::DiffBaseChanged => Event::DiffBaseChanged,
             language::BufferEvent::DiffUpdated => Event::DiffUpdated { buffer },
             language::BufferEvent::LanguageChanged => {
                 Event::LanguageChanged(buffer.read(cx).remote_id())