Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

search: Fix project search not rendering matches count (#36238)

Browse source 
Follow up to https://github.com/zed-industries/zed/pull/36103/

Release Notes:

- N/A
This commit is contained in:
Lukas Wirth 2025-08-15 14:54:05 +02:00 • committed by GitHub
parent 708c434bd4
commit 846ed6adf9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 45 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

89
crates/search/src/project_search.rs
View file

@ -1975,49 +1975,6 @@ impl Render for ProjectSearchBar {
), ),
); );
let mode_column = h_flex()
.gap_1()
.min_w_64()
.child(
IconButton::new("project-search-filter-button", IconName::Filter)
.shape(IconButtonShape::Square)
.tooltip(|window, cx| {
Tooltip::for_action("Toggle Filters", &ToggleFilters, window, cx)
})
.on_click(cx.listener(|this, _, window, cx| {
this.toggle_filters(window, cx);
}))
.toggle_state(
self.active_project_search
.as_ref()
.map(|search| search.read(cx).filters_enabled)
.unwrap_or_default(),
)
.tooltip({
let focus_handle = focus_handle.clone();
move |window, cx| {
Tooltip::for_action_in(
"Toggle Filters",
&ToggleFilters,
&focus_handle,
window,
cx,
)
}
}),
)
.child(render_action_button(
"project-search",
IconName::Replace,
self.active_project_search
.as_ref()
.map(|search| search.read(cx).replace_enabled)
.unwrap_or_default(),
"Toggle Replace",
&ToggleReplace,
focus_handle.clone(),
));
let query_focus = search.query_editor.focus_handle(cx); let query_focus = search.query_editor.focus_handle(cx);
let matches_column = h_flex() let matches_column = h_flex()
@ -2060,11 +2017,55 @@ impl Render for ProjectSearchBar {
}), }),
); );
let mode_column = h_flex()
.gap_1()
.min_w_64()
.child(
IconButton::new("project-search-filter-button", IconName::Filter)
.shape(IconButtonShape::Square)
.tooltip(|window, cx| {
Tooltip::for_action("Toggle Filters", &ToggleFilters, window, cx)
})
.on_click(cx.listener(|this, _, window, cx| {
this.toggle_filters(window, cx);
}))
.toggle_state(
self.active_project_search
.as_ref()
.map(|search| search.read(cx).filters_enabled)
.unwrap_or_default(),
)
.tooltip({
let focus_handle = focus_handle.clone();
move |window, cx| {
Tooltip::for_action_in(
"Toggle Filters",
&ToggleFilters,
&focus_handle,
window,
cx,
)
}
}),
)
.child(render_action_button(
"project-search",
IconName::Replace,
self.active_project_search
.as_ref()
.map(|search| search.read(cx).replace_enabled)
.unwrap_or_default(),
"Toggle Replace",
&ToggleReplace,
focus_handle.clone(),
))
.child(matches_column);
let search_line = h_flex() let search_line = h_flex()
.w_full() .w_full()
.gap_2() .gap_2()
.child(query_column) .child(query_column)
.child(h_flex().min_w_64().child(mode_column).child(matches_column)); .child(mode_column);
let replace_line = search.replace_enabled.then(|| { let replace_line = search.replace_enabled.then(|| {
let replace_column = input_base_styles(InputPanel::Replacement) let replace_column = input_base_styles(InputPanel::Replacement)