zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Require a context when constructing a worktree

Browse Source
This commit is contained in:
Nathan Sobo 2021-04-12 18:42:19 -06:00
parent 24cdfd2471
commit 41f50cdb61
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zed/src/workspace/workspace.rs
View File

@ -117,7 +117,7 @@ impl Workspace {
}
}
let worktree = ctx.add_model(|ctx| Worktree::new(ctx.model_id(), path, Some(ctx)));
let worktree = ctx.add_model(|ctx| Worktree::new(ctx.model_id(), path, ctx));
ctx.observe(&worktree, Self::on_worktree_updated);
self.worktrees.insert(worktree);
ctx.notify();

32
zed/src/worktree/worktree.rs
View File

@ -49,7 +49,7 @@ struct DirToScan {
}
impl Worktree {
pub fn new<T>(id: usize, path: T, ctx: Option<&mut ModelContext<Self>>) -> Self
pub fn new<T>(id: usize, path: T, ctx: &mut ModelContext<Self>) -> Self
where
T: Into<PathBuf>,
{
@ -60,27 +60,25 @@ impl Worktree {
entries: HashMap::new(),
file_paths: Vec::new(),
histories: HashMap::new(),
scanning: ctx.is_some(),
scanning: true,
})));
if let Some(ctx) = ctx {
tree.0.write().scanning = true;
let done_scanning = {
let tree = tree.clone();
let task = ctx.background_executor().spawn(async move {
ctx.background_executor().spawn(async move {
tree.scan_dirs()?;
Ok(())
});
})
};
ctx.spawn(task, Self::done_scanning).detach();
ctx.spawn(done_scanning, Self::done_scanning).detach();
ctx.spawn_stream(
timer::repeat(Duration::from_millis(100)).map(|_| ()),
Self::scanning,
|_, _| {},
)
.detach();
}
ctx.spawn_stream(
timer::repeat(Duration::from_millis(100)).map(|_| ()),
Self::scanning,
|_, _| {},
)
.detach();
tree
}
@ -690,7 +688,7 @@ mod test {
let root_link_path = dir.path().join("root_link");
unix::fs::symlink(&dir.path().join("root"), &root_link_path).unwrap();
let tree = app.add_model(|ctx| Worktree::new(1, root_link_path, Some(ctx)));
let tree = app.add_model(|ctx| Worktree::new(1, root_link_path, ctx));
app.finish_pending_tasks().await;
app.read(|ctx| {
@ -719,7 +717,7 @@ mod test {
"file1": "the old contents",
}));
let tree = app.add_model(|ctx| Worktree::new(1, dir.path(), Some(ctx)));
let tree = app.add_model(|ctx| Worktree::new(1, dir.path(), ctx));
app.finish_pending_tasks().await;
let buffer = Buffer::new(1, "a line of text.\n".repeat(10 * 1024));