Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure collaborators cursor colors are the same in channel buffers as in projects

Browse source 
Co-authored-by: Mikayla <mikayla@zed.dev>
This commit is contained in:
Max Brunsfeld 2023-08-23 13:32:16 -07:00
parent 3268cce41a
commit 24141c2f16
10 changed files with 190 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/channel/src/channel_buffer.rs
View file

@ -21,8 +21,12 @@ pub struct ChannelBuffer {
_subscription: client::Subscription,
}
pub enum Event {
CollaboratorsChanged,
}
impl Entity for ChannelBuffer {
type Event = ();
type Event = Event;
fn release(&mut self, _: &mut AppContext) {
self.client
@ -54,8 +58,9 @@ impl ChannelBuffer {
let collaborators = response.collaborators;
let buffer =
cx.add_model(|cx| language::Buffer::new(response.replica_id as u16, base_text, cx));
let buffer = cx.add_model(|_| {
language::Buffer::remote(response.buffer_id, response.replica_id as u16, base_text)
});
buffer.update(&mut cx, |buffer, cx| buffer.apply_ops(operations, cx))?;
let subscription = client.subscribe_to_entity(channel_id)?;
@ -111,6 +116,7 @@ impl ChannelBuffer {
this.update(&mut cx, |this, cx| {
this.collaborators.push(collaborator);
cx.emit(Event::CollaboratorsChanged);
cx.notify();
});
@ -134,6 +140,7 @@ impl ChannelBuffer {
true
}
});
cx.emit(Event::CollaboratorsChanged);
cx.notify();
});