From ce2f3f664a0561e71741959252e1f7d08e21a781 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 23 Jun 2021 18:07:09 -0700
Subject: [PATCH] Consolidate more logic for joining worktree in
 Worktree::remote

This way we can use this method in tests and avoid
needing to construct a Workspace.
---
 gpui/src/app.rs      |  4 ++++
 zed/src/workspace.rs | 52 +++++++++++++-------------------------------
 zed/src/worktree.rs  | 50 ++++++++++++++++++++++++++++--------------
 3 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/gpui/src/app.rs b/gpui/src/app.rs
index 9985d6217a5f60f710474e8d659a2ef4e2f62cea..809776e32a9dd91be42ee1785cd04ca3976d0734 100644
--- a/gpui/src/app.rs
+++ b/gpui/src/app.rs
@@ -358,6 +358,10 @@ impl TestAppContext {
         result
     }
 
+    pub fn to_async(&self) -> AsyncAppContext {
+        AsyncAppContext(self.cx.clone())
+    }
+
     pub fn font_cache(&self) -> Arc<FontCache> {
         self.cx.borrow().cx.font_cache.clone()
     }
diff --git a/zed/src/workspace.rs b/zed/src/workspace.rs
index e0a873fc380dbf48ef7e4e08ebe77dd7a3630300..9d4483610c2f45eba6a3786ace96a40faab4a3a8 100644
--- a/zed/src/workspace.rs
+++ b/zed/src/workspace.rs
@@ -6,7 +6,6 @@ use crate::{
     language::LanguageRegistry,
     rpc,
     settings::Settings,
-    time::ReplicaId,
     worktree::{File, Worktree, WorktreeHandle},
     AppState,
 };
@@ -23,7 +22,6 @@ use postage::watch;
 use smol::prelude::*;
 use std::{
     collections::{hash_map::Entry, HashMap, HashSet},
-    convert::TryInto,
     future::Future,
     path::{Path, PathBuf},
     sync::Arc,
@@ -154,15 +152,14 @@ mod remote {
     }
 
     pub async fn close_buffer(
-        request: TypedEnvelope<proto::CloseBuffer>,
-        rpc: &rpc::Client,
-        _: &mut AsyncAppContext,
+        _request: TypedEnvelope<proto::CloseBuffer>,
+        _rpc: &rpc::Client,
+        _cx: &mut AsyncAppContext,
     ) -> anyhow::Result<()> {
-        let message = &request.payload;
-        let peer_id = request
-            .original_sender_id
-            .ok_or_else(|| anyhow!("missing original sender id"))?;
-
+        // let message = &request.payload;
+        // let peer_id = request
+        //     .original_sender_id
+        //     .ok_or_else(|| anyhow!("missing original sender id"))?;
         // let mut state = rpc.state.lock().await;
         // if let Some((_, ref_counts)) = state
         //     .shared_files
@@ -752,34 +749,15 @@ impl Workspace {
                 .ok_or_else(|| anyhow!("failed to decode worktree url"))?;
             log::info!("read worktree url from clipboard: {}", worktree_url.text());
 
-            let open_worktree_response = rpc
-                .request(
-                    connection_id,
-                    proto::OpenWorktree {
-                        worktree_id,
-                        access_token,
-                    },
-                )
-                .await?;
-            let worktree = open_worktree_response
-                .worktree
-                .ok_or_else(|| anyhow!("empty worktree"))?;
-            let replica_id = open_worktree_response
-                .replica_id
-                .ok_or_else(|| anyhow!("empty replica id"))?;
-
-            let worktree_id = worktree_id.try_into().unwrap();
+            let worktree = Worktree::remote(
+                rpc.clone(),
+                connection_id,
+                worktree_id,
+                access_token,
+                &mut cx,
+            )
+            .await?;
             this.update(&mut cx, |workspace, cx| {
-                let worktree = cx.add_model(|cx| {
-                    Worktree::remote(
-                        worktree_id,
-                        worktree,
-                        rpc,
-                        connection_id,
-                        replica_id as ReplicaId,
-                        cx,
-                    )
-                });
                 cx.observe_model(&worktree, |_, _, cx| cx.notify());
                 workspace.worktrees.insert(worktree);
                 cx.notify();
diff --git a/zed/src/worktree.rs b/zed/src/worktree.rs
index 973aa3a36366ca19b290935e98ea631c24e0ef1c..f441c6824d40adef6203b1c4e7d50e2beb90545a 100644
--- a/zed/src/worktree.rs
+++ b/zed/src/worktree.rs
@@ -15,8 +15,8 @@ use ::ignore::gitignore::Gitignore;
 use anyhow::{anyhow, Context, Result};
 pub use fuzzy::{match_paths, PathMatch};
 use gpui::{
-    scoped_pool, AppContext, Entity, ModelContext, ModelHandle, MutableAppContext, Task,
-    WeakModelHandle,
+    scoped_pool, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, MutableAppContext,
+    Task, WeakModelHandle,
 };
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
@@ -64,22 +64,40 @@ impl Worktree {
         Worktree::Local(LocalWorktree::new(path, cx))
     }
 
-    pub fn remote(
-        id: u64,
-        worktree: proto::Worktree,
+    pub async fn remote(
         rpc: rpc::Client,
         connection_id: ConnectionId,
-        replica_id: ReplicaId,
-        cx: &mut ModelContext<Worktree>,
-    ) -> Self {
-        Worktree::Remote(RemoteWorktree::new(
-            id,
-            worktree,
-            rpc,
-            connection_id,
-            replica_id,
-            cx,
-        ))
+        id: u64,
+        access_token: String,
+        cx: &mut AsyncAppContext,
+    ) -> Result<ModelHandle<Self>> {
+        let open_worktree_response = rpc
+            .request(
+                connection_id,
+                proto::OpenWorktree {
+                    worktree_id: id,
+                    access_token,
+                },
+            )
+            .await?;
+        let worktree_message = open_worktree_response
+            .worktree
+            .ok_or_else(|| anyhow!("empty worktree"))?;
+        let replica_id = open_worktree_response
+            .replica_id
+            .ok_or_else(|| anyhow!("empty replica id"))?;
+        Ok(cx.update(|cx| {
+            cx.add_model(|cx| {
+                Worktree::Remote(RemoteWorktree::new(
+                    id,
+                    worktree_message,
+                    rpc,
+                    connection_id,
+                    replica_id as ReplicaId,
+                    cx,
+                ))
+            })
+        }))
     }
 
     pub fn as_local(&self) -> Option<&LocalWorktree> {