oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1223 from zed-industries/update-metadata-when-worktrees-are-removed

Browse Source 
Update project metadata when releasing a worktree's weak handle
This commit is contained in:
Antonio Scandurra
2022-06-22 10:50:44 +02:00
committed by GitHub
parent 484e98c0bb 2f09a4af16
commit f09a997d2d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/project/src/project.rs
+7 -6
View File
@@ -4088,16 +4088,17 @@ impl Project {
self.worktrees self.worktrees
.push(WorktreeHandle::Strong(worktree.clone())); .push(WorktreeHandle::Strong(worktree.clone()));
} else { } else {
cx.observe_release(&worktree, |this, _, cx| {
this.worktrees
.retain(|worktree| worktree.upgrade(cx).is_some());
cx.notify();
})
.detach();
self.worktrees self.worktrees
.push(WorktreeHandle::Weak(worktree.downgrade())); .push(WorktreeHandle::Weak(worktree.downgrade()));
} }
self.metadata_changed(true, cx); self.metadata_changed(true, cx);
cx.observe_release(&worktree, |this, worktree, cx| {
this.remove_worktree(worktree.id(), cx);
cx.notify();
})
.detach();
cx.emit(Event::WorktreeAdded); cx.emit(Event::WorktreeAdded);
cx.notify(); cx.notify();
} }