Refactor SearchSettings (#17550)

Related to #17179. Simplify handling of search settings since there is no requirement to watch for settings.json changes and update search panels while they are opened. Attn: @SomeoneToIgnore Per our discussion. Ran test on search crate. Ran `cargo fmt`. Release Notes: - N/A

thataboy committed 2 years ago

Commit 894866d1 parent 63188b63 files · +6 −32Browse files

Unified · Split

3 files

crates/editor/src/editor_settings.rs +0 −21
crates/search/src/buffer_search.rs +6 −9
crates/search/src/search.rs +0 −2

crates/editor/src/editor_settings.rs+0−21

@@ -171,27 +171,6 @@ pub struct SearchSettings { · 170 unmodified lines
171	pub regex: bool,	171	pub regex: bool,
172	}	172	}
173		173
174	#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
175	pub struct SearchSettingsContent {
176	pub whole_word: Option<bool>,
177	pub case_sensitive: Option<bool>,
178	pub include_ignored: Option<bool>,
179	pub regex: Option<bool>,
180	}
181
182	impl Settings for SearchSettings {
183	const KEY: Option<&'static str> = Some("search");
184
185	type FileContent = SearchSettingsContent;
186
187	fn load(
188	sources: SettingsSources<Self::FileContent>,
189	_: &mut gpui::AppContext,
190	) -> anyhow::Result<Self> {
191	sources.json_merge()
192	}
193	}
194
195	#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]	174	#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
196	pub struct EditorSettingsContent {	175	pub struct EditorSettingsContent {
197	/// Whether the cursor blinks in the editor.	176	/// Whether the cursor blinks in the editor.

crates/search/src/buffer_search.rs+6−9

 use collections::HashMap;
 use editor::{
     actions::{Tab, TabPrev},
-    DisplayPoint, Editor, EditorElement, EditorSettings, EditorStyle, SearchSettings,
+    DisplayPoint, Editor, EditorElement, EditorSettings, EditorStyle,
 };
 use futures::channel::oneshot;
 use gpui::{
     search_history::{SearchHistory, SearchHistoryCursor},
 };
 use serde::Deserialize;
-use settings::{Settings, SettingsStore};
+use settings::Settings;
 use std::sync::Arc;
 use theme::ThemeSettings;
     scroll_handle: ScrollHandle,
     editor_scroll_handle: ScrollHandle,
     editor_needed_width: Pixels,
-    _subscriptions: Vec<Subscription>,
 }
 impl BufferSearchBar {
         cx.subscribe(&replacement_editor, Self::on_replacement_editor_event)
             .detach();
-        let search_options = SearchOptions::from_settings(&SearchSettings::get_global(cx));
+        let search_options = SearchOptions::from_settings(&EditorSettings::get_global(cx).search);
-        let settings_subscription = cx.observe_global::<SettingsStore>(move |this, cx| {
-            this.default_options = SearchOptions::from_settings(&SearchSettings::get_global(cx));
-        });
         Self {
             query_editor,
             scroll_handle: ScrollHandle::new(),
             editor_scroll_handle: ScrollHandle::new(),
             editor_needed_width: px(0.),
-            _subscriptions: vec![settings_subscription],
         }
     }
         let Some(handle) = self.active_searchable_item.as_ref() else {
             return false;
         };
+        self.default_options = SearchOptions::from_settings(&EditorSettings::get_global(cx).search);
         if self.default_options != self.search_options {
             self.search_options = self.default_options;
         }

crates/search/src/search.rs+0−2

 use gpui::{actions, Action, AppContext, IntoElement};
 use project::search::SearchQuery;
 pub use project_search::ProjectSearchView;
-use settings::Settings;
 use ui::{prelude::*, Tooltip};
 use ui::{ButtonStyle, IconButton};
 use workspace::notifications::NotificationId;
 pub(crate) mod search_bar;
 pub fn init(cx: &mut AppContext) {
-    SearchSettings::register(cx);
     menu::init();
     buffer_search::init(cx);
     project_search::init(cx);