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

Properly handle ignored files in the file finder (#31542)

Browse source 
Follow-up of https://github.com/zed-industries/zed/pull/31457

Add a button and also allows to use `search::ToggleIncludeIgnored`
action in the file finder to toggle whether to show gitignored files or
not.
By default, returns back to the gitignored treatment before the PR
above.


![image](https://github.com/user-attachments/assets/c3117488-9c51-4b34-b630-42098fe14b4d)


Release Notes:

- Improved file finder to include indexed gitignored files in its search
results
This commit is contained in:
Kirill Bulatov 2025-05-27 21:34:28 +03:00 • committed by GitHub
parent 5b6b911946
commit 94c006236e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 229 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

106
crates/file_finder/src/file_finder_tests.rs
View file

@ -1,9 +1,10 @@
use std::{assert_eq, future::IntoFuture, path::Path, time::Duration};
use std::{future::IntoFuture, path::Path, time::Duration};
use super::*;
use editor::Editor;
use gpui::{Entity, TestAppContext, VisualTestContext};
use menu::{Confirm, SelectNext, SelectPrevious};
use pretty_assertions::assert_eq;
use project::{FS_WATCH_LATENCY, RemoveOptions};
use serde_json::json;
use util::path;
@ -646,6 +647,31 @@ async fn test_ignored_root(cx: &mut TestAppContext) {
.await;
let (picker, workspace, cx) = build_find_picker(project, cx);
picker
.update_in(cx, |picker, window, cx| {
picker
.delegate
.spawn_search(test_path_position("hi"), window, cx)
})
.await;
picker.update(cx, |picker, _| {
let matches = collect_search_matches(picker);
assert_eq!(matches.history.len(), 0);
assert_eq!(
matches.search,
vec![
PathBuf::from("ignored-root/hi"),
PathBuf::from("tracked-root/hi"),
PathBuf::from("ignored-root/hiccup"),
PathBuf::from("tracked-root/hiccup"),
PathBuf::from("ignored-root/height"),
PathBuf::from("ignored-root/happiness"),
PathBuf::from("tracked-root/happiness"),
],
"All ignored files that were indexed are found for default ignored mode"
);
});
cx.dispatch_action(ToggleIncludeIgnored);
picker
.update_in(cx, |picker, window, cx| {
picker
@ -668,7 +694,29 @@ async fn test_ignored_root(cx: &mut TestAppContext) {
PathBuf::from("ignored-root/happiness"),
PathBuf::from("tracked-root/happiness"),
],
"All ignored files that were indexed are found"
"All ignored files should be found, for the toggled on ignored mode"
);
});
picker
.update_in(cx, |picker, window, cx| {
picker.delegate.include_ignored = Some(false);
picker
.delegate
.spawn_search(test_path_position("hi"), window, cx)
})
.await;
picker.update(cx, |picker, _| {
let matches = collect_search_matches(picker);
assert_eq!(matches.history.len(), 0);
assert_eq!(
matches.search,
vec![
PathBuf::from("tracked-root/hi"),
PathBuf::from("tracked-root/hiccup"),
PathBuf::from("tracked-root/happiness"),
],
"Only non-ignored files should be found for the turned off ignored mode"
);
});
@ -686,6 +734,7 @@ async fn test_ignored_root(cx: &mut TestAppContext) {
})
.await
.unwrap();
cx.run_until_parked();
workspace
.update_in(cx, |workspace, window, cx| {
workspace.active_pane().update(cx, |pane, cx| {
@ -695,8 +744,37 @@ async fn test_ignored_root(cx: &mut TestAppContext) {
})
.await
.unwrap();
cx.run_until_parked();
picker
.update_in(cx, |picker, window, cx| {
picker.delegate.include_ignored = None;
picker
.delegate
.spawn_search(test_path_position("hi"), window, cx)
})
.await;
picker.update(cx, |picker, _| {
let matches = collect_search_matches(picker);
assert_eq!(matches.history.len(), 0);
assert_eq!(
matches.search,
vec![
PathBuf::from("ignored-root/hi"),
PathBuf::from("tracked-root/hi"),
PathBuf::from("ignored-root/hiccup"),
PathBuf::from("tracked-root/hiccup"),
PathBuf::from("ignored-root/height"),
PathBuf::from("ignored-root/happiness"),
PathBuf::from("tracked-root/happiness"),
],
"Only for the worktree with the ignored root, all indexed ignored files are found in the auto ignored mode"
);
});
picker
.update_in(cx, |picker, window, cx| {
picker.delegate.include_ignored = Some(true);
picker
.delegate
.spawn_search(test_path_position("hi"), window, cx)
@ -719,7 +797,29 @@ async fn test_ignored_root(cx: &mut TestAppContext) {
PathBuf::from("ignored-root/happiness"),
PathBuf::from("tracked-root/happiness"),
],
"All ignored files that were indexed are found"
"All ignored files that were indexed are found in the turned on ignored mode"
);
});
picker
.update_in(cx, |picker, window, cx| {
picker.delegate.include_ignored = Some(false);
picker
.delegate
.spawn_search(test_path_position("hi"), window, cx)
})
.await;
picker.update(cx, |picker, _| {
let matches = collect_search_matches(picker);
assert_eq!(matches.history.len(), 0);
assert_eq!(
matches.search,
vec![
PathBuf::from("tracked-root/hi"),
PathBuf::from("tracked-root/hiccup"),
PathBuf::from("tracked-root/happiness"),
],
"Only non-ignored files should be found for the turned off ignored mode"
);
});
}