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

WIP

Browse source
This commit is contained in:
Antonio Scandurra 2022-03-22 13:35:37 +01:00
parent 381c82714b
commit 284a446be7
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
crates/server/src/rpc.rs
View file

@ -4420,6 +4420,7 @@ mod tests {
"1.txt": "one", "1.txt": "one",
"2.txt": "two", "2.txt": "two",
"3.txt": "three", "3.txt": "three",
"4.txt": "four",
}), }),
) )
.await; .await;
@ -4441,6 +4442,7 @@ mod tests {
// Client A opens some editors. // Client A opens some editors.
let workspace_a = client_a.build_workspace(&project_a, cx_a); let workspace_a = client_a.build_workspace(&project_a, cx_a);
let pane_a1 = workspace_a.read_with(cx_a, |workspace, _| workspace.active_pane().clone());
let _editor_a1 = workspace_a let _editor_a1 = workspace_a
.update(cx_a, |workspace, cx| { .update(cx_a, |workspace, cx| {
workspace.open_path((worktree_id, "1.txt"), cx) workspace.open_path((worktree_id, "1.txt"), cx)
@ -4452,6 +4454,7 @@ mod tests {
// Client B opens an editor. // Client B opens an editor.
let workspace_b = client_b.build_workspace(&project_b, cx_b); let workspace_b = client_b.build_workspace(&project_b, cx_b);
let pane_b1 = workspace_a.read_with(cx_a, |workspace, _| workspace.active_pane().clone());
let _editor_b1 = workspace_b let _editor_b1 = workspace_b
.update(cx_b, |workspace, cx| { .update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "2.txt"), cx) workspace.open_path((worktree_id, "2.txt"), cx)
@ -4465,6 +4468,7 @@ mod tests {
workspace_a workspace_a
.update(cx_a, |workspace, cx| { .update(cx_a, |workspace, cx| {
workspace.split_pane(workspace.active_pane().clone(), SplitDirection::Right, cx); workspace.split_pane(workspace.active_pane().clone(), SplitDirection::Right, cx);
assert_ne!(*workspace.active_pane(), pane_a1);
let leader_id = *project_a.read(cx).collaborators().keys().next().unwrap(); let leader_id = *project_a.read(cx).collaborators().keys().next().unwrap();
workspace workspace
.toggle_follow(&workspace::ToggleFollow(leader_id), cx) .toggle_follow(&workspace::ToggleFollow(leader_id), cx)
@ -4475,6 +4479,7 @@ mod tests {
workspace_b workspace_b
.update(cx_b, |workspace, cx| { .update(cx_b, |workspace, cx| {
workspace.split_pane(workspace.active_pane().clone(), SplitDirection::Right, cx); workspace.split_pane(workspace.active_pane().clone(), SplitDirection::Right, cx);
assert_ne!(*workspace.active_pane(), pane_b1);
let leader_id = *project_b.read(cx).collaborators().keys().next().unwrap(); let leader_id = *project_b.read(cx).collaborators().keys().next().unwrap();
workspace workspace
.toggle_follow(&workspace::ToggleFollow(leader_id), cx) .toggle_follow(&workspace::ToggleFollow(leader_id), cx)
@ -4490,9 +4495,24 @@ mod tests {
}) })
.await .await
.unwrap(); .unwrap();
workspace_b
.update(cx_a, |workspace, cx| {
workspace.activate_next_pane(cx);
workspace.open_path((worktree_id, "4.txt"), cx)
})
.await
.unwrap();
cx_a.foreground().run_until_parked();
// Ensure leader updates don't change the active pane of followers
workspace_a.read_with(cx_a, |workspace, cx| {
assert_ne!(*workspace.active_pane(), pane_a1);
});
workspace_b.read_with(cx_b, |workspace, cx| {
assert_ne!(*workspace.active_pane(), pane_b1);
});
// Ensure peers following each other doesn't cause an infinite loop. // Ensure peers following each other doesn't cause an infinite loop.
cx_a.foreground().run_until_parked();
assert_eq!( assert_eq!(
workspace_b.read_with(cx_b, |workspace, cx| workspace workspace_b.read_with(cx_b, |workspace, cx| workspace
.active_item(cx) .active_item(cx)

6
crates/workspace/src/pane.rs
View file

@ -396,8 +396,10 @@ impl Pane {
cx.emit(Event::ActivateItem { local }); cx.emit(Event::ActivateItem { local });
} }
self.update_active_toolbar(cx); self.update_active_toolbar(cx);
self.focus_active_item(cx); if local {
self.activate(cx); self.focus_active_item(cx);
self.activate(cx);
}
cx.notify(); cx.notify();
} }
} }