mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 13:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Make replica_id optional in OpenWorktreeResponse

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-23 17:32:05 +02:00
parent 02321af08a
commit f1587fbb6e
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zed-rpc/proto/zed.proto
View file

@ -43,7 +43,7 @@ message OpenWorktree {
message OpenWorktreeResponse {
Worktree worktree = 1;
uint32 replica_id = 2;
optional uint32 replica_id = 2;
}
message AddGuest {

13
zed/src/workspace.rs
View file

@ -766,12 +766,21 @@ impl Workspace {
let worktree = open_worktree_response
.worktree
.ok_or_else(|| anyhow!("empty worktree"))?;
let replica_id = open_worktree_response.replica_id as ReplicaId;
let replica_id = open_worktree_response
.replica_id
.ok_or_else(|| anyhow!("empty replica id"))?;
let worktree_id = worktree_id.try_into().unwrap();
this.update(&mut cx, |workspace, cx| {
let worktree = cx.add_model(|cx| {
Worktree::remote(worktree_id, worktree, rpc, connection_id, replica_id, 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);