vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-05-31 19:05:00 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

workspace: Include threads in matched workspaces (#51114)

Browse source
This commit is contained in:
Cameron Mcloughlin 2026-03-09 15:58:02 +00:00 committed by GitHub
parent d788673f1e
commit 850188fb4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
crates/sidebar/src/sidebar.rs
View file

@ -530,6 +530,11 @@ impl Sidebar {
if !query.is_empty() { if !query.is_empty() {
let has_threads = !threads.is_empty(); let has_threads = !threads.is_empty();
let workspace_highlight_positions =
fuzzy_match_positions(&query, &label).unwrap_or_default();
let workspace_matched = !workspace_highlight_positions.is_empty();
let mut matched_threads = Vec::new(); let mut matched_threads = Vec::new();
for mut thread in threads { for mut thread in threads {
if let ListEntry::Thread { if let ListEntry::Thread {
@ -545,15 +550,14 @@ impl Sidebar {
.unwrap_or(""); .unwrap_or("");
if let Some(positions) = fuzzy_match_positions(&query, title) { if let Some(positions) = fuzzy_match_positions(&query, title) {
*highlight_positions = positions; *highlight_positions = positions;
}
if workspace_matched || !highlight_positions.is_empty() {
matched_threads.push(thread); matched_threads.push(thread);
} }
} }
} }
let workspace_highlight_positions = if matched_threads.is_empty() && !workspace_matched {
fuzzy_match_positions(&query, &label).unwrap_or_default();
if matched_threads.is_empty() && workspace_highlight_positions.is_empty() {
continue; continue;
} }
@ -743,6 +747,7 @@ impl Sidebar {
if is_group_header_after_first { if is_group_header_after_first {
v_flex() v_flex()
.w_full() .w_full()
.pt_2()
.border_t_1() .border_t_1()
.border_color(cx.theme().colors().border_variant) .border_color(cx.theme().colors().border_variant)
.child(rendered) .child(rendered)
@ -2906,12 +2911,16 @@ mod tests {
vec!["v [Empty Workspace]", " Fix typo in README <== selected",] vec!["v [Empty Workspace]", " Fix typo in README <== selected",]
); );
// "project-a" matches the first workspace name — the header appears alone // "project-a" matches the first workspace name — the header appears
// without any child threads (none of them match "project-a"). // with all child threads included.
type_in_search(&sidebar, "project-a", cx); type_in_search(&sidebar, "project-a", cx);
assert_eq!( assert_eq!(
visible_entries_as_strings(&sidebar, cx), visible_entries_as_strings(&sidebar, cx),
vec!["v [project-a] <== selected"] vec![
"v [project-a]",
" Fix bug in sidebar <== selected",
" Add tests for editor",
]
); );
} }
@ -2971,11 +2980,15 @@ mod tests {
cx.run_until_parked(); cx.run_until_parked();
// "alpha" matches the workspace name "alpha-project" but no thread titles. // "alpha" matches the workspace name "alpha-project" but no thread titles.
// The workspace header should appear with no child threads. // The workspace header should appear with all child threads included.
type_in_search(&sidebar, "alpha", cx); type_in_search(&sidebar, "alpha", cx);
assert_eq!( assert_eq!(
visible_entries_as_strings(&sidebar, cx), visible_entries_as_strings(&sidebar, cx),
vec!["v [alpha-project] <== selected"] vec![
"v [alpha-project]",
" Fix bug in sidebar <== selected",
" Add tests for editor",
]
); );
// "sidebar" matches thread titles in both workspaces but not workspace names. // "sidebar" matches thread titles in both workspaces but not workspace names.
@ -3007,11 +3020,15 @@ mod tests {
); );
// A query that matches a workspace name AND a thread in that same workspace. // A query that matches a workspace name AND a thread in that same workspace.
// Both the header (highlighted) and the matching thread should appear. // Both the header (highlighted) and all child threads should appear.
type_in_search(&sidebar, "alpha", cx); type_in_search(&sidebar, "alpha", cx);
assert_eq!( assert_eq!(
visible_entries_as_strings(&sidebar, cx), visible_entries_as_strings(&sidebar, cx),
vec!["v [alpha-project] <== selected"] vec![
"v [alpha-project]",
" Fix bug in sidebar <== selected",
" Add tests for editor",
]
); );
// Now search for something that matches only a workspace name when there // Now search for something that matches only a workspace name when there
@ -3020,7 +3037,11 @@ mod tests {
type_in_search(&sidebar, "alp", cx); type_in_search(&sidebar, "alp", cx);
assert_eq!( assert_eq!(
visible_entries_as_strings(&sidebar, cx), visible_entries_as_strings(&sidebar, cx),
vec!["v [alpha-project] <== selected"] vec![
"v [alpha-project]",
" Fix bug in sidebar <== selected",
" Add tests for editor",
]
); );
} }