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

Don't update worktrees' snapshots in the middle of processing fs events

Browse source
This commit is contained in:
Max Brunsfeld 2022-06-30 15:46:31 -07:00
parent b81135e10b
commit 5fdbc38f46
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/project/src/worktree.rs
View file

@ -125,7 +125,10 @@ impl DerefMut for LocalSnapshot {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
enum ScanState { enum ScanState {
Idle, Idle,
Scanning, /// The worktree is performing its initial scan of the filesystem.
Initializing,
/// The worktree is updating in response to filesystem events.
Updating,
Err(Arc<anyhow::Error>), Err(Arc<anyhow::Error>),
} }
@ -334,7 +337,7 @@ impl Worktree {
Self::Local(worktree) => { Self::Local(worktree) => {
let is_fake_fs = worktree.fs.is_fake(); let is_fake_fs = worktree.fs.is_fake();
worktree.snapshot = worktree.background_snapshot.lock().clone(); worktree.snapshot = worktree.background_snapshot.lock().clone();
if worktree.is_scanning() { if matches!(worktree.scan_state(), ScanState::Initializing) {
if worktree.poll_task.is_none() { if worktree.poll_task.is_none() {
worktree.poll_task = Some(cx.spawn_weak(|this, mut cx| async move { worktree.poll_task = Some(cx.spawn_weak(|this, mut cx| async move {
if is_fake_fs { if is_fake_fs {
@ -390,7 +393,8 @@ impl LocalWorktree {
.context("failed to stat worktree path")?; .context("failed to stat worktree path")?;
let (scan_states_tx, mut scan_states_rx) = mpsc::unbounded(); let (scan_states_tx, mut scan_states_rx) = mpsc::unbounded();
let (mut last_scan_state_tx, last_scan_state_rx) = watch::channel_with(ScanState::Scanning); let (mut last_scan_state_tx, last_scan_state_rx) =
watch::channel_with(ScanState::Initializing);
let tree = cx.add_model(move |cx: &mut ModelContext<Worktree>| { let tree = cx.add_model(move |cx: &mut ModelContext<Worktree>| {
let mut snapshot = LocalSnapshot { let mut snapshot = LocalSnapshot {
abs_path, abs_path,
@ -527,18 +531,14 @@ impl LocalWorktree {
let mut scan_state_rx = self.last_scan_state_rx.clone(); let mut scan_state_rx = self.last_scan_state_rx.clone();
async move { async move {
let mut scan_state = Some(scan_state_rx.borrow().clone()); let mut scan_state = Some(scan_state_rx.borrow().clone());
while let Some(ScanState::Scanning) = scan_state { while let Some(ScanState::Initializing | ScanState::Updating) = scan_state {
scan_state = scan_state_rx.recv().await; scan_state = scan_state_rx.recv().await;
} }
} }
} }
fn is_scanning(&self) -> bool { fn scan_state(&self) -> ScanState {
if let ScanState::Scanning = *self.last_scan_state_rx.borrow() { self.last_scan_state_rx.borrow().clone()
true
} else {
false
}
} }
pub fn snapshot(&self) -> LocalSnapshot { pub fn snapshot(&self) -> LocalSnapshot {
@ -947,7 +947,7 @@ impl LocalWorktree {
fn broadcast_snapshot(&self) -> impl Future<Output = ()> { fn broadcast_snapshot(&self) -> impl Future<Output = ()> {
let mut to_send = None; let mut to_send = None;
if !self.is_scanning() { if matches!(self.scan_state(), ScanState::Idle) {
if let Some(share) = self.share.as_ref() { if let Some(share) = self.share.as_ref() {
to_send = Some((self.snapshot(), share.snapshots_tx.clone())); to_send = Some((self.snapshot(), share.snapshots_tx.clone()));
} }
@ -1975,7 +1975,7 @@ impl BackgroundScanner {
} }
async fn run(mut self, events_rx: impl Stream<Item = Vec<fsevent::Event>>) { async fn run(mut self, events_rx: impl Stream<Item = Vec<fsevent::Event>>) {
if self.notify.unbounded_send(ScanState::Scanning).is_err() { if self.notify.unbounded_send(ScanState::Initializing).is_err() {
return; return;
} }
@ -2000,7 +2000,7 @@ impl BackgroundScanner {
events.extend(additional_events); events.extend(additional_events);
} }
if self.notify.unbounded_send(ScanState::Scanning).is_err() { if self.notify.unbounded_send(ScanState::Updating).is_err() {
break; break;
} }