Tidy up branch

Conrad Irwin created 2 years ago

Change summary

crates/collab/src/db/queries/rooms.rs | 4 +---
crates/collab/src/rpc.rs              | 2 +-
crates/project/src/project.rs         | 3 +--
crates/rpc/proto/zed.proto            | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)

Detailed changes

crates/collab/src/db/queries/rooms.rs

@@ -156,8 +156,6 @@ impl Database {
         initial_project_id: Option<ProjectId>,
     ) -> Result<RoomGuard<(proto::Room, proto::IncomingCall)>> {
         self.room_transaction(room_id, |tx| async move {
-            let room = self.get_room(room_id, &tx).await?;
-
             let caller = room_participant::Entity::find()
                 .filter(
                     room_participant::Column::UserId
@@ -196,6 +194,7 @@ impl Database {
             .insert(&*tx)
             .await?;
 
+            let room = self.get_room(room_id, &tx).await?;
             let incoming_call = Self::build_incoming_call(&room, called_user_id)
                 .ok_or_else(|| anyhow!("failed to build incoming call"))?;
             Ok((room, incoming_call))
@@ -1172,7 +1171,6 @@ impl Database {
             }
         }
         drop(db_participants);
-        dbg!(&participants);
 
         let mut db_projects = db_room
             .find_related(project::Entity)

crates/collab/src/rpc.rs

@@ -1504,7 +1504,7 @@ async fn join_project(
     // First, we send the metadata associated with each worktree.
     response.send(proto::JoinProjectResponse {
         worktrees: worktrees.clone(),
-        replica_id: Some(replica_id.0 as u32),
+        replica_id: replica_id.0 as u32,
         collaborators: collaborators.clone(),
         language_servers: project.language_servers.clone(),
     })?;

crates/project/src/project.rs

@@ -715,8 +715,7 @@ impl Project {
             })
             .await?;
         let this = cx.new_model(|cx| {
-            // todo!()
-            let replica_id = response.payload.replica_id.unwrap() as ReplicaId;
+            let replica_id = response.payload.replica_id as ReplicaId;
 
             let mut worktrees = Vec::new();
             for worktree in response.payload.worktrees {

crates/rpc/proto/zed.proto

@@ -369,7 +369,7 @@ message JoinProject {
 }
 
 message JoinProjectResponse {
-    optional uint32 replica_id = 1;
+    uint32 replica_id = 1;
     repeated WorktreeMetadata worktrees = 2;
     repeated Collaborator collaborators = 3;
     repeated LanguageServer language_servers = 4;