Properly fill remote client's log store

Author: SomeoneToIgnore

crates/language_tools/src/lsp_log.rs

@@ -13,7 +13,8 @@ use lsp::{
     MessageType, SetTraceParams, TraceValue, notification::SetTrace,
 };
 use project::{
-    LspStore, Project, WorktreeId, lsp_store::LanguageServerLogType, search::SearchQuery,
+    LspStore, Project, ProjectItem, WorktreeId, lsp_store::LanguageServerLogType,
+    search::SearchQuery,
 };
 use std::{any::TypeId, borrow::Cow, sync::Arc};
 use ui::{Button, Checkbox, ContextMenu, Label, PopoverMenu, ToggleState, prelude::*};
@@ -377,6 +378,36 @@ impl LogStore {
                                     cx,
                                 );
                             }
+                            project::Event::LanguageServerBufferRegistered {
+                                server_id,
+                                buffer_id,
+                                name,
+                                ..
+                            } if project.read(cx).is_via_collab() => {
+                                let worktree_id = project
+                                    .read(cx)
+                                    .buffer_for_id(*buffer_id, cx)
+                                    .and_then(|buffer| {
+                                        Some(buffer.read(cx).project_path(cx)?.worktree_id)
+                                    });
+                                let name = name.clone().or_else(|| {
+                                    project
+                                        .read(cx)
+                                        .lsp_store()
+                                        .read(cx)
+                                        .language_server_statuses
+                                        .get(server_id)
+                                        .map(|status| status.name.clone())
+                                });
+                                log_store.add_language_server(
+                                    server_kind,
+                                    *server_id,
+                                    name,
+                                    worktree_id,
+                                    None,
+                                    cx,
+                                );
+                            }
                             project::Event::LanguageServerRemoved(id) => {
                                 log_store.remove_language_server(*id, cx);
                             }

crates/project/src/project.rs

@@ -280,6 +280,7 @@ pub enum Event {
         server_id: LanguageServerId,
         buffer_id: BufferId,
         buffer_abs_path: PathBuf,
+        name: Option<LanguageServerName>,
     },
     Toast {
         notification_id: SharedString,
@@ -2971,6 +2972,7 @@ impl Project {
                                 buffer_id,
                                 server_id: *language_server_id,
                                 buffer_abs_path: PathBuf::from(&update.buffer_abs_path),
+                                name: name.clone(),
                             });
                         }
                     }

crates/project/src/project_tests.rs

@@ -1951,6 +1951,7 @@ 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!(