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

Merge pull request #1867 from zed-industries/drag-project-entry-to-pane

Browse source 
Drag project entry to pane
This commit is contained in:
Kay Simmons 2022-11-10 17:25:22 -08:00 • committed by GitHub
commit 3d5a3634cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 455 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -909,7 +909,7 @@ async fn test_host_disconnect(
cx_b.add_window(|cx| Workspace::new(project_b.clone(), |_, _| unimplemented!(), cx));
let editor_b = workspace_b
.update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "b.txt"), true, cx)
workspace.open_path((worktree_id, "b.txt"), None, true, cx)
})
.await
.unwrap()
@ -3705,7 +3705,7 @@ async fn test_collaborating_with_code_actions(
cx_b.add_window(|cx| Workspace::new(project_b.clone(), |_, _| unimplemented!(), cx));
let editor_b = workspace_b
.update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "main.rs"), true, cx)
workspace.open_path((worktree_id, "main.rs"), None, true, cx)
})
.await
.unwrap()
@ -3926,7 +3926,7 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
cx_b.add_window(|cx| Workspace::new(project_b.clone(), |_, _| unimplemented!(), cx));
let editor_b = workspace_b
.update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "one.rs"), true, cx)
workspace.open_path((worktree_id, "one.rs"), None, true, cx)
})
.await
.unwrap()
@ -4726,7 +4726,7 @@ async fn test_following(
let pane_a = workspace_a.read_with(cx_a, |workspace, _| workspace.active_pane().clone());
let editor_a1 = workspace_a
.update(cx_a, |workspace, cx| {
workspace.open_path((worktree_id, "1.txt"), true, cx)
workspace.open_path((worktree_id, "1.txt"), None, true, cx)
})
.await
.unwrap()
@ -4734,7 +4734,7 @@ async fn test_following(
.unwrap();
let editor_a2 = workspace_a
.update(cx_a, |workspace, cx| {
workspace.open_path((worktree_id, "2.txt"), true, cx)
workspace.open_path((worktree_id, "2.txt"), None, true, cx)
})
.await
.unwrap()
@ -4745,7 +4745,7 @@ async fn test_following(
let workspace_b = client_b.build_workspace(&project_b, cx_b);
let editor_b1 = workspace_b
.update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "1.txt"), true, cx)
workspace.open_path((worktree_id, "1.txt"), None, true, cx)
})
.await
.unwrap()
@ -5003,7 +5003,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
let pane_a1 = workspace_a.read_with(cx_a, |workspace, _| workspace.active_pane().clone());
let _editor_a1 = workspace_a
.update(cx_a, |workspace, cx| {
workspace.open_path((worktree_id, "1.txt"), true, cx)
workspace.open_path((worktree_id, "1.txt"), None, true, cx)
})
.await
.unwrap()
@ -5015,7 +5015,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
let pane_b1 = workspace_b.read_with(cx_b, |workspace, _| workspace.active_pane().clone());
let _editor_b1 = workspace_b
.update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "2.txt"), true, cx)
workspace.open_path((worktree_id, "2.txt"), None, true, cx)
})
.await
.unwrap()
@ -5066,7 +5066,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
workspace_a
.update(cx_a, |workspace, cx| {
workspace.open_path((worktree_id, "3.txt"), true, cx)
workspace.open_path((worktree_id, "3.txt"), None, true, cx)
})
.await
.unwrap();
@ -5077,7 +5077,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
workspace_b
.update(cx_b, |workspace, cx| {
assert_eq!(*workspace.active_pane(), pane_b1);
workspace.open_path((worktree_id, "4.txt"), true, cx)
workspace.open_path((worktree_id, "4.txt"), None, true, cx)
})
.await
.unwrap();
@ -5178,7 +5178,7 @@ async fn test_auto_unfollowing(cx_a: &mut TestAppContext, cx_b: &mut TestAppCont
let workspace_a = client_a.build_workspace(&project_a, cx_a);
let _editor_a1 = workspace_a
.update(cx_a, |workspace, cx| {
workspace.open_path((worktree_id, "1.txt"), true, cx)
workspace.open_path((worktree_id, "1.txt"), None, true, cx)
})
.await
.unwrap()
@ -5291,7 +5291,7 @@ async fn test_auto_unfollowing(cx_a: &mut TestAppContext, cx_b: &mut TestAppCont
// When client B activates a different item in the original pane, it automatically stops following client A.
workspace_b
.update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "2.txt"), true, cx)
workspace.open_path((worktree_id, "2.txt"), None, true, cx)
})
.await
.unwrap();