oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add public method for connecting to RPC server with a given address

Browse Source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld
2021-06-23 18:05:03 -07:00
co-authored by Nathan Sobo
parent 54c4b31249
commit 6a166554e8
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed/src/workspace.rs
+2 -4
View File
@@ -708,11 +708,10 @@ impl Workspace {
fn share_worktree(&mut self, _: &(), cx: &mut ViewContext<Self>) {
let rpc = self.rpc.clone();
let executor = cx.background_executor().clone();
let platform = cx.platform();
let task = cx.spawn(|this, mut cx| async move {
let connection_id = rpc.connect_to_server(&cx, &executor).await?;
let connection_id = rpc.log_in_and_connect(&cx).await?;
let share_task = this.update(&mut cx, |this, cx| {
let worktree = this.worktrees.iter().next()?;
@@ -741,10 +740,9 @@ impl Workspace {
fn join_worktree(&mut self, _: &(), cx: &mut ViewContext<Self>) {
let rpc = self.rpc.clone();
let executor = cx.background_executor().clone();
let task = cx.spawn(|this, mut cx| async move {
let connection_id = rpc.connect_to_server(&cx, &executor).await?;
let connection_id = rpc.log_in_and_connect(&cx).await?;
let worktree_url = cx
.platform()