Rename RemoteProject -> DevServerProject (#11301)

Co-Authored-By: Mikayla <mikayla@zed.dev>

In a fit of ill-advisedness I called these things remote projects;
forgetting that remote project is also what we call collaboratively
shared projects.

Release Notes:

- N/A

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Bennet <bennetbo@gmx.de>

Cargo.toml

@@ -69,7 +69,7 @@ members = [
     "crates/refineable",
     "crates/refineable/derive_refineable",
     "crates/release_channel",
-    "crates/remote_projects",
+    "crates/dev_server_projects",
     "crates/rich_text",
     "crates/rope",
     "crates/rpc",
@@ -207,7 +207,7 @@ project_symbols = { path = "crates/project_symbols" }
 quick_action_bar = { path = "crates/quick_action_bar" }
 recent_projects = { path = "crates/recent_projects" }
 release_channel = { path = "crates/release_channel" }
-remote_projects = { path = "crates/remote_projects" }
+dev_server_projects = { path = "crates/dev_server_projects" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }

crates/call/src/room.rs

@@ -1203,11 +1203,12 @@ impl Room {
         project: Model<Project>,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<u64>> {
-        let request = if let Some(remote_project_id) = project.read(cx).remote_project_id() {
+        let request = if let Some(dev_server_project_id) = project.read(cx).dev_server_project_id()
+        {
             self.client.request(proto::ShareProject {
                 room_id: self.id(),
                 worktrees: vec![],
-                remote_project_id: Some(remote_project_id.0),
+                dev_server_project_id: Some(dev_server_project_id.0),
             })
         } else {
             if let Some(project_id) = project.read(cx).remote_id() {
@@ -1217,7 +1218,7 @@ impl Room {
             self.client.request(proto::ShareProject {
                 room_id: self.id(),
                 worktrees: project.read(cx).worktree_metadata_protos(cx),
-                remote_project_id: None,
+                dev_server_project_id: None,
             })
         };
 

crates/client/src/user.rs

@@ -33,7 +33,7 @@ pub struct DevServerId(pub u64);
 #[derive(
     Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
 )]
-pub struct RemoteProjectId(pub u64);
+pub struct DevServerProjectId(pub u64);
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ParticipantIndex(pub u32);

crates/collab/Cargo.toml

@@ -93,7 +93,7 @@ notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
 release_channel.workspace = true
-remote_projects.workspace = true
+dev_server_projects.workspace = true
 rpc = { workspace = true, features = ["test-support"] }
 sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
 serde_json.workspace = true

crates/collab/migrations.sqlite/20221109000000_test_schema.sql

@@ -51,7 +51,7 @@ CREATE TABLE "projects" (
     "host_connection_server_id" INTEGER REFERENCES servers (id) ON DELETE CASCADE,
     "unregistered" BOOLEAN NOT NULL DEFAULT FALSE,
     "hosted_project_id" INTEGER REFERENCES hosted_projects (id),
-    "remote_project_id" INTEGER REFERENCES remote_projects(id)
+    "dev_server_project_id" INTEGER REFERENCES dev_server_projects(id)
 );
 CREATE INDEX "index_projects_on_host_connection_server_id" ON "projects" ("host_connection_server_id");
 CREATE INDEX "index_projects_on_host_connection_id_and_host_connection_server_id" ON "projects" ("host_connection_id", "host_connection_server_id");
@@ -410,10 +410,8 @@ CREATE TABLE dev_servers (
     hashed_token TEXT NOT NULL
 );
 
-CREATE TABLE remote_projects (
+CREATE TABLE dev_server_projects (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     dev_server_id INTEGER NOT NULL REFERENCES dev_servers(id),
     path TEXT NOT NULL
 );
-
-ALTER TABLE hosted_projects ADD COLUMN remote_project_id INTEGER REFERENCES remote_projects(id);

crates/collab/migrations/20240502150229_rename_to_dev_server_projects.sql

@@ -0,0 +1,11 @@
+CREATE TABLE dev_server_projects (
+    id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY (START WITH 100),
+    dev_server_id INT NOT NULL REFERENCES dev_servers(id) ON DELETE CASCADE,
+    path TEXT NOT NULL
+);
+INSERT INTO dev_server_projects OVERRIDING SYSTEM VALUE SELECT * FROM remote_projects;
+
+ALTER TABLE dev_server_projects ADD CONSTRAINT uix_dev_server_projects_dev_server_id_path UNIQUE(dev_server_id, path);
+
+ALTER TABLE projects ADD COLUMN dev_server_project_id INTEGER REFERENCES dev_server_projects(id);
+UPDATE projects SET dev_server_project_id = remote_project_id;

crates/collab/src/db.rs

@@ -762,7 +762,7 @@ pub struct Project {
     pub collaborators: Vec<ProjectCollaborator>,
     pub worktrees: BTreeMap<u64, Worktree>,
     pub language_servers: Vec<proto::LanguageServer>,
-    pub remote_project_id: Option<RemoteProjectId>,
+    pub dev_server_project_id: Option<DevServerProjectId>,
 }
 
 pub struct ProjectCollaborator {

crates/collab/src/db/ids.rs

@@ -84,7 +84,7 @@ id_type!(NotificationId);
 id_type!(NotificationKindId);
 id_type!(ProjectCollaboratorId);
 id_type!(ProjectId);
-id_type!(RemoteProjectId);
+id_type!(DevServerProjectId);
 id_type!(ReplicaId);
 id_type!(RoomId);
 id_type!(RoomParticipantId);

crates/collab/src/db/queries.rs

@@ -5,6 +5,7 @@ pub mod buffers;
 pub mod channels;
 pub mod contacts;
 pub mod contributors;
+pub mod dev_server_projects;
 pub mod dev_servers;
 pub mod embeddings;
 pub mod extensions;
@@ -13,7 +14,6 @@ pub mod messages;
 pub mod notifications;
 pub mod projects;
 pub mod rate_buckets;
-pub mod remote_projects;
 pub mod rooms;
 pub mod servers;
 pub mod users;