Revert "Remote LSP logs (#36709)" (#37051)

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
2025-08-27 23:24:19 +00:00
parent 9a97f9465b
commit b233df8343
29 changed files with 347 additions and 954 deletions
@@ -977,9 +977,7 @@ impl LocalLspStore {
                        this.update(&mut cx, |_, cx| {
                            cx.emit(LspStoreEvent::LanguageServerLog(
                                server_id,
-                                LanguageServerLogType::Trace {
-                                    verbose_info: params.verbose,
-                                },
+                                LanguageServerLogType::Trace(params.verbose),
                                params.message,
                            ));
                        })
@@ -3484,13 +3482,13 @@ pub struct LspStore {
    buffer_store: Entity<BufferStore>,
    worktree_store: Entity<WorktreeStore>,
    pub languages: Arc<LanguageRegistry>,
-    pub language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
+    language_server_statuses: BTreeMap<LanguageServerId, LanguageServerStatus>,
    active_entry: Option<ProjectEntryId>,
    _maintain_workspace_config: (Task<Result<()>>, watch::Sender<()>),
    _maintain_buffer_languages: Task<()>,
    diagnostic_summaries:
        HashMap<WorktreeId, HashMap<Arc<Path>, HashMap<LanguageServerId, DiagnosticSummary>>>,
-    pub lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
+    pub(super) lsp_server_capabilities: HashMap<LanguageServerId, lsp::ServerCapabilities>,
    lsp_document_colors: HashMap<BufferId, DocumentColorData>,
    lsp_code_lens: HashMap<BufferId, CodeLensData>,
    running_lsp_requests: HashMap<TypeId, (Global, HashMap<LspRequestId, Task<()>>)>,
@@ -3567,7 +3565,6 @@ pub struct LanguageServerStatus {
    pub pending_work: BTreeMap<String, LanguageServerProgress>,
    pub has_pending_diagnostic_updates: bool,
    progress_tokens: HashSet<String>,
-    pub worktree: Option<WorktreeId>,
 }

 #[derive(Clone, Debug)]
@@ -7486,7 +7483,7 @@ impl LspStore {
                        server: Some(proto::LanguageServer {
                            id: server_id.to_proto(),
                            name: status.name.to_string(),
-                            worktree_id: status.worktree.map(|id| id.to_proto()),
+                            worktree_id: None,
                        }),
                        capabilities: serde_json::to_string(&server.capabilities())
                            .expect("serializing server LSP capabilities"),
@@ -7530,7 +7527,6 @@ impl LspStore {
                        pending_work: Default::default(),
                        has_pending_diagnostic_updates: false,
                        progress_tokens: Default::default(),
-                        worktree: server.worktree_id.map(WorktreeId::from_proto),
                    },
                )
            })
@@ -8896,7 +8892,6 @@ impl LspStore {
                    pending_work: Default::default(),
                    has_pending_diagnostic_updates: false,
                    progress_tokens: Default::default(),
-                    worktree: server.worktree_id.map(WorktreeId::from_proto),
                },
            );
            cx.emit(LspStoreEvent::LanguageServerAdded(
@@ -10910,7 +10905,6 @@ impl LspStore {
                pending_work: Default::default(),
                has_pending_diagnostic_updates: false,
                progress_tokens: Default::default(),
-                worktree: Some(key.worktree_id),
            },
        );

@@ -12196,14 +12190,6 @@ impl LspStore {
        let data = self.lsp_code_lens.get_mut(&buffer_id)?;
        Some(data.update.take()?.1)
    }
-
-    pub fn downstream_client(&self) -> Option<(AnyProtoClient, u64)> {
-        self.downstream_client.clone()
-    }
-
-    pub fn worktree_store(&self) -> Entity<WorktreeStore> {
-        self.worktree_store.clone()
-    }
 }

 // Registration with registerOptions as null, should fallback to true.
@@ -12713,69 +12699,45 @@ impl PartialEq for LanguageServerPromptRequest {
 #[derive(Clone, Debug, PartialEq)]
 pub enum LanguageServerLogType {
    Log(MessageType),
-    Trace { verbose_info: Option<String> },
-    Rpc { received: bool },
+    Trace(Option<String>),
 }

 impl LanguageServerLogType {
    pub fn to_proto(&self) -> proto::language_server_log::LogType {
        match self {
            Self::Log(log_type) => {
-                use proto::log_message::LogLevel;
-                let level = match *log_type {
-                    MessageType::ERROR => LogLevel::Error,
-                    MessageType::WARNING => LogLevel::Warning,
-                    MessageType::INFO => LogLevel::Info,
-                    MessageType::LOG => LogLevel::Log,
+                let message_type = match *log_type {
+                    MessageType::ERROR => 1,
+                    MessageType::WARNING => 2,
+                    MessageType::INFO => 3,
+                    MessageType::LOG => 4,
                    other => {
-                        log::warn!("Unknown lsp log message type: {other:?}");
-                        LogLevel::Log
+                        log::warn!("Unknown lsp log message type: {:?}", other);
+                        4
                    }
                };
-                proto::language_server_log::LogType::Log(proto::LogMessage {
-                    level: level as i32,
-                })
+                proto::language_server_log::LogType::LogMessageType(message_type)
            }
-            Self::Trace { verbose_info } => {
-                proto::language_server_log::LogType::Trace(proto::TraceMessage {
-                    verbose_info: verbose_info.to_owned(),
+            Self::Trace(message) => {
+                proto::language_server_log::LogType::LogTrace(proto::LspLogTrace {
+                    message: message.clone(),
                })
            }
-            Self::Rpc { received } => {
-                let kind = if *received {
-                    proto::rpc_message::Kind::Received
-                } else {
-                    proto::rpc_message::Kind::Sent
-                };
-                let kind = kind as i32;
-                proto::language_server_log::LogType::Rpc(proto::RpcMessage { kind })
-            }
        }
    }

    pub fn from_proto(log_type: proto::language_server_log::LogType) -> Self {
-        use proto::log_message::LogLevel;
-        use proto::rpc_message;
        match log_type {
-            proto::language_server_log::LogType::Log(message_type) => Self::Log(
-                match LogLevel::from_i32(message_type.level).unwrap_or(LogLevel::Log) {
-                    LogLevel::Error => MessageType::ERROR,
-                    LogLevel::Warning => MessageType::WARNING,
-                    LogLevel::Info => MessageType::INFO,
-                    LogLevel::Log => MessageType::LOG,
-                },
-            ),
-            proto::language_server_log::LogType::Trace(trace_message) => Self::Trace {
-                verbose_info: trace_message.verbose_info,
-            },
-            proto::language_server_log::LogType::Rpc(message) => Self::Rpc {
-                received: match rpc_message::Kind::from_i32(message.kind)
-                    .unwrap_or(rpc_message::Kind::Received)
-                {
-                    rpc_message::Kind::Received => true,
-                    rpc_message::Kind::Sent => false,
-                },
-            },
+            proto::language_server_log::LogType::LogMessageType(message_type) => {
+                Self::Log(match message_type {
+                    1 => MessageType::ERROR,
+                    2 => MessageType::WARNING,
+                    3 => MessageType::INFO,
+                    4 => MessageType::LOG,
+                    _ => MessageType::LOG,
+                })
+            }
+            proto::language_server_log::LogType::LogTrace(trace) => Self::Trace(trace.message),
        }
    }
 }
@@ -280,11 +280,6 @@ pub enum Event {
        server_id: LanguageServerId,
        buffer_id: BufferId,
        buffer_abs_path: PathBuf,
-        name: Option<LanguageServerName>,
-    },
-    ToggleLspLogs {
-        server_id: LanguageServerId,
-        enabled: bool,
    },
    Toast {
        notification_id: SharedString,
@@ -1006,7 +1001,6 @@ impl Project {
        client.add_entity_request_handler(Self::handle_open_buffer_by_path);
        client.add_entity_request_handler(Self::handle_open_new_buffer);
        client.add_entity_message_handler(Self::handle_create_buffer_for_peer);
-        client.add_entity_message_handler(Self::handle_toggle_lsp_logs);

        WorktreeStore::init(&client);
        BufferStore::init(&client);
@@ -2977,7 +2971,6 @@ impl Project {
                                buffer_id,
                                server_id: *language_server_id,
                                buffer_abs_path: PathBuf::from(&update.buffer_abs_path),
-                                name: name.clone(),
                            });
                        }
                    }
@@ -4704,20 +4697,6 @@ impl Project {
        })?
    }

-    async fn handle_toggle_lsp_logs(
-        project: Entity<Self>,
-        envelope: TypedEnvelope<proto::ToggleLspLogs>,
-        mut cx: AsyncApp,
-    ) -> Result<()> {
-        project.update(&mut cx, |_, cx| {
-            cx.emit(Event::ToggleLspLogs {
-                server_id: LanguageServerId::from_proto(envelope.payload.server_id),
-                enabled: envelope.payload.enabled,
-            })
-        })?;
-        Ok(())
-    }
-
    async fn handle_synchronize_buffers(
        this: Entity<Self>,
        envelope: TypedEnvelope<proto::SynchronizeBuffers>,
@@ -1951,7 +1951,6 @@ async fn test_restarting_server_with_diagnostics_running(cx: &mut gpui::TestAppC
            server_id: LanguageServerId(1),
            buffer_id,
            buffer_abs_path: PathBuf::from(path!("/dir/a.rs")),
-            name: Some(fake_server.server.name())
        }
    );
    assert_eq!(