Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move "async move" a few characters to the left in cx.spawn() (#26758)

Browse source 
This is the core change:
https://github.com/zed-industries/zed/pull/26758/files#diff-044302c0d57147af17e68a0009fee3e8dcdfb4f32c27a915e70cfa80e987f765R1052

TODO:
- [x] Use AsyncFn instead of Fn() -> Future in GPUI spawn methods
- [x] Implement it in the whole app
- [x] Implement it in the debugger 
- [x] Glance at the RPC crate, and see if those box future methods can
be switched over. Answer: It can't directly, as you can't make an
AsyncFn* into a trait object. There's ways around that, but they're all
more complex than just keeping the code as is.
- [ ] Fix platform specific code

Release Notes:

- N/A
This commit is contained in:
Mikayla Maki 2025-03-18 19:09:02 -07:00 • committed by GitHub
parent 7f2e3fb5bd
commit 1aefa5178b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
256 changed files with 3110 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/vim/src/command.rs
View file

@ -1192,7 +1192,7 @@ impl OnMatchingLines {
..snapshot
.buffer_snapshot
.clip_point(Point::new(range.end.0 + 1, 0), Bias::Left);
cx.spawn_in(window, |editor, mut cx| async move {
cx.spawn_in(window, async move |editor, cx| {
let new_selections = cx
.background_spawn(async move {
let mut line = String::new();
@ -1226,7 +1226,7 @@ impl OnMatchingLines {
return;
}
editor
.update_in(&mut cx, |editor, window, cx| {
.update_in(cx, |editor, window, cx| {
editor.start_transaction_at(Instant::now(), window, cx);
editor.change_selections(None, window, cx, |s| {
s.replace_cursors_with(|_| new_selections);
@ -1511,9 +1511,9 @@ impl ShellExec {
};
let is_read = self.is_read;
let task = cx.spawn_in(window, |vim, mut cx| async move {
let task = cx.spawn_in(window, async move |vim, cx| {
let Some(mut running) = process.spawn().log_err() else {
vim.update_in(&mut cx, |vim, window, cx| {
vim.update_in(cx, |vim, window, cx| {
vim.cancel_running_command(window, cx);
})
.log_err();
@ -1540,7 +1540,7 @@ impl ShellExec {
.await;
let Some(output) = output.log_err() else {
vim.update_in(&mut cx, |vim, window, cx| {
vim.update_in(cx, |vim, window, cx| {
vim.cancel_running_command(window, cx);
})
.log_err();
@ -1556,7 +1556,7 @@ impl ShellExec {
text.push('\n');
}
vim.update_in(&mut cx, |vim, window, cx| {
vim.update_in(cx, |vim, window, cx| {
vim.update_editor(window, cx, |_, editor, window, cx| {
editor.transact(window, cx, |editor, window, cx| {
editor.edit([(range.clone(), text)], cx);

4
crates/vim/src/normal/mark.rs
View file

@ -147,9 +147,9 @@ impl Vim {
cx,
)
});
cx.spawn_in(window, |this, mut cx| async move {
cx.spawn_in(window, async move |this, cx| {
let editor = task.await?;
this.update_in(&mut cx, |_, window, cx| {
this.update_in(cx, |_, window, cx| {
if let Some(editor) = editor.act_as::<Editor>(cx) {
editor.update(cx, |editor, cx| {
let map = editor.snapshot(window, cx);

16
crates/vim/src/normal/search.rs
View file

@ -341,9 +341,9 @@ impl Vim {
let Some(search) = search else { return false };
let search_bar = search_bar.downgrade();
cx.spawn_in(window, |_, mut cx| async move {
cx.spawn_in(window, async move |_, cx| {
search.await?;
search_bar.update_in(&mut cx, |search_bar, window, cx| {
search_bar.update_in(cx, |search_bar, window, cx| {
search_bar.select_match(direction, count, window, cx);
vim.update(cx, |vim, cx| {
@ -404,9 +404,9 @@ impl Vim {
} else {
Direction::Next
};
cx.spawn_in(window, |_, mut cx| async move {
cx.spawn_in(window, async move |_, cx| {
search.await?;
search_bar.update_in(&mut cx, |search_bar, window, cx| {
search_bar.update_in(cx, |search_bar, window, cx| {
search_bar.select_match(direction, 1, window, cx)
})?;
anyhow::Ok(())
@ -473,18 +473,18 @@ impl Vim {
});
let Some(search) = search else { return };
let search_bar = search_bar.downgrade();
cx.spawn_in(window, |_, mut cx| async move {
cx.spawn_in(window, async move |_, cx| {
search.await?;
search_bar.update_in(&mut cx, |search_bar, window, cx| {
search_bar.update_in(cx, |search_bar, window, cx| {
if replacement.should_replace_all {
search_bar.select_last_match(window, cx);
search_bar.replace_all(&Default::default(), window, cx);
cx.spawn(|_, mut cx| async move {
cx.spawn(async move |_, cx| {
cx.background_executor()
.timer(Duration::from_millis(200))
.await;
editor
.update(&mut cx, |editor, cx| editor.clear_search_within_ranges(cx))
.update(cx, |editor, cx| editor.clear_search_within_ranges(cx))
.ok();
})
.detach();

4
crates/vim/src/normal/yank.rs
View file

@ -228,11 +228,11 @@ impl Vim {
|colors| colors.editor_document_highlight_read_background,
cx,
);
cx.spawn(|this, mut cx| async move {
cx.spawn(async move |this, cx| {
cx.background_executor()
.timer(Duration::from_millis(highlight_duration))
.await;
this.update(&mut cx, |editor, cx| {
this.update(cx, |editor, cx| {
editor.clear_background_highlights::<HighlightOnYank>(cx)
})
.ok();

6
crates/vim/src/state.rs
View file

@ -288,8 +288,8 @@ impl MarksState {
}
fn load(&mut self, cx: &mut Context<Self>) {
cx.spawn(|this, mut cx| async move {
let Some(workspace_id) = this.update(&mut cx, |this, cx| this.workspace_id(cx))? else {
cx.spawn(async move |this, cx| {
let Some(workspace_id) = this.update(cx, |this, cx| this.workspace_id(cx))? else {
return Ok(());
};
let (marks, paths) = cx
@ -299,7 +299,7 @@ impl MarksState {
anyhow::Ok((marks, paths))
})
.await?;
this.update(&mut cx, |this, cx| this.loaded(marks, paths, cx))
this.update(cx, |this, cx| this.loaded(marks, paths, cx))
})
.detach_and_log_err(cx);
}