zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1225 from zed-industries/fix-randomized-test-failure

Browse Source 
Don't wait for host's worktree updates if they disconnected
This commit is contained in:
Max Brunsfeld 2022-06-22 11:01:25 -07:00 committed by GitHub
commit c0a434fe27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/client/src/user.rs
View File

@ -230,11 +230,6 @@ impl UserStore {
Task::ready(Ok(()))
}
UpdateContacts::Update(message) => {
log::info!(
"update contacts on client {}: {:?}",
self.client.upgrade().unwrap().id,
message
);
let mut user_ids = HashSet::default();
for contact in &message.contacts {
user_ids.insert(contact.user_id);

9
crates/project/src/project.rs
View File

@ -1343,6 +1343,15 @@ impl Project {
{
*sharing_has_stopped = true;
self.collaborators.clear();
for worktree in &self.worktrees {
if let Some(worktree) = worktree.upgrade(cx) {
worktree.update(cx, |worktree, _| {
if let Some(worktree) = worktree.as_remote_mut() {
worktree.disconnected_from_host();
}
});
}
}
cx.notify();
}
}

16
crates/project/src/worktree.rs
View File

@ -81,7 +81,7 @@ pub struct RemoteWorktree {
pub(crate) background_snapshot: Arc<Mutex<Snapshot>>,
project_id: u64,
client: Arc<Client>,
updates_tx: UnboundedSender<proto::UpdateWorktree>,
updates_tx: Option<UnboundedSender<proto::UpdateWorktree>>,
last_scan_id_rx: watch::Receiver<usize>,
replica_id: ReplicaId,
diagnostic_summaries: TreeMap<PathKey, DiagnosticSummary>,
@ -202,7 +202,7 @@ impl Worktree {
replica_id,
snapshot: snapshot.clone(),
background_snapshot: background_snapshot.clone(),
updates_tx,
updates_tx: Some(updates_tx),
last_scan_id_rx,
client: client.clone(),
diagnostic_summaries: TreeMap::from_ordered_entries(
@ -1042,13 +1042,19 @@ impl RemoteWorktree {
self.snapshot.clone()
}
pub fn disconnected_from_host(&mut self) {
self.updates_tx.take();
}
pub fn update_from_remote(
&mut self,
envelope: TypedEnvelope<proto::UpdateWorktree>,
) -> Result<()> {
self.updates_tx
.unbounded_send(envelope.payload)
.expect("consumer runs to completion");
if let Some(updates_tx) = &self.updates_tx {
updates_tx
.unbounded_send(envelope.payload)
.expect("consumer runs to completion");
}
Ok(())
}