mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-24 02:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Eagerly populate worktree entries on load

Browse source 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Nathan Sobo 2021-06-28 12:29:46 -06:00
parent 958345b5ce
commit 1793eda470
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
zed/src/worktree.rs
View file

@ -466,11 +466,18 @@ impl LocalWorktree {
} }
fn load(&self, path: &Path, cx: &AppContext) -> Task<Result<String>> { fn load(&self, path: &Path, cx: &AppContext) -> Task<Result<String>> {
let abs_path = self.absolutize(path); let path = Arc::from(path);
let abs_path = self.absolutize(&path);
let background_snapshot = self.background_snapshot.clone();
cx.background().spawn(async move { cx.background().spawn(async move {
let mut file = fs::File::open(&abs_path)?; let mut file = fs::File::open(&abs_path)?;
let mut contents = String::new(); let mut contents = String::new();
file.read_to_string(&mut contents)?; file.read_to_string(&mut contents)?;
// Eagerly populate the snapshot with an updated entry for the loaded file
refresh_entry(&background_snapshot, path, &abs_path)?;
Result::<_, anyhow::Error>::Ok(contents) Result::<_, anyhow::Error>::Ok(contents)
}) })
} }
@ -496,32 +503,17 @@ impl LocalWorktree {
writer.flush()?; writer.flush()?;
// Eagerly populate the snapshot with an updated entry for the saved file // Eagerly populate the snapshot with an updated entry for the saved file
let root_char_bag; refresh_entry(&background_snapshot, path.clone(), &abs_path)?;
let next_entry_id;
{
let snapshot = background_snapshot.lock();
root_char_bag = snapshot.root_char_bag;
next_entry_id = snapshot.next_entry_id.clone();
}
let entry = fs_entry_for_path(root_char_bag, &next_entry_id, path, &abs_path)?
.ok_or_else(|| anyhow!("could not read saved file metadata"))?;
let added = background_snapshot.lock().insert_entry(entry);
Ok::<bool, anyhow::Error>(added) Ok::<_, anyhow::Error>(())
}) })
}; };
cx.spawn(|worktree, mut cx| async move { cx.spawn(|worktree, mut cx| async move {
let added = save.await?; save.await?;
worktree.update(&mut cx, |worktree, cx| { worktree.update(&mut cx, |worktree, cx| {
let worktree = worktree.as_local_mut().unwrap(); let worktree = worktree.as_local_mut().unwrap();
worktree.poll_snapshot(cx); worktree.poll_snapshot(cx);
let mut diff = Diff::default();
if added {
diff.added.insert(path.clone());
}
diff.modified.insert(path);
worktree.observe_snapshot_diff(diff, cx)
}); });
Ok(()) Ok(())
}) })
@ -1684,6 +1676,20 @@ impl BackgroundScanner {
} }
} }
fn refresh_entry(snapshot: &Mutex<Snapshot>, path: Arc<Path>, abs_path: &Path) -> Result<()> {
let root_char_bag;
let next_entry_id;
{
let snapshot = snapshot.lock();
root_char_bag = snapshot.root_char_bag;
next_entry_id = snapshot.next_entry_id.clone();
}
let entry = fs_entry_for_path(root_char_bag, &next_entry_id, path, &abs_path)?
.ok_or_else(|| anyhow!("could not read saved file metadata"))?;
snapshot.lock().insert_entry(entry);
Ok(())
}
fn fs_entry_for_path( fn fs_entry_for_path(
root_char_bag: CharBag, root_char_bag: CharBag,
next_entry_id: &AtomicUsize, next_entry_id: &AtomicUsize,