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

Fix project reconnection test to ensure rooms actually reconnects

Browse source
This commit is contained in:
Antonio Scandurra 2022-12-20 14:51:46 +01:00
parent 1aec691b35
commit 1a3940a12e
5 changed files with 94 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,7 +156,6 @@ enum ProjectClientState {
sharing_has_stopped: bool,
remote_id: u64,
replica_id: ReplicaId,
_detect_unshare: Task<Option<()>>,
},
}
@ -495,21 +494,6 @@ impl Project {
sharing_has_stopped: false,
remote_id,
replica_id,
_detect_unshare: cx.spawn_weak(move |this, mut cx| {
async move {
let mut status = client.status();
let is_connected =
status.next().await.map_or(false, |s| s.is_connected());
// Even if we're initially connected, any future change of the status means we momentarily disconnected.
if !is_connected || status.next().await.is_some() {
if let Some(this) = this.upgrade(&cx) {
this.update(&mut cx, |this, cx| this.disconnected_from_host(cx))
}
}
Ok(())
}
.log_err()
}),
}),
language_servers: Default::default(),
language_server_ids: Default::default(),
@ -1100,6 +1084,15 @@ impl Project {
Ok(())
}
pub fn rejoined(
&mut self,
message: proto::RejoinedProject,
cx: &mut ModelContext<Self>,
) -> Result<()> {
self.set_collaborators_from_proto(message.collaborators, cx)?;
Ok(())
}
pub fn worktree_metadata_protos(&self, cx: &AppContext) -> Vec<proto::WorktreeMetadata> {
self.worktrees(cx)
.map(|worktree| {