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

Scan directories when they stop being ignored

Browse source
This commit is contained in:
Max Brunsfeld 2023-06-21 10:07:29 -07:00
parent bfc90f4502
commit 400e3cda32
2 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

44
crates/project/src/worktree.rs
View file

@ -3066,11 +3066,16 @@ impl BackgroundScanner {
let (scan_job_tx, scan_job_rx) = channel::unbounded(); let (scan_job_tx, scan_job_rx) = channel::unbounded();
let paths = self let paths = self
.reload_entries_for_paths(root_path, root_canonical_path, abs_paths, Some(scan_job_tx)) .reload_entries_for_paths(
root_path,
root_canonical_path,
abs_paths,
Some(scan_job_tx.clone()),
)
.await; .await;
self.scan_dirs(false, scan_job_rx).await;
self.update_ignore_statuses().await; self.update_ignore_statuses(scan_job_tx).await;
self.scan_dirs(false, scan_job_rx).await;
{ {
let mut state = self.state.lock(); let mut state = self.state.lock();
@ -3571,7 +3576,7 @@ impl BackgroundScanner {
Some(()) Some(())
} }
async fn update_ignore_statuses(&self) { async fn update_ignore_statuses(&self, scan_job_tx: Sender<ScanJob>) {
use futures::FutureExt as _; use futures::FutureExt as _;
let mut snapshot = self.state.lock().snapshot.clone(); let mut snapshot = self.state.lock().snapshot.clone();
@ -3619,6 +3624,7 @@ impl BackgroundScanner {
abs_path: parent_abs_path, abs_path: parent_abs_path,
ignore_stack, ignore_stack,
ignore_queue: ignore_queue_tx.clone(), ignore_queue: ignore_queue_tx.clone(),
scan_queue: scan_job_tx.clone(),
})) }))
.unwrap(); .unwrap();
} }
@ -3663,7 +3669,7 @@ impl BackgroundScanner {
let path = job.abs_path.strip_prefix(&snapshot.abs_path).unwrap(); let path = job.abs_path.strip_prefix(&snapshot.abs_path).unwrap();
for mut entry in snapshot.child_entries(path).cloned() { for mut entry in snapshot.child_entries(path).cloned() {
let was_ignored = entry.is_ignored; let was_ignored = entry.is_ignored;
let abs_path = snapshot.abs_path().join(&entry.path); let abs_path: Arc<Path> = snapshot.abs_path().join(&entry.path).into();
entry.is_ignored = ignore_stack.is_abs_path_ignored(&abs_path, entry.is_dir()); entry.is_ignored = ignore_stack.is_abs_path_ignored(&abs_path, entry.is_dir());
if entry.is_dir() { if entry.is_dir() {
let child_ignore_stack = if entry.is_ignored { let child_ignore_stack = if entry.is_ignored {
@ -3671,11 +3677,36 @@ impl BackgroundScanner {
} else { } else {
ignore_stack.clone() ignore_stack.clone()
}; };
// Scan any directories that were previously ignored and weren't
// previously scanned.
if was_ignored
&& !entry.is_ignored
&& !entry.is_external
&& entry.kind == EntryKind::PendingDir
{
job.scan_queue
.try_send(ScanJob {
abs_path: abs_path.clone(),
path: entry.path.clone(),
ignore_stack: child_ignore_stack.clone(),
scan_queue: job.scan_queue.clone(),
ancestor_inodes: self
.state
.lock()
.snapshot
.ancestor_inodes_for_path(&entry.path),
is_external: false,
})
.unwrap();
}
job.ignore_queue job.ignore_queue
.send(UpdateIgnoreStatusJob { .send(UpdateIgnoreStatusJob {
abs_path: abs_path.into(), abs_path: abs_path.clone(),
ignore_stack: child_ignore_stack, ignore_stack: child_ignore_stack,
ignore_queue: job.ignore_queue.clone(), ignore_queue: job.ignore_queue.clone(),
scan_queue: job.scan_queue.clone(),
}) })
.await .await
.unwrap(); .unwrap();
@ -3847,6 +3878,7 @@ struct UpdateIgnoreStatusJob {
abs_path: Arc<Path>, abs_path: Arc<Path>,
ignore_stack: Arc<IgnoreStack>, ignore_stack: Arc<IgnoreStack>,
ignore_queue: Sender<UpdateIgnoreStatusJob>, ignore_queue: Sender<UpdateIgnoreStatusJob>,
scan_queue: Sender<ScanJob>,
} }
pub trait WorktreeHandle { pub trait WorktreeHandle {

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

@ -644,6 +644,7 @@ async fn test_dirs_no_longer_ignored(cx: &mut TestAppContext) {
(Path::new("a/a.js"), false), (Path::new("a/a.js"), false),
(Path::new("b"), false), (Path::new("b"), false),
(Path::new("b/b.js"), false), (Path::new("b/b.js"), false),
// This directory is no longer ignored
(Path::new("node_modules"), false), (Path::new("node_modules"), false),
(Path::new("node_modules/c"), false), (Path::new("node_modules/c"), false),
(Path::new("node_modules/c/c.js"), false), (Path::new("node_modules/c/c.js"), false),
@ -660,7 +661,7 @@ async fn test_dirs_no_longer_ignored(cx: &mut TestAppContext) {
// Each of the newly-loaded directories is scanned only once. // Each of the newly-loaded directories is scanned only once.
let read_dir_count_3 = fs.read_dir_call_count(); let read_dir_count_3 = fs.read_dir_call_count();
assert_eq!(read_dir_count_3 - read_dir_count_2, 4); assert_eq!(read_dir_count_3 - read_dir_count_2, 2);
} }
#[gpui::test] #[gpui::test]