mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-27 16:57:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

wip - gitignore handling on rescan

Browse source
This commit is contained in:
Max Brunsfeld 2021-04-21 12:30:30 -07:00
parent 8e0ca2056e
commit 427930cd8a
1 changed files with 70 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
zed/src/worktree.rs
View file

@ -94,6 +94,21 @@ impl Worktree {
}
}
pub fn next_scan_complete(&self) -> impl Future<Output = ()> {
let mut scan_state_rx = self.scan_state.1.clone();
let mut did_scan = matches!(*scan_state_rx.borrow(), ScanState::Scanning);
async move {
loop {
if let ScanState::Scanning = *scan_state_rx.borrow() {
did_scan = true;
} else if did_scan {
break;
}
scan_state_rx.recv().await;
}
}
}
fn observe_scan_state(&mut self, scan_state: ScanState, ctx: &mut ModelContext<Self>) {
let _ = self.scan_state.0.blocking_send(scan_state);
self.poll_entries(ctx);
@ -1081,6 +1096,53 @@ mod tests {
});
}
#[test]
fn test_rescan_with_gitignore() {
App::test_async((), |mut app| async move {
let dir = temp_tree(json!({
".git": {},
".gitignore": "ignored-dir\n",
"tracked-dir": {
"tracked-file1": "tracked contents",
},
"ignored-dir": {
"ignored-file1": "ignored contents",
}
}));
let tree = app.add_model(|ctx| Worktree::new(dir.path(), ctx));
app.read(|ctx| tree.read(ctx).scan_complete()).await;
app.read(|ctx| {
let tree = tree.read(ctx);
assert!(!tree
.entry_for_path("tracked-dir/tracked-file1")
.unwrap()
.is_ignored());
assert!(tree
.entry_for_path("ignored-dir/ignored-file1")
.unwrap()
.is_ignored());
});
fs::write(dir.path().join("tracked-dir/tracked-file2"), "").unwrap();
fs::write(dir.path().join("ignored-dir/ignored-file2"), "").unwrap();
// tree.condition(&app, move |_, ctx| file2.path(ctx) == Path::new("d/file2"))
// .await;
app.read(|ctx| tree.read(ctx).scan_complete()).await;
app.read(|ctx| {
let tree = tree.read(ctx);
assert!(!tree
.entry_for_path("tracked-dir/tracked-file2")
.unwrap()
.is_ignored());
assert!(tree
.entry_for_path("ignored-dir/ignored-file2")
.unwrap()
.is_ignored());
});
});
}
#[test]
fn test_random() {
let iterations = env::var("ITERATIONS")
@ -1268,6 +1330,14 @@ mod tests {
.collect()
}
impl Entry {
fn is_ignored(&self) -> bool {
match self {
Entry::Dir { is_ignored, .. } | Entry::File { is_ignored, .. } => *is_ignored,
}
}
}
impl Snapshot {
fn check_invariants(&self) {
for entry in self.entries.items() {