mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-25 19:29:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Respond to join project request before sharing project completes

Browse source 
This ensures the guest doesn't observe a huge delay when joining.
This commit is contained in:
Antonio Scandurra 2022-06-30 14:29:06 +02:00
parent 09bb3ddeb8
commit 845c79ee05
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1332,12 +1332,13 @@ impl Project {
let client = self.client.clone();
cx.foreground()
.spawn(async move {
share.await?;
client.send(proto::RespondToJoinProjectRequest {
requester_id,
project_id,
allow,
})
})?;
share.await?;
anyhow::Ok(())
})
.detach_and_log_err(cx);
}

8
crates/project/src/worktree.rs
View file

@ -2718,10 +2718,11 @@ async fn send_worktree_update(
#[cfg(not(any(test, feature = "test-support")))]
const MAX_CHUNK_SIZE: usize = 256;
loop {
let mut is_last_update = false;
while !is_last_update {
let chunk_size = cmp::min(update.updated_entries.len(), MAX_CHUNK_SIZE);
let updated_entries = update.updated_entries.drain(..chunk_size).collect();
let is_last_update = update.updated_entries.is_empty();
is_last_update = update.updated_entries.is_empty();
client
.request(proto::UpdateWorktree {
project_id: update.project_id,
@ -2733,9 +2734,6 @@ async fn send_worktree_update(
is_last_update,
})
.await?;
if is_last_update {
break;
}
}
Ok(())