This reverts commit e2bf8e5d9c.
See
https://github.com/zed-industries/zed/pull/37050#issuecomment-3230017137
for the context: musl builds started to fail and the amount of `cfg!`s
to fix this is too large.
Instead, the lsp_log.rs has to be split and repurposed better for the
remote headless server.
Release Notes:
- N/A
This commit is contained in:
@@ -694,7 +694,6 @@ impl Database {
|
||||
project_id: ActiveValue::set(project_id),
|
||||
id: ActiveValue::set(server.id as i64),
|
||||
name: ActiveValue::set(server.name.clone()),
|
||||
worktree_id: ActiveValue::set(server.worktree_id.map(|id| id as i64)),
|
||||
capabilities: ActiveValue::set(update.capabilities.clone()),
|
||||
})
|
||||
.on_conflict(
|
||||
@@ -705,7 +704,6 @@ impl Database {
|
||||
.update_columns([
|
||||
language_server::Column::Name,
|
||||
language_server::Column::Capabilities,
|
||||
language_server::Column::WorktreeId,
|
||||
])
|
||||
.to_owned(),
|
||||
)
|
||||
@@ -1067,7 +1065,7 @@ impl Database {
|
||||
server: proto::LanguageServer {
|
||||
id: language_server.id as u64,
|
||||
name: language_server.name,
|
||||
worktree_id: language_server.worktree_id.map(|id| id as u64),
|
||||
worktree_id: None,
|
||||
},
|
||||
capabilities: language_server.capabilities,
|
||||
})
|
||||
|
||||
@@ -809,7 +809,7 @@ impl Database {
|
||||
server: proto::LanguageServer {
|
||||
id: language_server.id as u64,
|
||||
name: language_server.name,
|
||||
worktree_id: language_server.worktree_id.map(|id| id as u64),
|
||||
worktree_id: None,
|
||||
},
|
||||
capabilities: language_server.capabilities,
|
||||
})
|
||||
|
||||
@@ -10,7 +10,6 @@ pub struct Model {
|
||||
pub id: i64,
|
||||
pub name: String,
|
||||
pub capabilities: String,
|
||||
pub worktree_id: Option<i64>,
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
|
||||
|
||||
@@ -476,9 +476,7 @@ impl Server {
|
||||
.add_request_handler(forward_mutating_project_request::<proto::GitChangeBranch>)
|
||||
.add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
|
||||
.add_message_handler(broadcast_project_message_from_host::<proto::AdvertiseContexts>)
|
||||
.add_message_handler(update_context)
|
||||
.add_request_handler(forward_mutating_project_request::<proto::ToggleLspLogs>)
|
||||
.add_message_handler(broadcast_project_message_from_host::<proto::LanguageServerLog>);
|
||||
.add_message_handler(update_context);
|
||||
|
||||
Arc::new(server)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user