From c78bcf711624881a409d8df67c6fb4c13b8ff3c5 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 22 Mar 2022 16:44:59 +0100
Subject: [PATCH] Ensure leader updates don't change the active pane of
 followers

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 crates/server/src/rpc.rs | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/crates/server/src/rpc.rs b/crates/server/src/rpc.rs
index 53d1315662..79fb49da80 100644
--- a/crates/server/src/rpc.rs
+++ b/crates/server/src/rpc.rs
@@ -4454,7 +4454,7 @@ mod tests {
 
         // Client B opens an editor.
         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 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"), cx)
@@ -4491,13 +4491,15 @@ mod tests {
         workspace_a
             .update(cx_a, |workspace, cx| {
                 workspace.activate_next_pane(cx);
+                assert_eq!(*workspace.active_pane(), pane_a1);
                 workspace.open_path((worktree_id, "3.txt"), cx)
             })
             .await
             .unwrap();
         workspace_b
-            .update(cx_a, |workspace, cx| {
+            .update(cx_b, |workspace, cx| {
                 workspace.activate_next_pane(cx);
+                assert_eq!(*workspace.active_pane(), pane_b1);
                 workspace.open_path((worktree_id, "4.txt"), cx)
             })
             .await
@@ -4506,20 +4508,42 @@ mod tests {
 
         // Ensure leader updates don't change the active pane of followers
         workspace_a.read_with(cx_a, |workspace, _| {
-            assert_ne!(*workspace.active_pane(), pane_a1);
+            assert_eq!(*workspace.active_pane(), pane_a1);
         });
         workspace_b.read_with(cx_b, |workspace, _| {
-            assert_ne!(*workspace.active_pane(), pane_b1);
+            assert_eq!(*workspace.active_pane(), pane_b1);
         });
 
         // Ensure peers following each other doesn't cause an infinite loop.
         assert_eq!(
-            workspace_b.read_with(cx_b, |workspace, cx| workspace
+            workspace_a.read_with(cx_a, |workspace, cx| workspace
                 .active_item(cx)
                 .unwrap()
                 .project_path(cx)),
             Some((worktree_id, "3.txt").into())
         );
+        workspace_a.update(cx_a, |workspace, cx| {
+            assert_eq!(
+                workspace.active_item(cx).unwrap().project_path(cx),
+                Some((worktree_id, "3.txt").into())
+            );
+            workspace.activate_next_pane(cx);
+            assert_eq!(
+                workspace.active_item(cx).unwrap().project_path(cx),
+                Some((worktree_id, "4.txt").into())
+            );
+        });
+        workspace_b.update(cx_b, |workspace, cx| {
+            assert_eq!(
+                workspace.active_item(cx).unwrap().project_path(cx),
+                Some((worktree_id, "4.txt").into())
+            );
+            workspace.activate_next_pane(cx);
+            assert_eq!(
+                workspace.active_item(cx).unwrap().project_path(cx),
+                Some((worktree_id, "3.txt").into())
+            );
+        });
     }
 
     #[gpui::test(iterations = 10)]