Don't try to make project search and outline order match project panel (#20513)

A straight alphabetical order is arguably clearer, and avoids a large
initial delay when searching large repos.

Release Notes:

- Fixed a long initial delay when performing a project search in a large
repository.
This commit is contained in:
Max Brunsfeld 2024-11-11 12:20:04 -08:00 committed by GitHub
parent 97b542b22a
commit 149e5fde36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 63 deletions

View file

@ -4654,61 +4654,6 @@ async fn test_search_in_gitignored_dirs(cx: &mut gpui::TestAppContext) {
);
}
#[gpui::test]
async fn test_search_ordering(cx: &mut gpui::TestAppContext) {
init_test(cx);
let fs = FakeFs::new(cx.background_executor.clone());
fs.insert_tree(
"/dir",
json!({
".git": {},
".gitignore": "**/target\n/node_modules\n",
"aaa.txt": "key:value",
"bbb": {
"index.txt": "index_key:index_value"
},
"node_modules": {
"10 eleven": "key",
"1 two": "key"
},
}),
)
.await;
let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
let mut search = project.update(cx, |project, cx| {
project.search(
SearchQuery::text(
"key",
false,
false,
true,
Default::default(),
Default::default(),
None,
)
.unwrap(),
cx,
)
});
fn file_name(search_result: Option<SearchResult>, cx: &mut gpui::TestAppContext) -> String {
match search_result.unwrap() {
SearchResult::Buffer { buffer, .. } => buffer.read_with(cx, |buffer, _| {
buffer.file().unwrap().path().to_string_lossy().to_string()
}),
_ => panic!("Expected buffer"),
}
}
assert_eq!(file_name(search.next().await, cx), "bbb/index.txt");
assert_eq!(file_name(search.next().await, cx), "node_modules/1 two");
assert_eq!(file_name(search.next().await, cx), "node_modules/10 eleven");
assert_eq!(file_name(search.next().await, cx), "aaa.txt");
assert!(search.next().await.is_none())
}
#[gpui::test]
async fn test_create_entry(cx: &mut gpui::TestAppContext) {
init_test(cx);