git: Dedup paths needing status update in the job

crates/editor/src/editor.rs

@@ -1850,7 +1850,7 @@ impl Editor {
                     .cursor_pointer()
                     .child("⋯")
                     .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                    .on_click(move |_, _window, cx| {
+                    .on_click(move |_, _win, cx| {
                         editor
                             .update(cx, |editor, cx| {
                                 editor.unfold_ranges(
@@ -6605,7 +6605,7 @@ impl Editor {
             .when(show_tooltip, |this| {
                 this.tooltip({
                     let focus_handle = self.focus_handle.clone();
-                    move |_window, cx| {
+                    move |_win, cx| {
                         Tooltip::for_action_in(
                             "Toggle Code Actions",
                             &ToggleCodeActions {
@@ -7929,7 +7929,7 @@ impl Editor {
 
     fn update_visible_edit_prediction(
         &mut self,
-        _window: &mut Window,
+        _win: &mut Window,
         cx: &mut Context<Self>,
     ) -> Option<()> {
         if DisableAiSettings::get_global(cx).disable_ai {
@@ -8308,7 +8308,7 @@ impl Editor {
                     this.entry(msg, None, {
                         let weak_editor = weak_editor.clone();
                         let breakpoint = breakpoint.clone();
-                        move |_window, cx| {
+                        move |_win, cx| {
                             weak_editor
                                 .update(cx, |this, cx| {
                                     this.edit_breakpoint_at_anchor(
@@ -25434,7 +25434,7 @@ fn render_diff_hunk_controls(
             Button::new(("restore", row as u64), "Restore")
                 .tooltip({
                     let focus_handle = editor.focus_handle(cx);
-                    move |_window, cx| {
+                    move |_win, cx| {
                         Tooltip::for_action_in("Restore Hunk", &::git::Restore, &focus_handle, cx)
                     }
                 })
@@ -25460,7 +25460,7 @@ fn render_diff_hunk_controls(
                         // .disabled(!has_multiple_hunks)
                         .tooltip({
                             let focus_handle = editor.focus_handle(cx);
-                            move |_window, cx| {
+                            move |_win, cx| {
                                 Tooltip::for_action_in("Next Hunk", &GoToHunk, &focus_handle, cx)
                             }
                         })
@@ -25490,7 +25490,7 @@ fn render_diff_hunk_controls(
                         // .disabled(!has_multiple_hunks)
                         .tooltip({
                             let focus_handle = editor.focus_handle(cx);
-                            move |_window, cx| {
+                            move |_win, cx| {
                                 Tooltip::for_action_in(
                                     "Previous Hunk",
                                     &GoToPreviousHunk,

crates/project/src/git_store.rs

@@ -343,7 +343,13 @@ pub struct GitJob {
     key: Option<GitJobKey>,
 }
 
-#[derive(PartialEq, Eq)]
+impl std::fmt::Debug for GitJob {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "GitJob {{ {:?} }}", self.key)
+    }
+}
+
+#[derive(Debug, PartialEq, Eq)]
 enum GitJobKey {
     WriteIndex(Vec<RepoPath>),
     ReloadBufferDiffBases,
@@ -5213,22 +5219,29 @@ impl Repository {
             };
             let mut jobs = VecDeque::new();
             loop {
+                println!("  Current job queue: {:?}", jobs);
                 while let Ok(Some(next_job)) = job_rx.try_next() {
+                    println!("    >>> pushing new job: {next_job:?}");
                     jobs.push_back(next_job);
                 }
 
                 if let Some(job) = jobs.pop_front() {
+                    println!("    >>> popping front: {job:?}");
                     if let Some(current_key) = &job.key
                         && jobs
                             .iter()
                             .any(|other_job| other_job.key.as_ref() == Some(current_key))
                         {
+                            println!("    >>> SKIPPING");
                             continue;
                         }
+                    println!("    >>> RUNNING!");
                     (job.job)(state.clone(), cx).await;
                 } else if let Some(job) = job_rx.next().await {
+                    println!("    >>> blocking for new job: {job:?}");
                     jobs.push_back(job);
                 } else {
+                    // TODO: as far as I understand, this prong will never be reached
                     break;
                 }
             }
@@ -5372,13 +5385,17 @@ impl Repository {
         updates_tx: Option<mpsc::UnboundedSender<DownstreamUpdate>>,
         cx: &mut Context<Self>,
     ) {
-        self.paths_needing_status_update.extend(paths);
+        println!("paths_neeeding_status_update: {paths:?}");
+        // self.paths_needing_status_update.extend(paths.clone());
 
         let this = cx.weak_entity();
-        let _ = self.send_keyed_job(
+        let res = self.send_keyed_job(
             Some(GitJobKey::RefreshStatuses),
             None,
             |state, mut cx| async move {
+                this.update(&mut cx, |this, _| {
+                    this.paths_needing_status_update.extend(paths);
+                })?;
                 let (prev_snapshot, mut changed_paths) = this.update(&mut cx, |this, _| {
                     (
                         this.snapshot.clone(),
@@ -5450,6 +5467,21 @@ impl Repository {
                 })
             },
         );
+
+        cx.spawn(async move |this, cx| match res.await {
+            Ok(res) => {
+                let _ = res;
+            }
+            Err(Canceled) => {
+                println!(
+                    "skipped!!! this.paths_needing_status_update.len() = {:?}",
+                    this.update(cx, |this, _cx| {
+                        this.paths_needing_status_update.iter().count()
+                    })
+                );
+            }
+        })
+        .detach();
     }
 
     /// currently running git command and when it started