mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-15 14:47:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Exclude ignored opened buffers from search

Browse source
This commit is contained in:
Kirill Bulatov 2023-11-15 16:36:00 +02:00
parent ce2cfc6035
commit cafeba103b
2 changed files with 70 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/project/src/project.rs
View file

@ -5570,8 +5570,16 @@ impl Project {
.iter()
.filter_map(|(_, b)| {
let buffer = b.upgrade(cx)?;
let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
if let Some(path) = snapshot.file().map(|file| file.path()) {
let (is_ignored, snapshot) = buffer.update(cx, |buffer, cx| {
let is_ignored = buffer
.project_path(cx)
.and_then(|path| self.entry_for_path(&path, cx))
.map_or(false, |entry| entry.is_ignored);
(is_ignored, buffer.snapshot())
});
if is_ignored && !query.include_ignored() {
return None;
} else if let Some(path) = snapshot.file().map(|file| file.path()) {
Some((path.clone(), (buffer, snapshot)))
} else {
unnamed_files.push(buffer);

127
crates/project/src/worktree_tests.rs
View file

@ -7,7 +7,7 @@ use anyhow::Result;
use client::Client;
use fs::{repository::GitFileStatus, FakeFs, Fs, RealFs, RemoveOptions};
use git::GITIGNORE;
use gpui::{executor::Deterministic, ModelContext, ModelHandle, Task, TestAppContext};
use gpui::{executor::Deterministic, ModelContext, Task, TestAppContext};
use parking_lot::Mutex;
use postage::stream::Stream;
use pretty_assertions::assert_eq;
@ -880,14 +880,11 @@ async fn test_write_file(cx: &mut TestAppContext) {
}
#[gpui::test]
async fn test_ignore_inclusions_and_exclusions(cx: &mut TestAppContext) {
async fn test_ignore_exclusions(cx: &mut TestAppContext) {
let dir = temp_tree(json!({
".git": {
"index": "blah"
},
".gitignore": "**/target\n/node_modules\n",
"target": {
"index2": "blah2"
"index": "blah2"
},
"node_modules": {
".DS_Store": "",
@ -932,24 +929,21 @@ async fn test_ignore_inclusions_and_exclusions(cx: &mut TestAppContext) {
cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
.await;
tree.flush_fs_events(cx).await;
check_worktree_entries(
&tree,
&[
"src/foo/foo.rs",
"src/foo/another.rs",
// TODO kb
// "node_modules/.DS_Store",
// "src/.DS_Store",
// ".DS_Store",
],
&[
".git/index",
"target/index2",
"node_modules/prettier/package.json",
],
&["src/lib.rs", "src/bar/bar.rs", ".gitignore"],
cx,
);
tree.read_with(cx, |tree, _| {
check_worktree_entries(
tree,
&[
"src/foo/foo.rs",
"src/foo/another.rs",
// TODO kb
// "node_modules/.DS_Store",
// "src/.DS_Store",
// ".DS_Store",
],
&["target/index", "node_modules/prettier/package.json"],
&["src/lib.rs", "src/bar/bar.rs", ".gitignore"],
)
});
cx.update(|cx| {
cx.update_global::<SettingsStore, _, _>(|store, cx| {
@ -960,24 +954,25 @@ async fn test_ignore_inclusions_and_exclusions(cx: &mut TestAppContext) {
});
tree.flush_fs_events(cx).await;
cx.foreground().run_until_parked();
check_worktree_entries(
&tree,
&[
"node_modules/prettier/package.json",
"node_modules/.DS_Store",
],
&[".git/index", "target/index2"],
&[
".gitignore",
"src/lib.rs",
"src/bar/bar.rs",
"src/foo/foo.rs",
"src/foo/another.rs",
"src/.DS_Store",
".DS_Store",
],
cx,
);
tree.read_with(cx, |tree, _| {
check_worktree_entries(
tree,
&[
"node_modules/prettier/package.json",
"node_modules/.DS_Store",
],
&["target/index"],
&[
".gitignore",
"src/lib.rs",
"src/bar/bar.rs",
"src/foo/foo.rs",
"src/foo/another.rs",
"src/.DS_Store",
".DS_Store",
],
)
});
}
#[gpui::test(iterations = 30)]
@ -2243,34 +2238,32 @@ fn git_status(repo: &git2::Repository) -> collections::HashMap<String, git2::Sta
.collect()
}
#[track_caller]
fn check_worktree_entries(
tree: &ModelHandle<Worktree>,
tree: &Worktree,
expected_excluded_paths: &[&str],
expected_ignored_paths: &[&str],
expected_tracked_paths: &[&str],
cx: &mut TestAppContext,
) {
tree.read_with(cx, |tree, _| {
for path in expected_excluded_paths {
let entry = tree.entry_for_path(path);
assert!(
entry.is_none(),
"expected path '{path}' to be excluded, but got entry: {entry:?}",
);
}
for path in expected_ignored_paths {
let entry = tree.entry_for_path(path).unwrap();
assert!(
entry.is_ignored,
"expected path '{path}' to be ignored, but got entry: {entry:?}",
);
}
for path in expected_tracked_paths {
let entry = tree.entry_for_path(path).unwrap();
assert!(
!entry.is_ignored,
"expected path '{path}' to be tracked, but got entry: {entry:?}",
);
}
});
for path in expected_excluded_paths {
let entry = tree.entry_for_path(path);
assert!(
entry.is_none(),
"expected path '{path}' to be excluded, but got entry: {entry:?}",
);
}
for path in expected_ignored_paths {
let entry = tree.entry_for_path(path).unwrap();
assert!(
entry.is_ignored,
"expected path '{path}' to be ignored, but got entry: {entry:?}",
);
}
for path in expected_tracked_paths {
let entry = tree.entry_for_path(path).unwrap();
assert!(
!entry.is_ignored,
"expected path '{path}' to be tracked, but got entry: {entry:?}",
);
}
}