From 846ed6adf91fc63f585c921da0101802b031c855 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukas@zed.dev>
Date: Fri, 15 Aug 2025 14:54:05 +0200
Subject: [PATCH] search: Fix project search not rendering matches count
 (#36238)

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

Release Notes:

- N/A
---
 crates/search/src/project_search.rs | 89 +++++++++++++++--------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 6b9777906a..b791f748ad 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -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 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()
             .w_full()
             .gap_2()
             .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_column = input_base_styles(InputPanel::Replacement)