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:
parent
7f2e3fb5bd
commit
1aefa5178b
256 changed files with 3110 additions and 3200 deletions
|
@ -260,10 +260,10 @@ impl ProjectSearch {
|
|||
self.search_id += 1;
|
||||
self.active_query = Some(query);
|
||||
self.match_ranges.clear();
|
||||
self.pending_search = Some(cx.spawn(|this, mut cx| async move {
|
||||
self.pending_search = Some(cx.spawn(async move |this, cx| {
|
||||
let mut matches = pin!(search.ready_chunks(1024));
|
||||
let this = this.upgrade()?;
|
||||
this.update(&mut cx, |this, cx| {
|
||||
this.update(cx, |this, cx| {
|
||||
this.match_ranges.clear();
|
||||
this.excerpts.update(cx, |this, cx| this.clear(cx));
|
||||
this.no_results = Some(true);
|
||||
|
@ -286,7 +286,7 @@ impl ProjectSearch {
|
|||
}
|
||||
|
||||
let match_ranges = this
|
||||
.update(&mut cx, |this, cx| {
|
||||
.update(cx, |this, cx| {
|
||||
this.excerpts.update(cx, |excerpts, cx| {
|
||||
excerpts.push_multiple_excerpts_with_context_lines(
|
||||
buffers_with_ranges,
|
||||
|
@ -298,14 +298,14 @@ impl ProjectSearch {
|
|||
.ok()?
|
||||
.await;
|
||||
|
||||
this.update(&mut cx, |this, cx| {
|
||||
this.update(cx, |this, cx| {
|
||||
this.match_ranges.extend(match_ranges);
|
||||
cx.notify();
|
||||
})
|
||||
.ok()?;
|
||||
}
|
||||
|
||||
this.update(&mut cx, |this, cx| {
|
||||
this.update(cx, |this, cx| {
|
||||
if !this.match_ranges.is_empty() {
|
||||
this.no_results = Some(false);
|
||||
}
|
||||
|
@ -796,13 +796,13 @@ impl ProjectSearchView {
|
|||
}));
|
||||
|
||||
let languages = project.read(cx).languages().clone();
|
||||
cx.spawn(|project_search_view, mut cx| async move {
|
||||
cx.spawn(async move |project_search_view, cx| {
|
||||
let regex_language = languages
|
||||
.language_for_name("regex")
|
||||
.await
|
||||
.context("loading regex language")?;
|
||||
project_search_view
|
||||
.update(&mut cx, |project_search_view, cx| {
|
||||
.update(cx, |project_search_view, cx| {
|
||||
project_search_view.regex_language = Some(regex_language);
|
||||
project_search_view.adjust_query_regex_language(cx);
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue