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

Update old usages of ctx.spawn to detach the associated task

Browse source 
This lets us open buffers and renders tabs and editors correctly, modulo
a small bug when rendering the gutter that I am going to fix next.
This commit is contained in:
Antonio Scandurra 2021-03-26 14:15:01 +01:00
parent 13c1f5f60e
commit 2c24ec2e46
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
zed/src/watch.rs
View file

@ -38,16 +38,18 @@ impl<T> Receiver<T> {
impl<T: 'static + Clone> Receiver<T> {
pub fn notify_model_on_change<M: 'static + Entity>(&self, ctx: &mut ModelContext<M>) {
let watch = self.clone();
let _ = ctx.spawn(async move { watch.updated().await }, |_, _, ctx| {
ctx.spawn(async move { watch.updated().await }, |_, _, ctx| {
ctx.notify()
});
})
.detach();
}
pub fn notify_view_on_change<V: 'static + View>(&self, ctx: &mut ViewContext<V>) {
let watch = self.clone();
let _ = ctx.spawn(async move { watch.updated().await }, |_, _, ctx| {
ctx.spawn(async move { watch.updated().await }, |_, _, ctx| {
ctx.notify()
});
})
.detach();
}
}

15
zed/src/workspace/workspace.rs
View file

@ -161,29 +161,32 @@ impl Workspace {
let (mut tx, rx) = watch::channel(None);
self.items.insert(entry, OpenedItem::Loading(rx));
let _ = ctx.spawn(
ctx.spawn(
buffer,
move |me, buffer: anyhow::Result<Buffer>, ctx| match buffer {
Ok(buffer) => {
let handle = Box::new(ctx.add_model(|_| buffer)) as Box<dyn ItemHandle>;
me.items.insert(entry, OpenedItem::Loaded(handle.clone()));
let _ = ctx.spawn(
ctx.spawn(
async move {
tx.update(|value| *value = Some(Ok(handle))).await;
},
|_, _, _| {},
);
)
.detach();
}
Err(error) => {
let _ = ctx.spawn(
ctx.spawn(
async move {
tx.update(|value| *value = Some(Err(Arc::new(error)))).await;
},
|_, _, _| {},
);
)
.detach();
}
},
);
)
.detach();
self.open_entry(entry, ctx)
}

5
zed/src/workspace/workspace_view.rs
View file

@ -176,7 +176,7 @@ impl WorkspaceView {
Err(error) => error!("{}", error),
Ok(item) => {
let settings = self.settings.clone();
let _ = ctx.spawn(item, move |me, item, ctx| {
ctx.spawn(item, move |me, item, ctx| {
me.loading_entries.remove(&entry);
match item {
Ok(item) => {
@ -187,7 +187,8 @@ impl WorkspaceView {
error!("{}", error);
}
}
});
})
.detach();
}
}
}