mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-06 18:46:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Convert weak worktree handles into strong handles when sharing

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-03-02 18:07:32 +01:00 committed by Max Brunsfeld
parent 4b0300daea
commit 07120d47f9
2 changed files with 38 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
crates/project/src/project.rs
View file

@ -514,6 +514,7 @@ impl Project {
} = &mut this.client_state } = &mut this.client_state
{ {
*is_shared = true; *is_shared = true;
for open_buffer in this.opened_buffers.values_mut() { for open_buffer in this.opened_buffers.values_mut() {
match open_buffer { match open_buffer {
OpenBuffer::Strong(_) => {} OpenBuffer::Strong(_) => {}
@ -525,6 +526,18 @@ impl Project {
OpenBuffer::Loading(_) => unreachable!(), OpenBuffer::Loading(_) => unreachable!(),
} }
} }
for worktree_handle in this.worktrees.iter_mut() {
match worktree_handle {
WorktreeHandle::Strong(_) => {}
WorktreeHandle::Weak(worktree) => {
if let Some(worktree) = worktree.upgrade(cx) {
*worktree_handle = WorktreeHandle::Strong(worktree);
}
}
}
}
remote_id_rx remote_id_rx
.borrow() .borrow()
.ok_or_else(|| anyhow!("no project id")) .ok_or_else(|| anyhow!("no project id"))
@ -555,7 +568,7 @@ impl Project {
pub fn unshare(&self, cx: &mut ModelContext<Self>) -> Task<Result<()>> { pub fn unshare(&self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
let rpc = self.client.clone(); let rpc = self.client.clone();
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
let project_id = this.update(&mut cx, |this, _| { let project_id = this.update(&mut cx, |this, cx| {
if let ProjectClientState::Local { if let ProjectClientState::Local {
is_shared, is_shared,
remote_id_rx, remote_id_rx,
@ -563,15 +576,27 @@ impl Project {
} = &mut this.client_state } = &mut this.client_state
{ {
*is_shared = false; *is_shared = false;
for open_buffer in this.opened_buffers.values_mut() { for open_buffer in this.opened_buffers.values_mut() {
match open_buffer { match open_buffer {
OpenBuffer::Strong(buffer) => { OpenBuffer::Strong(buffer) => {
*open_buffer = OpenBuffer::Weak(buffer.downgrade()); *open_buffer = OpenBuffer::Weak(buffer.downgrade());
} }
OpenBuffer::Weak(_) => {} _ => {}
OpenBuffer::Loading(_) => unreachable!(),
} }
} }
for worktree_handle in this.worktrees.iter_mut() {
match worktree_handle {
WorktreeHandle::Strong(worktree) => {
if worktree.read(cx).is_weak() {
*worktree_handle = WorktreeHandle::Weak(worktree.downgrade());
}
}
_ => {}
}
}
remote_id_rx remote_id_rx
.borrow() .borrow()
.ok_or_else(|| anyhow!("no project id")) .ok_or_else(|| anyhow!("no project id"))
@ -2367,11 +2392,14 @@ impl Project {
.detach(); .detach();
} }
let push_weak_handle = { let push_strong_handle = {
let worktree = worktree.read(cx); let worktree = worktree.read(cx);
worktree.is_local() && worktree.is_weak() self.is_shared() || worktree.is_remote()
}; };
if push_weak_handle { if push_strong_handle {
self.worktrees
.push(WorktreeHandle::Strong(worktree.clone()));
} else {
cx.observe_release(&worktree, |this, cx| { cx.observe_release(&worktree, |this, cx| {
this.worktrees this.worktrees
.retain(|worktree| worktree.upgrade(cx).is_some()); .retain(|worktree| worktree.upgrade(cx).is_some());
@ -2380,9 +2408,6 @@ impl Project {
.detach(); .detach();
self.worktrees self.worktrees
.push(WorktreeHandle::Weak(worktree.downgrade())); .push(WorktreeHandle::Weak(worktree.downgrade()));
} else {
self.worktrees
.push(WorktreeHandle::Strong(worktree.clone()));
} }
cx.notify(); cx.notify();
} }

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

@ -345,6 +345,10 @@ impl Worktree {
matches!(self, Worktree::Local(_)) matches!(self, Worktree::Local(_))
} }
pub fn is_remote(&self) -> bool {
!self.is_local()
}
pub fn snapshot(&self) -> Snapshot { pub fn snapshot(&self) -> Snapshot {
match self { match self {
Worktree::Local(worktree) => worktree.snapshot().snapshot, Worktree::Local(worktree) => worktree.snapshot().snapshot,