mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-28 01:07:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Get worktree randomized test passing

Browse source 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Max Brunsfeld 2021-04-19 11:59:22 -07:00
parent 122926dcde
commit 3e93fb9459
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
zed/src/worktree.rs
View file

@ -258,10 +258,10 @@ impl Snapshot {
} }
fn remove_path(&mut self, path: &Path) { fn remove_path(&mut self, path: &Path) {
if let Some(parent_path) = path.parent() { if let Some(mut parent_entry) = path.parent().and_then(|p| self.entry_for_path(p).cloned())
{
let mut edits = Vec::new(); let mut edits = Vec::new();
let mut parent_entry = self.entry_for_path(parent_path).unwrap().clone();
let parent_inode = parent_entry.inode(); let parent_inode = parent_entry.inode();
let mut entry_inode = None; let mut entry_inode = None;
if let Entry::Dir { children, .. } = &mut parent_entry { if let Entry::Dir { children, .. } = &mut parent_entry {
@ -278,7 +278,6 @@ impl Snapshot {
entry_inode = None; entry_inode = None;
} }
dbg!(&children, &new_children, entry_inode, parent_inode);
*children = new_children.into(); *children = new_children.into();
edits.push(Edit::Insert(parent_entry)); edits.push(Edit::Insert(parent_entry));
} else { } else {
@ -286,17 +285,16 @@ impl Snapshot {
} }
if let Some(entry_inode) = entry_inode { if let Some(entry_inode) = entry_inode {
let entry = self.entries.get(&entry_inode).unwrap();
// Recursively remove the orphaned nodes' descendants. // Recursively remove the orphaned nodes' descendants.
let mut descendant_stack = Vec::new(); let mut descendant_stack = Vec::new();
if entry.parent() == Some(parent_inode) { descendant_stack.push((entry_inode, parent_inode));
descendant_stack.push(entry_inode); while let Some((inode, parent_inode)) = descendant_stack.pop() {
while let Some(inode) = descendant_stack.pop() {
if let Some(entry) = self.entries.get(&inode) { if let Some(entry) = self.entries.get(&inode) {
if entry.parent() == Some(parent_inode) {
edits.push(Edit::Remove(inode)); edits.push(Edit::Remove(inode));
if let Entry::Dir { children, .. } = entry { if let Entry::Dir { children, .. } = entry {
descendant_stack.extend(children.iter().map(|c| c.0)); descendant_stack
.extend(children.iter().map(|c| (c.0, entry.inode())));
} }
} }
} }
@ -696,7 +694,6 @@ impl BackgroundScanner {
continue; continue;
} }
}; };
// dbg!(&path, &relative_path, snapshot.entries.items());
while paths.peek().map_or(false, |p| p.starts_with(&path)) { while paths.peek().map_or(false, |p| p.starts_with(&path)) {
paths.next(); paths.next();
@ -706,13 +703,11 @@ impl BackgroundScanner {
match self.fs_entry_for_path(&snapshot.path, &path) { match self.fs_entry_for_path(&snapshot.path, &path) {
Ok(Some((fs_entry, ignore))) => { Ok(Some((fs_entry, ignore))) => {
// snapshot.remove_entry(fs_entry.inode());
let mut edits = Vec::new(); let mut edits = Vec::new();
edits.push(Edit::Insert(fs_entry.clone())); edits.push(Edit::Insert(fs_entry.clone()));
if let Some(parent) = fs_entry.parent() { if let Some(parent) = fs_entry.parent() {
let mut parent_entry = snapshot.entries.get(&parent).unwrap().clone(); let mut parent_entry = snapshot.entries.get(&parent).unwrap().clone();
if let Entry::Dir { children, .. } = &mut parent_entry { if let Entry::Dir { children, .. } = &mut parent_entry {
if !children.iter().any(|c| c.0 == fs_entry.inode()) {
let name = Arc::from(path.file_name().unwrap()); let name = Arc::from(path.file_name().unwrap());
*children = children *children = children
.into_iter() .into_iter()
@ -721,7 +716,6 @@ impl BackgroundScanner {
.collect::<Vec<_>>() .collect::<Vec<_>>()
.into(); .into();
edits.push(Edit::Insert(parent_entry)); edits.push(Edit::Insert(parent_entry));
}
} else { } else {
unreachable!(); unreachable!();
} }
@ -1111,7 +1105,6 @@ mod tests {
notify_tx, notify_tx,
); );
new_scanner.scan_dirs().unwrap(); new_scanner.scan_dirs().unwrap();
dbg!(scanner.snapshot().entries.items());
assert_eq!(scanner.snapshot().to_vec(), new_scanner.snapshot().to_vec()); assert_eq!(scanner.snapshot().to_vec(), new_scanner.snapshot().to_vec());
} }
} }