mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 21:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

WIP - update worktree's scan_id when mutating it in the foreground

Browse source
This commit is contained in:
Max Brunsfeld 2022-05-13 17:03:48 -07:00
parent f2eee6692b
commit 842bfae3af
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -838,6 +838,7 @@ impl LocalWorktree {
snapshot.remove_path(&old_path); snapshot.remove_path(&old_path);
} }
let entry = snapshot.insert_entry(entry, fs.as_ref()); let entry = snapshot.insert_entry(entry, fs.as_ref());
snapshot.scan_id += 1;
if let Some(tx) = shared_snapshots_tx { if let Some(tx) = shared_snapshots_tx {
tx.send(snapshot.clone()).await.ok(); tx.send(snapshot.clone()).await.ok();
} }
@ -2171,8 +2172,7 @@ impl BackgroundScanner {
let root_abs_path; let root_abs_path;
let next_entry_id; let next_entry_id;
{ {
let mut snapshot = self.snapshot.lock(); let snapshot = self.snapshot.lock();
snapshot.scan_id += 1;
root_char_bag = snapshot.root_char_bag; root_char_bag = snapshot.root_char_bag;
root_abs_path = snapshot.abs_path.clone(); root_abs_path = snapshot.abs_path.clone();
next_entry_id = snapshot.next_entry_id.clone(); next_entry_id = snapshot.next_entry_id.clone();
@ -2197,6 +2197,7 @@ impl BackgroundScanner {
let (scan_queue_tx, scan_queue_rx) = channel::unbounded(); let (scan_queue_tx, scan_queue_rx) = channel::unbounded();
{ {
let mut snapshot = self.snapshot.lock(); let mut snapshot = self.snapshot.lock();
snapshot.scan_id += 1;
for event in &events { for event in &events {
if let Ok(path) = event.path.strip_prefix(&root_abs_path) { if let Ok(path) = event.path.strip_prefix(&root_abs_path) {
snapshot.remove_path(&path); snapshot.remove_path(&path);