From 5740fec9d5af569621ffbf6238243f86c99dc0b6 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 28 Feb 2025 15:15:25 +0200
Subject: [PATCH] Ensure search input always has regex language synced with
 search_options state (#25811)

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

Release Notes:

- N/A
---
 crates/search/src/buffer_search.rs  | 3 ++-
 crates/search/src/project_search.rs | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 62b65b3bd484f3d4789288658377388b1195491d..628eba1703f42ce03d8d3e2b8795372c8c4214ca 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -924,7 +924,7 @@ impl BufferSearchBar {
                     query_buffer.edit([(0..len, query)], None, cx);
                 });
             });
-            self.search_options = options;
+            self.set_search_options(options, cx);
             self.clear_matches(window, cx);
             cx.notify();
         }
@@ -978,6 +978,7 @@ impl BufferSearchBar {
 
     pub fn set_search_options(&mut self, search_options: SearchOptions, cx: &mut Context<Self>) {
         self.search_options = search_options;
+        self.adjust_query_regex_language(cx);
         cx.notify();
     }
 
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 658a2673737debb4ef6ff59144e98ee4e246140a..5f545070070befd651acf361797f7458564ac421 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -894,6 +894,7 @@ impl ProjectSearchView {
                             editor.set_text(old_query.as_str(), window, cx);
                         });
                         search_view.search_options = SearchOptions::from_query(&old_query);
+                        search_view.adjust_query_regex_language(cx);
                     }
                 }
                 new_query