Skip to content

Commit aa33723

Browse files
Revert "Remote LSP logs (#36709)"
This reverts commit e2bf8e5.
1 parent d43cf2c commit aa33723

File tree

29 files changed

+342
-949
lines changed

29 files changed

+342
-949
lines changed

Cargo.lock

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/assistant_slash_command/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ parking_lot.workspace = true
2525
serde.workspace = true
2626
serde_json.workspace = true
2727
ui.workspace = true
28-
workspace = { path = "../workspace", default-features = false }
28+
workspace.workspace = true
2929
workspace-hack.workspace = true
3030

3131
[dev-dependencies]

crates/assistant_tool/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ serde.workspace = true
2828
serde_json.workspace = true
2929
text.workspace = true
3030
util.workspace = true
31-
workspace = { path = "../workspace", default-features = false }
31+
workspace.workspace = true
3232
workspace-hack.workspace = true
3333

3434
[dev-dependencies]

crates/breadcrumbs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ itertools.workspace = true
1919
settings.workspace = true
2020
theme.workspace = true
2121
ui.workspace = true
22-
workspace = { path = "../workspace", default-features = false }
22+
workspace.workspace = true
2323
zed_actions.workspace = true
2424
workspace-hack.workspace = true
2525

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ CREATE TABLE "language_servers" (
175175
"project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
176176
"name" VARCHAR NOT NULL,
177177
"capabilities" TEXT NOT NULL,
178-
"worktree_id" BIGINT,
179178
PRIMARY KEY (project_id, id)
180179
);
181180

crates/collab/migrations/20250827084812_worktree_in_servers.sql

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@ impl Database {
694694
project_id: ActiveValue::set(project_id),
695695
id: ActiveValue::set(server.id as i64),
696696
name: ActiveValue::set(server.name.clone()),
697-
worktree_id: ActiveValue::set(server.worktree_id.map(|id| id as i64)),
698697
capabilities: ActiveValue::set(update.capabilities.clone()),
699698
})
700699
.on_conflict(
@@ -705,7 +704,6 @@ impl Database {
705704
.update_columns([
706705
language_server::Column::Name,
707706
language_server::Column::Capabilities,
708-
language_server::Column::WorktreeId,
709707
])
710708
.to_owned(),
711709
)
@@ -1067,7 +1065,7 @@ impl Database {
10671065
server: proto::LanguageServer {
10681066
id: language_server.id as u64,
10691067
name: language_server.name,
1070-
worktree_id: language_server.worktree_id.map(|id| id as u64),
1068+
worktree_id: None,
10711069
},
10721070
capabilities: language_server.capabilities,
10731071
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ impl Database {
809809
server: proto::LanguageServer {
810810
id: language_server.id as u64,
811811
name: language_server.name,
812-
worktree_id: language_server.worktree_id.map(|id| id as u64),
812+
worktree_id: None,
813813
},
814814
capabilities: language_server.capabilities,
815815
})

crates/collab/src/db/tables/language_server.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub struct Model {
1010
pub id: i64,
1111
pub name: String,
1212
pub capabilities: String,
13-
pub worktree_id: Option<i64>,
1413
}
1514

1615
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

crates/collab/src/rpc.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,7 @@ impl Server {
476476
.add_request_handler(forward_mutating_project_request::<proto::GitChangeBranch>)
477477
.add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
478478
.add_message_handler(broadcast_project_message_from_host::<proto::AdvertiseContexts>)
479-
.add_message_handler(update_context)
480-
.add_request_handler(forward_mutating_project_request::<proto::ToggleLspLogs>)
481-
.add_message_handler(broadcast_project_message_from_host::<proto::LanguageServerLog>);
479+
.add_message_handler(update_context);
482480

483481
Arc::new(server)
484482
}

0 commit comments

Comments
 (0)