zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-09 21:26:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up context usage

Browse Source 
Co-Authored-By: Max <max@zed.dev>
This commit is contained in:
Conrad Irwin 2024-01-05 16:35:20 -07:00
parent 709682e8bc
commit 385cbfea2d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/collab/src/tests/following_tests.rs
View File

@ -1439,20 +1439,16 @@ async fn test_following_across_workspaces(cx_a: &mut TestAppContext, cx_b: &mut
.unwrap() .unwrap()
.clone(); .clone();
let mut cx_b_project_a = VisualTestContext::from_window(window_b_project_a, cx_b); let mut cx_b2 = VisualTestContext::from_window(window_b_project_a.clone(), cx_b);
let workspace_b_project_a = cx_b let workspace_b_project_a = window_b_project_a
.windows()
.iter()
.max_by_key(|window| window.window_id())
.unwrap()
.downcast::<Workspace>() .downcast::<Workspace>()
.unwrap() .unwrap()
.root(cx_b) .root(cx_b)
.unwrap(); .unwrap();
// assert that b is following a in project a in w.rs // assert that b is following a in project a in w.rs
workspace_b_project_a.update(&mut cx_b_project_a, |workspace, cx| { workspace_b_project_a.update(&mut cx_b2, |workspace, cx| {
assert!(workspace.is_being_followed(client_a.peer_id().unwrap())); assert!(workspace.is_being_followed(client_a.peer_id().unwrap()));
assert_eq!( assert_eq!(
client_a.peer_id(), client_a.peer_id(),
@ -1467,7 +1463,7 @@ async fn test_following_across_workspaces(cx_a: &mut TestAppContext, cx_b: &mut
// TODO: in app code, this would be done by the collab_ui. // TODO: in app code, this would be done by the collab_ui.
active_call_b active_call_b
.update(&mut cx_b_project_a, |call, cx| { .update(&mut cx_b2, |call, cx| {
let project = workspace_b_project_a.read(cx).project().clone(); let project = workspace_b_project_a.read(cx).project().clone();
call.set_location(Some(&project), cx) call.set_location(Some(&project), cx)
}) })
@ -1479,14 +1475,14 @@ async fn test_following_across_workspaces(cx_a: &mut TestAppContext, cx_b: &mut
// b moves to x.rs in a's project, and a follows // b moves to x.rs in a's project, and a follows
workspace_b_project_a workspace_b_project_a
.update(cx_b, |workspace, cx| { .update(&mut cx_b2, |workspace, cx| {
workspace.open_path((worktree_id_a, "x.rs"), None, true, cx) workspace.open_path((worktree_id_a, "x.rs"), None, true, cx)
}) })
.await .await
.unwrap(); .unwrap();
executor.run_until_parked(); executor.run_until_parked();
workspace_b_project_a.update(cx_b, |workspace, cx| { workspace_b_project_a.update(&mut cx_b2, |workspace, cx| {
let item = workspace.active_item(cx).unwrap(); let item = workspace.active_item(cx).unwrap();
assert_eq!( assert_eq!(
item.tab_description(0, cx).unwrap(), item.tab_description(0, cx).unwrap(),
@ -1547,17 +1543,20 @@ async fn test_following_across_workspaces(cx_a: &mut TestAppContext, cx_b: &mut
executor.run_until_parked(); executor.run_until_parked();
assert_eq!(visible_push_notifications(cx_a).len(), 0); assert_eq!(visible_push_notifications(cx_a).len(), 0);
let workspace_a_project_b = cx_a let window_a_project_b = cx_a
.windows() .windows()
.iter() .iter()
.max_by_key(|window| window.window_id()) .max_by_key(|window| window.window_id())
.unwrap() .unwrap()
.clone();
let cx_a2 = &mut VisualTestContext::from_window(window_a_project_b.clone(), cx_a);
let workspace_a_project_b = window_a_project_b
.downcast::<Workspace>() .downcast::<Workspace>()
.unwrap() .unwrap()
.root(cx_a) .root(cx_a)
.unwrap(); .unwrap();
workspace_a_project_b.update(cx_a, |workspace, cx| { workspace_a_project_b.update(cx_a2, |workspace, cx| {
assert_eq!(workspace.project().read(cx).remote_id(), Some(project_b_id)); assert_eq!(workspace.project().read(cx).remote_id(), Some(project_b_id));
assert!(workspace.is_being_followed(client_b.peer_id().unwrap())); assert!(workspace.is_being_followed(client_b.peer_id().unwrap()));
assert_eq!( assert_eq!(