feat: filter settings (#2289)

* filter settings * settings filter matches
lapce · Mar 28, 2023 · 8ebbbe2 · 8ebbbe2
1 parent 401b6c7
commit 8ebbbe2
Show file tree

Hide file tree

Showing 5 changed files with 218 additions and 26 deletions.
diff --git a/lapce-data/src/data.rs b/lapce-data/src/data.rs
@@ -869,6 +869,13 @@ impl LapceTabData {
             &config,
             event_sink.clone(),
         );
+        main_split.add_editor(
+            settings.filter_editor_id,
+            None,
+            LocalBufferKind::SettingsFilter,
+            &config,
+            event_sink.clone(),
+        );
         main_split.add_editor(
             rename.view_id,
             None,

diff --git a/lapce-data/src/document.rs b/lapce-data/src/document.rs
@@ -151,6 +151,8 @@ pub enum LocalBufferKind {
     Rename,
     /// Search buffer in plugin panel
     PluginSearch,
+    /// Settings filter in settings panel
+    SettingsFilter,
     /// Source Control branch filter in the branch list
     BranchesFilter,
 }
@@ -192,6 +194,7 @@ impl BufferContent {
                 | LocalBufferKind::BranchesFilter
                 | LocalBufferKind::FilePicker
                 | LocalBufferKind::Settings
+                | LocalBufferKind::SettingsFilter
                 | LocalBufferKind::Keymap
                 | LocalBufferKind::PathName
                 | LocalBufferKind::PluginSearch
@@ -213,6 +216,7 @@ impl BufferContent {
                 | LocalBufferKind::Palette
                 | LocalBufferKind::FilePicker
                 | LocalBufferKind::Settings
+                | LocalBufferKind::SettingsFilter
                 | LocalBufferKind::Keymap
                 | LocalBufferKind::PathName
                 | LocalBufferKind::PluginSearch
@@ -1023,6 +1027,7 @@ impl Document {
                     LocalBufferKind::PluginSearch => {}
                     LocalBufferKind::SourceControl => {}
                     LocalBufferKind::BranchesFilter => {}
+                    LocalBufferKind::SettingsFilter => {}
                     LocalBufferKind::Empty => {}
                     LocalBufferKind::Rename => {}
                     LocalBufferKind::Palette => {

diff --git a/lapce-data/src/settings.rs b/lapce-data/src/settings.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use druid::{Command, Env, EventCtx, Modifiers, Target, WidgetId};
+use indexmap::IndexMap;
 use lapce_core::{
     command::{EditCommand, FocusCommand, MoveCommand},
     mode::Mode,
@@ -47,6 +48,11 @@ pub struct LapceSettingsPanelData {
     pub settings_widget_id: WidgetId,
     pub settings_view_id: WidgetId,
     pub settings_split_id: WidgetId,
+    pub settings_sections: IndexMap<LapceSettingsKind, String>,
+    pub plugin_section: String,
+
+    pub filter_editor_id: WidgetId,
+    pub filter_matches: IndexMap<String, usize>,
 
     /// Mapping of setting key to dropdown data for that key
     pub dropdown_data:
@@ -91,6 +97,14 @@ impl KeyPressFocus for LapceSettingsPanelData {
 
 impl LapceSettingsPanelData {
     pub fn new() -> Self {
+        let settings_sections = IndexMap::from([
+            (LapceSettingsKind::Core, "Core Settings".to_string()),
+            (LapceSettingsKind::UI, "UI Settings".to_string()),
+            (LapceSettingsKind::Editor, "Editor Settings".to_string()),
+            (LapceSettingsKind::Terminal, "Terminal Settings".to_string()),
+            (LapceSettingsKind::Theme, "Theme Settings".to_string()),
+            (LapceSettingsKind::Keymap, "Keybindings".to_string()),
+        ]);
         Self {
             panel_widget_id: WidgetId::next(),
             keymap_widget_id: WidgetId::next(),
@@ -99,10 +113,17 @@ impl LapceSettingsPanelData {
             settings_widget_id: WidgetId::next(),
             settings_view_id: WidgetId::next(),
             settings_split_id: WidgetId::next(),
-
+            filter_editor_id: WidgetId::next(),
             dropdown_data: im::HashMap::new(),
+            filter_matches: IndexMap::new(),
+            settings_sections,
+            plugin_section: String::from("Plugin Settings"),
         }
     }
+
+    pub fn update_matches(&mut self, key: String, count: usize) {
+        self.filter_matches.insert(key, count);
+    }
 }
 
 impl Default for LapceSettingsPanelData {

diff --git a/lapce-ui/src/editor/view.rs b/lapce-ui/src/editor/view.rs
@@ -179,6 +179,7 @@ impl LapceEditorView {
                 LocalBufferKind::Settings => {}
                 LocalBufferKind::PluginSearch => {}
                 LocalBufferKind::BranchesFilter => {}
+                LocalBufferKind::SettingsFilter => {}
                 LocalBufferKind::Palette => {
                     data.focus_area = FocusArea::Palette;
                 }