From 5e7651e92e4fbd839bf3d39d456ebabe3588f560 Mon Sep 17 00:00:00 2001
From: Keith Simmons <keith@zed.dev>
Date: Thu, 30 Jun 2022 17:00:29 -0700
Subject: [PATCH] Kill starting servers as well as currently running ones

---
 crates/project/src/project.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 828ffc3c057aadb394f57dee216119154157997f..ef58e51c54c72e2b742afd6624ebb610b1186bae 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -5803,12 +5803,12 @@ impl Entity for Project {
         let shutdown_futures = self
             .language_servers
             .drain()
-            .filter_map(|(_, server_state)| {
-                // TODO: Handle starting servers?
-                if let LanguageServerState::Running { server, .. } = server_state {
-                    server.shutdown()
-                } else {
-                    None
+            .map(|(_, server_state)| async {
+                match server_state {
+                    LanguageServerState::Running { server, .. } => server.shutdown()?.await,
+                    LanguageServerState::Starting(starting_server) => {
+                        starting_server.await?.shutdown()?.await
+                    }
                 }
             })
             .collect::<Vec<_>>();