oak-team/oak-gpui
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "search: Introduce more yield points in project search pending_search task" (#39672)

Browse Source 
Reverts zed-industries/zed#39624

This seems to have had the opposite effect
This commit is contained in:
Lukas Wirth
2025-10-07 11:58:58 +00:00
committed by GitHub
parent b02b130b7c
commit ffff56f7fe
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/search/src/project_search.rs
+30 -21
View File
@@ -13,7 +13,7 @@ use editor::{
items::active_match_index,
multibuffer_context_lines,
};
use futures::StreamExt;
use futures::{StreamExt, stream::FuturesOrdered};
use gpui::{
Action, AnyElement, AnyView, App, Axis, Context, Entity, EntityId, EventEmitter, FocusHandle,
Focusable, Global, Hsla, InteractiveElement, IntoElement, KeyContext, ParentElement, Point,
@@ -321,35 +321,44 @@ impl ProjectSearch {
let mut limit_reached = false;
while let Some(results) = matches.next().await {
let mut buffers_with_ranges = Vec::with_capacity(results.len());
for result in results {
match result {
project::search::SearchResult::Buffer { buffer, ranges } => {
let new_ranges = project_search
.update(cx, |project_search, cx| {
project_search.excerpts.update(cx, |excerpts, cx| {
excerpts.set_anchored_excerpts_for_path(
buffer,
ranges,
multibuffer_context_lines(cx),
cx,
)
})
})
.ok()?
.await;
project_search
.update(cx, |project_search, cx| {
project_search.match_ranges.extend(new_ranges);
cx.notify();
})
.ok()?;
buffers_with_ranges.push((buffer, ranges));
}
project::search::SearchResult::LimitReached => {
limit_reached = true;
}
}
}
let mut new_ranges = project_search
.update(cx, |project_search, cx| {
project_search.excerpts.update(cx, |excerpts, cx| {
buffers_with_ranges
.into_iter()
.map(|(buffer, ranges)| {
excerpts.set_anchored_excerpts_for_path(
buffer,
ranges,
multibuffer_context_lines(cx),
cx,
)
})
.collect::<FuturesOrdered<_>>()
})
})
.ok()?;
while let Some(new_ranges) = new_ranges.next().await {
project_search
.update(cx, |project_search, cx| {
project_search.match_ranges.extend(new_ranges);
cx.notify();
})
.ok()?;
}
}
project_search