From fe315c6111abca7659c3bf3dd3449331377b8416 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 11 Dec 2023 13:35:25 +0100
Subject: [PATCH] Bind actions on the whole search bar, not just the query
 editor

---
 crates/search2/src/project_search.rs | 64 ++++++++++++++--------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/crates/search2/src/project_search.rs b/crates/search2/src/project_search.rs
index 82243a69c736c2d78226cb353971c8cbde888f2c..2a143e05960ae5c0fff68032c3517296ee00460e 100644
--- a/crates/search2/src/project_search.rs
+++ b/crates/search2/src/project_search.rs
@@ -1732,42 +1732,10 @@ impl Render for ProjectSearchBar {
                 h_stack()
                     .min_w_80()
                     .on_action(cx.listener(|this, action, cx| this.confirm(action, cx)))
-                    .on_action(cx.listener(|this, _: &ToggleFilters, cx| {
-                        this.toggle_filters(cx);
-                    }))
-                    .on_action(cx.listener(|this, _: &ToggleWholeWord, cx| {
-                        this.toggle_search_option(SearchOptions::WHOLE_WORD, cx);
-                    }))
-                    .on_action(cx.listener(|this, _: &ToggleCaseSensitive, cx| {
-                        this.toggle_search_option(SearchOptions::CASE_SENSITIVE, cx);
-                    }))
-                    .on_action(cx.listener(|this, action, cx| {
-                        this.toggle_replace(action, cx);
-                    }))
-                    .on_action(cx.listener(|this, _: &ActivateTextMode, cx| {
-                        this.activate_search_mode(SearchMode::Text, cx)
-                    }))
-                    .on_action(cx.listener(|this, _: &ActivateRegexMode, cx| {
-                        this.activate_search_mode(SearchMode::Regex, cx)
-                    }))
                     .on_action(
                         cx.listener(|this, action, cx| this.previous_history_query(action, cx)),
                     )
                     .on_action(cx.listener(|this, action, cx| this.next_history_query(action, cx)))
-                    .on_action(cx.listener(|this, action, cx| {
-                        if let Some(search) = this.active_project_search.as_ref() {
-                            search.update(cx, |this, cx| {
-                                this.replace_next(action, cx);
-                            })
-                        }
-                    }))
-                    .on_action(cx.listener(|this, action, cx| {
-                        if let Some(search) = this.active_project_search.as_ref() {
-                            search.update(cx, |this, cx| {
-                                this.replace_all(action, cx);
-                            })
-                        }
-                    }))
                     .child(IconElement::new(Icon::MagnifyingGlass))
                     .child(search.query_editor.clone())
                     .child(
@@ -1937,6 +1905,38 @@ impl Render for ProjectSearchBar {
             .p_1()
             .m_2()
             .justify_between()
+            .on_action(cx.listener(|this, _: &ToggleFilters, cx| {
+                this.toggle_filters(cx);
+            }))
+            .on_action(cx.listener(|this, _: &ToggleWholeWord, cx| {
+                this.toggle_search_option(SearchOptions::WHOLE_WORD, cx);
+            }))
+            .on_action(cx.listener(|this, _: &ToggleCaseSensitive, cx| {
+                this.toggle_search_option(SearchOptions::CASE_SENSITIVE, cx);
+            }))
+            .on_action(cx.listener(|this, action, cx| {
+                this.toggle_replace(action, cx);
+            }))
+            .on_action(cx.listener(|this, _: &ActivateTextMode, cx| {
+                this.activate_search_mode(SearchMode::Text, cx)
+            }))
+            .on_action(cx.listener(|this, _: &ActivateRegexMode, cx| {
+                this.activate_search_mode(SearchMode::Regex, cx)
+            }))
+            .on_action(cx.listener(|this, action, cx| {
+                if let Some(search) = this.active_project_search.as_ref() {
+                    search.update(cx, |this, cx| {
+                        this.replace_next(action, cx);
+                    })
+                }
+            }))
+            .on_action(cx.listener(|this, action, cx| {
+                if let Some(search) = this.active_project_search.as_ref() {
+                    search.update(cx, |this, cx| {
+                        this.replace_all(action, cx);
+                    })
+                }
+            }))
             .child(query_column)
             .child(mode_column)
             .child(replace_column)