mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-27 04:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Send a CloseWorktree message when a shared Worktree is dropped

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-30 16:59:02 +02:00
parent 1d53d43d6f
commit ed9036f3fc
3 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
zed-rpc/proto/zed.proto
View file

@ -12,12 +12,13 @@ message Envelope {
ShareWorktreeResponse share_worktree_response = 7;
OpenWorktree open_worktree = 8;
OpenWorktreeResponse open_worktree_response = 9;
OpenBuffer open_buffer = 10;
OpenBufferResponse open_buffer_response = 11;
CloseBuffer close_buffer = 12;
UpdateBuffer update_buffer = 13;
AddGuest add_guest = 14;
RemoveGuest remove_guest = 15;
CloseWorktree close_worktree = 10;
OpenBuffer open_buffer = 11;
OpenBufferResponse open_buffer_response = 12;
CloseBuffer close_buffer = 13;
UpdateBuffer update_buffer = 14;
AddGuest add_guest = 15;
RemoveGuest remove_guest = 16;
}
}
@ -50,6 +51,10 @@ message OpenWorktreeResponse {
repeated Peer peers = 3;
}
message CloseWorktree {
uint64 worktree_id = 1;
}
message AddGuest {
uint64 worktree_id = 1;
Peer guest = 2;

1
zed-rpc/src/proto.rs
View file

@ -71,6 +71,7 @@ macro_rules! request_message {
request_message!(Auth, AuthResponse);
request_message!(ShareWorktree, ShareWorktreeResponse);
request_message!(OpenWorktree, OpenWorktreeResponse);
message!(CloseWorktree);
request_message!(OpenBuffer, OpenBufferResponse);
message!(CloseBuffer);
message!(UpdateBuffer);

17
zed/src/worktree.rs
View file

@ -74,6 +74,23 @@ pub enum Worktree {
impl Entity for Worktree {
type Event = ();
fn release(&mut self, cx: &mut MutableAppContext) {
let rpc = match self {
Self::Local(tree) => tree.rpc.clone(),
Self::Remote(tree) => Some((tree.rpc.clone(), tree.remote_id)),
};
if let Some((rpc, worktree_id)) = rpc {
cx.spawn(|_| async move {
rpc.state.lock().await.shared_worktrees.remove(&worktree_id);
if let Err(err) = rpc.send(proto::CloseWorktree { worktree_id }).await {
log::error!("error closing worktree {}: {}", worktree_id, err);
}
})
.detach();
}
}
}
impl Worktree {