Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

git: Fix the panel's update debouncing (#23462)

Browse source 
This PR replaces the update debouncing code in the git panel with a more
correct and conventional structure (holding a `Task` field instead of
spawning a task that runs a loop). I wrote the code that this replaces
without realizing that it doesn't implement debouncing properly.

Release Notes:

- N/A
This commit is contained in:
Cole Miller 2025-01-22 14:33:17 -05:00 • committed by GitHub
parent 514d9b4161
commit a811979894
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

47
crates/git_ui/src/git_panel.rs
View file

@ -16,7 +16,6 @@ use project::git::RepositoryHandle;
use project::{Fs, Project, ProjectPath}; use project::{Fs, Project, ProjectPath};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use settings::Settings as _; use settings::Settings as _;
use std::sync::atomic::{AtomicBool, Ordering};
use std::{collections::HashSet, ops::Range, path::PathBuf, sync::Arc, time::Duration, usize}; use std::{collections::HashSet, ops::Range, path::PathBuf, sync::Arc, time::Duration, usize};
use theme::ThemeSettings; use theme::ThemeSettings;
use ui::{ use ui::{
@ -91,7 +90,7 @@ pub struct GitPanel {
scrollbar_state: ScrollbarState, scrollbar_state: ScrollbarState,
selected_entry: Option<usize>, selected_entry: Option<usize>,
show_scrollbar: bool, show_scrollbar: bool,
rebuild_requested: Arc<AtomicBool>, update_visible_entries_task: Task<()>,
commit_editor: View<Editor>, commit_editor: View<Editor>,
visible_entries: Vec<GitListEntry>, visible_entries: Vec<GitListEntry>,
all_staged: Option<bool>, all_staged: Option<bool>,
@ -167,33 +166,11 @@ impl GitPanel {
let scroll_handle = UniformListScrollHandle::new(); let scroll_handle = UniformListScrollHandle::new();
let rebuild_requested = Arc::new(AtomicBool::new(false));
let flag = rebuild_requested.clone();
let handle = cx.view().downgrade();
cx.spawn(|_, mut cx| async move {
loop {
cx.background_executor().timer(UPDATE_DEBOUNCE).await;
if flag.load(Ordering::Relaxed) {
if let Some(this) = handle.upgrade() {
this.update(&mut cx, |this, cx| {
this.update_visible_entries(cx);
let active_repository = this.active_repository.as_ref();
this.commit_editor =
cx.new_view(|cx| commit_message_editor(active_repository, cx));
})
.ok();
}
flag.store(false, Ordering::Relaxed);
}
}
})
.detach();
if let Some(git_state) = git_state { if let Some(git_state) = git_state {
cx.subscribe(&git_state, move |this, git_state, event, cx| match event { cx.subscribe(&git_state, move |this, git_state, event, cx| match event {
project::git::Event::RepositoriesUpdated => { project::git::Event::RepositoriesUpdated => {
this.active_repository = git_state.read(cx).active_repository(); this.active_repository = git_state.read(cx).active_repository();
this.schedule_update(); this.schedule_update(cx);
} }
}) })
.detach(); .detach();
@ -210,16 +187,16 @@ impl GitPanel {
selected_entry: None, selected_entry: None,
show_scrollbar: false, show_scrollbar: false,
hide_scrollbar_task: None, hide_scrollbar_task: None,
update_visible_entries_task: Task::ready(()),
active_repository, active_repository,
scroll_handle, scroll_handle,
fs, fs,
rebuild_requested,
commit_editor, commit_editor,
project, project,
err_sender, err_sender,
workspace, workspace,
}; };
git_panel.schedule_update(); git_panel.schedule_update(cx);
git_panel.show_scrollbar = git_panel.should_show_scrollbar(cx); git_panel.show_scrollbar = git_panel.should_show_scrollbar(cx);
git_panel git_panel
}); });
@ -689,8 +666,20 @@ impl GitPanel {
} }
} }
fn schedule_update(&mut self) { fn schedule_update(&mut self, cx: &mut ViewContext<Self>) {
self.rebuild_requested.store(true, Ordering::Relaxed); let handle = cx.view().downgrade();
self.update_visible_entries_task = cx.spawn(|_, mut cx| async move {
cx.background_executor().timer(UPDATE_DEBOUNCE).await;
if let Some(this) = handle.upgrade() {
this.update(&mut cx, |this, cx| {
this.update_visible_entries(cx);
let active_repository = this.active_repository.as_ref();
this.commit_editor =
cx.new_view(|cx| commit_message_editor(active_repository, cx));
})
.ok();
}
});
} }
fn update_visible_entries(&mut self, cx: &mut ViewContext<Self>) { fn update_visible_entries(&mut self, cx: &mut ViewContext<Self>) {