Add Include Ignored Toggle to File Finder and implement support for SearchOption flags on other Pickers

crates/file_finder/Cargo.toml

@@ -22,6 +22,7 @@ itertools = "0.11"
 menu.workspace = true
 picker.workspace = true
 project.workspace = true
+search.workspace = true
 text.workspace = true
 theme.workspace = true
 ui.workspace = true

crates/file_finder/src/file_finder.rs

@@ -10,8 +10,10 @@ use gpui::{
     ViewContext, VisualContext, WeakView,
 };
 use itertools::Itertools;
+use picker::SupportedSearchOptions;
 use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, Project, ProjectPath, WorktreeId};
+use search::SearchOptions;
 use std::{
     cmp,
     path::{Path, PathBuf},
@@ -149,6 +151,8 @@ pub struct FileFinderDelegate {
     has_changed_selected_index: bool,
     cancel_flag: Arc<AtomicBool>,
     history_items: Vec<FoundPath>,
+    search_options: SearchOptions,
+    supported_search_options: SupportedSearchOptions,
 }
 
 /// Use a custom ordering for file finder: the regular one
@@ -404,6 +408,8 @@ impl FileFinderDelegate {
             selected_index: 0,
             cancel_flag: Arc::new(AtomicBool::new(false)),
             history_items,
+            search_options: SearchOptions::NONE,
+            supported_search_options: SupportedSearchOptions::new(true),
         }
     }
 
@@ -442,9 +448,13 @@ impl FileFinderDelegate {
                 let worktree = worktree.read(cx);
                 PathMatchCandidateSet {
                     snapshot: worktree.snapshot(),
-                    include_ignored: worktree
-                        .root_entry()
-                        .map_or(false, |entry| entry.is_ignored),
+                    include_ignored: worktree.root_entry().map_or(false, |entry| {
+                        if self.search_options.contains(SearchOptions::INCLUDE_IGNORED) {
+                            true
+                        } else {
+                            entry.is_ignored
+                        }
+                    }),
                     include_root_name,
                 }
             })
@@ -695,6 +705,18 @@ impl FileFinderDelegate {
 impl PickerDelegate for FileFinderDelegate {
     type ListItem = ListItem;
 
+    fn supported_search_options(&self) -> SupportedSearchOptions {
+        self.supported_search_options
+    }
+
+    fn search_options(&self) -> SearchOptions {
+        self.search_options
+    }
+
+    fn toggle_include_ignored(&mut self) {
+        self.search_options.toggle(SearchOptions::INCLUDE_IGNORED);
+    }
+
     fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
         "Search project files...".into()
     }

crates/picker/Cargo.toml

@@ -17,6 +17,7 @@ anyhow.workspace = true
 editor.workspace = true
 gpui.workspace = true
 menu.workspace = true
+search.workspace = true
 ui.workspace = true
 workspace.workspace = true
 

crates/picker/src/picker.rs

@@ -6,6 +6,7 @@ use gpui::{
     UniformListScrollHandle, View, ViewContext, WindowContext,
 };
 use head::Head;
+use search::SearchOptions;
 use std::{sync::Arc, time::Duration};
 use ui::{prelude::*, v_flex, Color, Divider, Label, ListItem, ListItemSpacing};
 use workspace::ModalView;
@@ -38,9 +39,33 @@ pub struct Picker<D: PickerDelegate> {
     is_modal: bool,
 }
 
+#[derive(Copy, Clone)]
+pub struct SupportedSearchOptions {
+    include_ignored: bool,
+}
+
+impl SupportedSearchOptions {
+    pub fn new(include_ignored: bool) -> Self {
+        Self { include_ignored }
+    }
+
+    pub fn default() -> Self {
+        Self::new(false)
+    }
+}
+
 pub trait PickerDelegate: Sized + 'static {
     type ListItem: IntoElement;
 
+    fn search_options(&self) -> SearchOptions {
+        SearchOptions::NONE
+    }
+    fn supported_search_options(&self) -> SupportedSearchOptions {
+        SupportedSearchOptions::default()
+    }
+
+    fn toggle_include_ignored(&mut self) {}
+
     fn match_count(&self) -> usize;
     fn selected_index(&self) -> usize;
     fn separators_after_indices(&self) -> Vec<usize> {
@@ -430,6 +455,25 @@ impl<D: PickerDelegate> Picker<D> {
                 .into_any_element(),
         }
     }
+
+    fn render_search_buttons(&self, cx: &mut ViewContext<Self>) -> Vec<impl IntoElement> {
+        let mut buttons = vec![];
+        if self.delegate.supported_search_options().include_ignored {
+            buttons.push(
+                SearchOptions::INCLUDE_IGNORED.as_button(
+                    self.delegate
+                        .search_options()
+                        .contains(SearchOptions::INCLUDE_IGNORED),
+                    cx.listener(|this, _, cx| {
+                        this.delegate.toggle_include_ignored();
+                        cx.notify();
+                        this.update_matches(this.query(cx).to_string(), cx);
+                    }),
+                ),
+            );
+        }
+        buttons
+    }
 }
 
 impl<D: PickerDelegate> EventEmitter<DismissEvent> for Picker<D> {}
@@ -463,7 +507,8 @@ impl<D: PickerDelegate> Render for Picker<D> {
                             .flex_none()
                             .h_9()
                             .px_4()
-                            .child(editor.clone()),
+                            .child(editor.clone())
+                            .children(self.render_search_buttons(cx)),
                     )
                     .child(Divider::horizontal()),
                 Head::Empty(empty_head) => div().child(empty_head.clone()),