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

Rename {Add,Remove}Guest to {Add,Remove}Peer

Browse Source
This commit is contained in:
Antonio Scandurra
2021-07-05 10:24:39 +02:00
parent 61222b4fe5
commit 2a779d3529
4 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed-rpc/proto/zed.proto
+5 -5
View File
@@ -19,8 +19,8 @@ message Envelope {
UpdateBuffer update_buffer = 14;
SaveBuffer save_buffer = 15;
BufferSaved buffer_saved = 16;
AddGuest add_guest = 17;
RemoveGuest remove_guest = 18;
AddPeer add_peer = 17;
RemovePeer remove_peer = 18;
}
}
@@ -57,12 +57,12 @@ message CloseWorktree {
uint64 worktree_id = 1;
}
message AddGuest {
message AddPeer {
uint64 worktree_id = 1;
Peer guest = 2;
Peer peer = 2;
}
message RemoveGuest {
message RemovePeer {
uint64 worktree_id = 1;
uint32 peer_id = 2;
}
zed-rpc/src/proto.rs
+2 -2
View File
@@ -76,8 +76,8 @@ request_message!(OpenBuffer, OpenBufferResponse);
message!(CloseBuffer);
message!(UpdateBuffer);
request_message!(SaveBuffer, BufferSaved);
message!(AddGuest);
message!(RemoveGuest);
message!(AddPeer);
message!(RemovePeer);
/// A stream of protobuf messages.
pub struct MessageStream<T> {
zed/src/editor/buffer.rs
+1 -1
View File
@@ -1539,7 +1539,7 @@ impl Buffer {
self.operations.push(operation);
}
pub fn remove_guest(&mut self, replica_id: ReplicaId, cx: &mut ModelContext<Self>) {
pub fn remove_peer(&mut self, replica_id: ReplicaId, cx: &mut ModelContext<Self>) {
self.selections
.retain(|set_id, _| set_id.replica_id != replica_id);
cx.notify();
zed/src/worktree.rs
+30 -36
View File
@@ -53,8 +53,8 @@ lazy_static! {
}
pub fn init(cx: &mut MutableAppContext, rpc: rpc::Client) {
rpc.on_message(remote::add_guest, cx);
rpc.on_message(remote::remove_guest, cx);
rpc.on_message(remote::add_peer, cx);
rpc.on_message(remote::remove_peer, cx);
rpc.on_message(remote::open_buffer, cx);
rpc.on_message(remote::close_buffer, cx);
rpc.on_message(remote::update_buffer, cx);
@@ -240,25 +240,25 @@ impl Worktree {
}
}
pub fn add_guest(
pub fn add_peer(
&mut self,
envelope: TypedEnvelope<proto::AddGuest>,
envelope: TypedEnvelope<proto::AddPeer>,
cx: &mut ModelContext<Worktree>,
) -> Result<()> {
match self {
Worktree::Local(worktree) => worktree.add_guest(envelope, cx),
Worktree::Remote(worktree) => worktree.add_guest(envelope, cx),
Worktree::Local(worktree) => worktree.add_peer(envelope, cx),
Worktree::Remote(worktree) => worktree.add_peer(envelope, cx),
}
}
pub fn remove_guest(
pub fn remove_peer(
&mut self,
envelope: TypedEnvelope<proto::RemoveGuest>,
envelope: TypedEnvelope<proto::RemovePeer>,
cx: &mut ModelContext<Worktree>,
) -> Result<()> {
match self {
Worktree::Local(worktree) => worktree.remove_guest(envelope, cx),
Worktree::Remote(worktree) => worktree.remove_guest(envelope, cx),
Worktree::Local(worktree) => worktree.remove_peer(envelope, cx),
Worktree::Remote(worktree) => worktree.remove_peer(envelope, cx),
}
}
@@ -543,24 +543,21 @@ impl LocalWorktree {
Ok(())
}
pub fn add_guest(
pub fn add_peer(
&mut self,
envelope: TypedEnvelope<proto::AddGuest>,
envelope: TypedEnvelope<proto::AddPeer>,
cx: &mut ModelContext<Worktree>,
) -> Result<()> {
let guest = envelope
.payload
.guest
.ok_or_else(|| anyhow!("empty peer"))?;
let peer = envelope.payload.peer.ok_or_else(|| anyhow!("empty peer"))?;
self.peers
.insert(PeerId(guest.peer_id), guest.replica_id as ReplicaId);
.insert(PeerId(peer.peer_id), peer.replica_id as ReplicaId);
cx.notify();
Ok(())
}
pub fn remove_guest(
pub fn remove_peer(
&mut self,
envelope: TypedEnvelope<proto::RemoveGuest>,
envelope: TypedEnvelope<proto::RemovePeer>,
cx: &mut ModelContext<Worktree>,
) -> Result<()> {
let peer_id = PeerId(envelope.payload.peer_id);
@@ -571,7 +568,7 @@ impl LocalWorktree {
self.shared_buffers.remove(&peer_id);
for (_, buffer) in &self.open_buffers {
if let Some(buffer) = buffer.upgrade(&cx) {
buffer.update(cx, |buffer, cx| buffer.remove_guest(replica_id, cx));
buffer.update(cx, |buffer, cx| buffer.remove_peer(replica_id, cx));
}
}
cx.notify();
@@ -922,24 +919,21 @@ impl RemoteWorktree {
})
}
pub fn add_guest(
pub fn add_peer(
&mut self,
envelope: TypedEnvelope<proto::AddGuest>,
envelope: TypedEnvelope<proto::AddPeer>,
cx: &mut ModelContext<Worktree>,
) -> Result<()> {
let guest = envelope
.payload
.guest
.ok_or_else(|| anyhow!("empty peer"))?;
let peer = envelope.payload.peer.ok_or_else(|| anyhow!("empty peer"))?;
self.peers
.insert(PeerId(guest.peer_id), guest.replica_id as ReplicaId);
.insert(PeerId(peer.peer_id), peer.replica_id as ReplicaId);
cx.notify();
Ok(())
}
pub fn remove_guest(
pub fn remove_peer(
&mut self,
envelope: TypedEnvelope<proto::RemoveGuest>,
envelope: TypedEnvelope<proto::RemovePeer>,
cx: &mut ModelContext<Worktree>,
) -> Result<()> {
let peer_id = PeerId(envelope.payload.peer_id);
@@ -949,7 +943,7 @@ impl RemoteWorktree {
.ok_or_else(|| anyhow!("unknown peer {:?}", peer_id))?;
for (_, buffer) in &self.open_buffers {
if let Some(buffer) = buffer.upgrade(&cx) {
buffer.update(cx, |buffer, cx| buffer.remove_guest(replica_id, cx));
buffer.update(cx, |buffer, cx| buffer.remove_peer(replica_id, cx));
}
}
cx.notify();
@@ -2091,8 +2085,8 @@ impl<'a> Iterator for ChildEntriesIter<'a> {
mod remote {
use super::*;
pub async fn add_guest(
envelope: TypedEnvelope<proto::AddGuest>,
pub async fn add_peer(
envelope: TypedEnvelope<proto::AddPeer>,
rpc: &rpc::Client,
cx: &mut AsyncAppContext,
) -> anyhow::Result<()> {
@@ -2100,11 +2094,11 @@ mod remote {
.read()
.await
.shared_worktree(envelope.payload.worktree_id, cx)?
.update(cx, |worktree, cx| worktree.add_guest(envelope, cx))
.update(cx, |worktree, cx| worktree.add_peer(envelope, cx))
}
pub async fn remove_guest(
envelope: TypedEnvelope<proto::RemoveGuest>,
pub async fn remove_peer(
envelope: TypedEnvelope<proto::RemovePeer>,
rpc: &rpc::Client,
cx: &mut AsyncAppContext,
) -> anyhow::Result<()> {
@@ -2112,7 +2106,7 @@ mod remote {
.read()
.await
.shared_worktree(envelope.payload.worktree_id, cx)?
.update(cx, |worktree, cx| worktree.remove_guest(envelope, cx))
.update(cx, |worktree, cx| worktree.remove_peer(envelope, cx))
}
pub async fn open_buffer(