mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-27 00:41:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #1718 from zed-industries/dont-wait-for-project-upload

Browse source 
Proceed with share while project state uploads
This commit is contained in:
Max Brunsfeld 2022-10-11 12:48:33 -07:00 committed by GitHub
commit 9bdcd37f60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/call/src/room.rs
View file

@ -398,11 +398,11 @@ impl Room {
cx.spawn(|this, mut cx| async move {
let response = request.await?;
project
.update(&mut cx, |project, cx| {
project.shared(response.project_id, cx)
})
.await?;
project.update(&mut cx, |project, cx| {
project
.shared(response.project_id, cx)
.detach_and_log_err(cx)
});
// If the user's location is in this project, it changes from UnsharedProject to SharedProject.
this.update(&mut cx, |this, cx| {

1
crates/collab/src/integration_tests.rs
View file

@ -3874,6 +3874,7 @@ async fn test_language_server_statuses(
.update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
.await
.unwrap();
deterministic.run_until_parked();
let project_b = client_b.build_remote_project(project_id, cx_b).await;
project_b.read_with(cx_b, |project, _| {
let status = project.language_server_statuses().next().unwrap();

24
crates/collab_ui/src/contact_list.rs
View file

@ -65,7 +65,6 @@ enum ContactEntry {
project_id: u64,
worktree_root_names: Vec<String>,
host_user_id: u64,
is_host: bool,
is_last: bool,
},
IncomingRequest(Arc<User>),
@ -181,6 +180,7 @@ impl ContactList {
let list_state = ListState::new(0, Orientation::Top, 1000., cx, move |this, ix, cx| {
let theme = cx.global::<Settings>().theme.clone();
let is_selected = this.selection == Some(ix);
let current_project_id = this.project.read(cx).remote_id();
match &this.entries[ix] {
ContactEntry::Header(section) => {
@ -205,13 +205,12 @@ impl ContactList {
project_id,
worktree_root_names,
host_user_id,
is_host,
is_last,
} => Self::render_participant_project(
*project_id,
worktree_root_names,
*host_user_id,
*is_host,
Some(*project_id) == current_project_id,
*is_last,
is_selected,
&theme.contact_list,
@ -341,15 +340,12 @@ impl ContactList {
ContactEntry::ParticipantProject {
project_id,
host_user_id,
is_host,
..
} => {
if !is_host {
cx.dispatch_global_action(JoinProject {
project_id: *project_id,
follow_user_id: *host_user_id,
});
}
cx.dispatch_global_action(JoinProject {
project_id: *project_id,
follow_user_id: *host_user_id,
});
}
_ => {}
}
@ -407,7 +403,6 @@ impl ContactList {
project_id: project.id,
worktree_root_names: project.worktree_root_names.clone(),
host_user_id: user_id,
is_host: true,
is_last: projects.peek().is_none(),
});
}
@ -448,7 +443,6 @@ impl ContactList {
project_id: project.id,
worktree_root_names: project.worktree_root_names.clone(),
host_user_id: participant.user.id,
is_host: false,
is_last: projects.peek().is_none(),
});
}
@ -667,7 +661,7 @@ impl ContactList {
project_id: u64,
worktree_root_names: &[String],
host_user_id: u64,
is_host: bool,
is_current: bool,
is_last: bool,
is_selected: bool,
theme: &theme::ContactList,
@ -749,13 +743,13 @@ impl ContactList {
.with_style(row.container)
.boxed()
})
.with_cursor_style(if !is_host {
.with_cursor_style(if !is_current {
CursorStyle::PointingHand
} else {
CursorStyle::Arrow
})
.on_click(MouseButton::Left, move |_, cx| {
if !is_host {
if !is_current {
cx.dispatch_global_action(JoinProject {
project_id,
follow_user_id: host_user_id,