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

Change folder styling from a reduce over all child files to a simple 'always modified'

Browse source 
Remove git status from tab titles
This commit is contained in:
Mikayla Maki 2023-05-15 09:41:56 -07:00
parent 17f138906e
commit 2b18975cdc
No known key found for this signature in database
2 changed files with 10 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ use std::{
time::{Duration, SystemTime},
};
use sum_tree::{Bias, Edit, SeekTarget, SumTree, TreeMap, TreeSet};
use util::{paths::HOME, ResultExt, TakeUntilExt, TryFutureExt};
use util::{paths::HOME, ResultExt, TryFutureExt};
#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord)]
pub struct WorktreeId(usize);
@ -187,20 +187,12 @@ impl RepositoryEntry {
self.worktree_statuses
.iter_from(&repo_path)
.take_while(|(key, _)| key.starts_with(&repo_path))
.map(|(_, status)| status)
// Short circut once we've found the highest level
.take_until(|status| status == &&GitFileStatus::Conflict)
.reduce(
|status_first, status_second| match (status_first, status_second) {
(GitFileStatus::Conflict, _) | (_, GitFileStatus::Conflict) => {
&GitFileStatus::Conflict
}
(GitFileStatus::Modified, _) | (_, GitFileStatus::Modified) => {
&GitFileStatus::Modified
}
_ => &GitFileStatus::Added,
},
)
.map(|(path, status)| if path == &repo_path {
status
} else {
&GitFileStatus::Modified
})
.next()
.copied()
})
}
@ -4170,15 +4162,13 @@ mod tests {
tree.flush_fs_events(cx).await;
dbg!(git_status(&repo));
git_status(&repo);
// Check that non-repo behavior is tracked
tree.read_with(cx, |tree, _cx| {
let snapshot = tree.snapshot();
let (_, repo) = snapshot.repository_entries.iter().next().unwrap();
dbg!(&repo.worktree_statuses);
assert_eq!(repo.worktree_statuses.iter().count(), 0);
assert_eq!(repo.worktree_statuses.get(&Path::new(A_TXT).into()), None);
assert_eq!(repo.worktree_statuses.get(&Path::new(B_TXT).into()), None);