Move "async move" a few characters to the left in cx.spawn() (#26758)
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
GitHub
parent
7f2e3fb5bd
commit
1aefa5178b
256 changed files with 3110 additions and 3200 deletions
|
|
@ -217,40 +217,36 @@ impl PickerDelegate for TasksModalDelegate {
|
|||
cx: &mut Context<picker::Picker<Self>>,
|
||||
) -> Task<()> {
|
||||
let task_type = self.task_modal_type.clone();
|
||||
cx.spawn_in(window, move |picker, mut cx| async move {
|
||||
cx.spawn_in(window, async move |picker, cx| {
|
||||
let Some(candidates) = picker
|
||||
.update(&mut cx, |picker, cx| {
|
||||
match &mut picker.delegate.candidates {
|
||||
Some(candidates) => string_match_candidates(candidates.iter(), task_type),
|
||||
None => {
|
||||
let Some(task_inventory) = picker
|
||||
.delegate
|
||||
.task_store
|
||||
.read(cx)
|
||||
.task_inventory()
|
||||
.cloned()
|
||||
else {
|
||||
return Vec::new();
|
||||
};
|
||||
.update(cx, |picker, cx| match &mut picker.delegate.candidates {
|
||||
Some(candidates) => string_match_candidates(candidates.iter(), task_type),
|
||||
None => {
|
||||
let Some(task_inventory) = picker
|
||||
.delegate
|
||||
.task_store
|
||||
.read(cx)
|
||||
.task_inventory()
|
||||
.cloned()
|
||||
else {
|
||||
return Vec::new();
|
||||
};
|
||||
|
||||
let (used, current) =
|
||||
task_inventory.read(cx).used_and_current_resolved_tasks(
|
||||
&picker.delegate.task_contexts,
|
||||
cx,
|
||||
);
|
||||
picker.delegate.last_used_candidate_index = if used.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(used.len() - 1)
|
||||
};
|
||||
let (used, current) = task_inventory
|
||||
.read(cx)
|
||||
.used_and_current_resolved_tasks(&picker.delegate.task_contexts, cx);
|
||||
picker.delegate.last_used_candidate_index = if used.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(used.len() - 1)
|
||||
};
|
||||
|
||||
let mut new_candidates = used;
|
||||
new_candidates.extend(current);
|
||||
let match_candidates =
|
||||
string_match_candidates(new_candidates.iter(), task_type);
|
||||
let _ = picker.delegate.candidates.insert(new_candidates);
|
||||
match_candidates
|
||||
}
|
||||
let mut new_candidates = used;
|
||||
new_candidates.extend(current);
|
||||
let match_candidates =
|
||||
string_match_candidates(new_candidates.iter(), task_type);
|
||||
let _ = picker.delegate.candidates.insert(new_candidates);
|
||||
match_candidates
|
||||
}
|
||||
})
|
||||
.ok()
|
||||
|
|
@ -267,7 +263,7 @@ impl PickerDelegate for TasksModalDelegate {
|
|||
)
|
||||
.await;
|
||||
picker
|
||||
.update(&mut cx, |picker, _| {
|
||||
.update(cx, |picker, _| {
|
||||
let delegate = &mut picker.delegate;
|
||||
delegate.matches = matches;
|
||||
if let Some(index) = delegate.last_used_candidate_index {
|
||||
|
|
|
|||
|
|
@ -48,11 +48,11 @@ pub fn init(cx: &mut App) {
|
|||
original_task.use_new_terminal = use_new_terminal;
|
||||
}
|
||||
let task_contexts = task_contexts(workspace, window, cx);
|
||||
cx.spawn_in(window, |workspace, mut cx| async move {
|
||||
cx.spawn_in(window, async move |workspace, cx| {
|
||||
let task_contexts = task_contexts.await;
|
||||
let default_context = TaskContext::default();
|
||||
workspace
|
||||
.update_in(&mut cx, |workspace, _, cx| {
|
||||
.update_in(cx, |workspace, _, cx| {
|
||||
schedule_task(
|
||||
workspace,
|
||||
task_source_kind,
|
||||
|
|
@ -146,10 +146,10 @@ pub fn toggle_modal(
|
|||
});
|
||||
if can_open_modal {
|
||||
let task_contexts = task_contexts(workspace, window, cx);
|
||||
cx.spawn_in(window, |workspace, mut cx| async move {
|
||||
cx.spawn_in(window, async move |workspace, cx| {
|
||||
let task_contexts = task_contexts.await;
|
||||
workspace
|
||||
.update_in(&mut cx, |workspace, window, cx| {
|
||||
.update_in(cx, |workspace, window, cx| {
|
||||
workspace.toggle_modal(window, cx, |window, cx| {
|
||||
TasksModal::new(
|
||||
task_store.clone(),
|
||||
|
|
@ -177,12 +177,12 @@ fn spawn_task_with_name(
|
|||
window: &mut Window,
|
||||
cx: &mut Context<Workspace>,
|
||||
) -> Task<anyhow::Result<()>> {
|
||||
cx.spawn_in(window, |workspace, mut cx| async move {
|
||||
let task_contexts = workspace.update_in(&mut cx, |workspace, window, cx| {
|
||||
cx.spawn_in(window, async move |workspace, cx| {
|
||||
let task_contexts = workspace.update_in(cx, |workspace, window, cx| {
|
||||
task_contexts(workspace, window, cx)
|
||||
})?;
|
||||
let task_contexts = task_contexts.await;
|
||||
let tasks = workspace.update(&mut cx, |workspace, cx| {
|
||||
let tasks = workspace.update(cx, |workspace, cx| {
|
||||
let Some(task_inventory) = workspace
|
||||
.project()
|
||||
.read(cx)
|
||||
|
|
@ -209,7 +209,7 @@ fn spawn_task_with_name(
|
|||
})?;
|
||||
|
||||
let did_spawn = workspace
|
||||
.update(&mut cx, |workspace, cx| {
|
||||
.update(cx, |workspace, cx| {
|
||||
let (task_source_kind, mut target_task) =
|
||||
tasks.into_iter().find(|(_, task)| task.label == name)?;
|
||||
if let Some(overrides) = &overrides {
|
||||
|
|
@ -232,7 +232,7 @@ fn spawn_task_with_name(
|
|||
.is_some();
|
||||
if !did_spawn {
|
||||
workspace
|
||||
.update_in(&mut cx, |workspace, window, cx| {
|
||||
.update_in(cx, |workspace, window, cx| {
|
||||
spawn_task_or_modal(
|
||||
workspace,
|
||||
&Spawn::ViaModal {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue