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

dont update search modes upon dismiss

Browse source
This commit is contained in:
tidely 2025-08-26 21:33:28 +03:00
parent 0e575b2809
commit 879b552175
1 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/search/src/buffer_search.rs
View file

@ -111,7 +111,6 @@ pub struct BufferSearchBar {
pending_search: Option<Task<()>>, pending_search: Option<Task<()>>,
search_options: SearchOptions, search_options: SearchOptions,
default_options: SearchOptions, default_options: SearchOptions,
configured_options: SearchOptions,
query_error: Option<String>, query_error: Option<String>,
dismissed: bool, dismissed: bool,
search_history: SearchHistory, search_history: SearchHistory,
@ -653,7 +652,6 @@ impl BufferSearchBar {
active_match_index: None, active_match_index: None,
searchable_items_with_matches: Default::default(), searchable_items_with_matches: Default::default(),
default_options: search_options, default_options: search_options,
configured_options: search_options,
search_options, search_options,
pending_search: None, pending_search: None,
query_error: None, query_error: None,
@ -749,16 +747,6 @@ impl BufferSearchBar {
return false; return false;
}; };
self.configured_options =
SearchOptions::from_settings(&EditorSettings::get_global(cx).search);
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;
}
self.dismissed = false; self.dismissed = false;
self.adjust_query_regex_language(cx); self.adjust_query_regex_language(cx);
handle.search_bar_visibility_changed(true, window, cx); handle.search_bar_visibility_changed(true, window, cx);
@ -2750,11 +2738,6 @@ mod tests {
"Search bar should be present and visible" "Search bar should be present and visible"
); );
search_bar.deploy(&deploy, window, cx); search_bar.deploy(&deploy, window, cx);
assert_eq!(
search_bar.configured_options,
SearchOptions::NONE,
"Should have configured search options matching the settings"
);
assert_eq!( assert_eq!(
search_bar.search_options, search_bar.search_options,
SearchOptions::WHOLE_WORD, SearchOptions::WHOLE_WORD,
@ -2800,11 +2783,6 @@ mod tests {
); );
search_bar.deploy(&deploy, window, cx); search_bar.deploy(&deploy, window, cx);
assert_eq!(
search_bar.configured_options,
SearchOptions::CASE_SENSITIVE,
"Should have configured search options matching the settings"
);
assert_eq!( assert_eq!(
search_bar.search_options, search_bar.search_options,
SearchOptions::REGEX | SearchOptions::WHOLE_WORD, SearchOptions::REGEX | SearchOptions::WHOLE_WORD,