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

Add ModelHandle::spawn_weak, fix worktree leak from spawn call

Browse source
This commit is contained in:
Max Brunsfeld 2021-07-05 17:37:19 -07:00
parent 65e4e78cd7
commit 58eefcd331
2 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gpui/src/app.rs
View file

@ -1761,6 +1761,16 @@ impl<'a, T: Entity> ModelContext<'a, T> {
let handle = self.handle();
self.app.spawn(|cx| f(handle, cx))
}
pub fn spawn_weak<F, Fut, S>(&self, f: F) -> Task<S>
where
F: FnOnce(WeakModelHandle<T>, AsyncAppContext) -> Fut,
Fut: 'static + Future<Output = S>,
S: 'static,
{
let handle = self.handle().downgrade();
self.app.spawn(|cx| f(handle, cx))
}
}
impl<M> AsRef<AppContext> for ModelContext<'_, M> {

48
zed/src/worktree.rs
View file

@ -196,14 +196,18 @@ impl Worktree {
})
.detach();
cx.spawn(|this, mut cx| async move {
cx.spawn_weak(|this, mut cx| async move {
while let Some(snapshot) = snapshot_rx.recv().await {
this.update(&mut cx, |this, cx| {
let this = this.as_remote_mut().unwrap();
this.snapshot = snapshot;
cx.notify();
this.update_open_buffers(cx);
})
if let Some(this) = cx.read(|cx| this.upgrade(cx)) {
this.update(&mut cx, |this, cx| {
let this = this.as_remote_mut().unwrap();
this.snapshot = snapshot;
cx.notify();
this.update_open_buffers(cx);
});
} else {
break;
}
}
})
.detach();
@ -460,28 +464,16 @@ impl LocalWorktree {
scanner.run(event_stream)
});
cx.spawn(|this, mut cx| {
let this = this.downgrade();
async move {
while let Ok(scan_state) = scan_state_rx.recv().await {
let alive = cx.update(|cx| {
if let Some(handle) = this.upgrade(&cx) {
handle.update(cx, |this, cx| {
if let Worktree::Local(worktree) = this {
worktree.observe_scan_state(scan_state, cx)
} else {
unreachable!()
}
});
true
} else {
false
}
cx.spawn_weak(|this, mut cx| async move {
while let Ok(scan_state) = scan_state_rx.recv().await {
if let Some(handle) = cx.read(|cx| this.upgrade(&cx)) {
handle.update(&mut cx, |this, cx| {
this.as_local_mut()
.unwrap()
.observe_scan_state(scan_state, cx)
});
if !alive {
break;
}
} else {
break;
}
}
})