Report running language servers when sharing project for the first time

Antonio Scandurra and Max Brunsfeld created 3 years ago

Co-Authored-By: Max Brunsfeld <[e-mail]>

Change summary

crates/collab/src/integration_tests.rs | 30 ++++++++++++++++++++++++---
crates/project/src/project.rs          | 12 +++++++++++
2 files changed, 38 insertions(+), 4 deletions(-)

Detailed changes

crates/collab/src/integration_tests.rs

@@ -2992,19 +2992,41 @@ async fn test_language_server_statuses(
         .unwrap();
 
     let fake_language_server = fake_language_servers.next().await.unwrap();
+    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
+        token: lsp::NumberOrString::String("the-token".to_string()),
+        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Report(
+            lsp::WorkDoneProgressReport {
+                message: Some("the-message".to_string()),
+                ..Default::default()
+            },
+        )),
+    });
+    deterministic.run_until_parked();
+    project_a.read_with(cx_a, |project, _| {
+        let status = project.language_server_statuses().next().unwrap();
+        assert_eq!(status.name, "the-language-server");
+        assert_eq!(status.pending_work.len(), 1);
+        assert_eq!(
+            status.pending_work["the-token"].message.as_ref().unwrap(),
+            "the-message"
+        );
+    });
 
     let project_b = client_b.build_remote_project(&project_a, cx_a, cx_b).await;
+    project_b.read_with(cx_b, |project, _| {
+        let status = project.language_server_statuses().next().unwrap();
+        assert_eq!(status.name, "the-language-server");
+    });
 
     fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
         token: lsp::NumberOrString::String("the-token".to_string()),
         value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Report(
             lsp::WorkDoneProgressReport {
-                message: Some("the-message".to_string()),
+                message: Some("the-message-2".to_string()),
                 ..Default::default()
             },
         )),
     });
-
     deterministic.run_until_parked();
     project_a.read_with(cx_a, |project, _| {
         let status = project.language_server_statuses().next().unwrap();
@@ -3012,7 +3034,7 @@ async fn test_language_server_statuses(
         assert_eq!(status.pending_work.len(), 1);
         assert_eq!(
             status.pending_work["the-token"].message.as_ref().unwrap(),
-            "the-message"
+            "the-message-2"
         );
     });
     project_b.read_with(cx_b, |project, _| {
@@ -3021,7 +3043,7 @@ async fn test_language_server_statuses(
         assert_eq!(status.pending_work.len(), 1);
         assert_eq!(
             status.pending_work["the-token"].message.as_ref().unwrap(),
-            "the-message"
+            "the-message-2"
         );
     });
 }

crates/project/src/project.rs

@@ -1256,6 +1256,18 @@ impl Project {
             });
         }
 
+        for (server_id, status) in &self.language_server_statuses {
+            self.client
+                .send(proto::StartLanguageServer {
+                    project_id,
+                    server: Some(proto::LanguageServer {
+                        id: *server_id as u64,
+                        name: status.name.clone(),
+                    }),
+                })
+                .log_err();
+        }
+
         cx.spawn(|this, mut cx| async move {
             for task in tasks {
                 task.await?;