From 694afd15c91fe56f7399bf1e35592a877ec002c4 Mon Sep 17 00:00:00 2001 From: Ben Kunkle Date: Fri, 28 Feb 2025 18:59:22 -0600 Subject: [PATCH] Fix buffer search options not resetting when dismissed after Vim mode search then reopened with `buffer: deploy search` (#25838) Closes #25315 Release Notes: - Fixes an issue where the buffer search options would not be reset when using `buffer: deploy search` after using Vim search (`*` & `#`) which enable all search options --- crates/search/src/buffer_search.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs index 75f31e681970a2732a7c4abbff93c322c7ad4ad3..748662abf3a44685ec6380d272e261b4b5068717 100644 --- a/crates/search/src/buffer_search.rs +++ b/crates/search/src/buffer_search.rs @@ -814,7 +814,10 @@ impl BufferSearchBar { self.configured_options = SearchOptions::from_settings(&EditorSettings::get_global(cx).search); - if self.dismissed && self.configured_options != self.default_options { + if self.dismissed + && (self.configured_options != self.default_options + || self.configured_options != self.search_options) + { self.search_options = self.configured_options; self.default_options = self.configured_options; }