Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove language server statuses synchronously when stopping a server

Browse source
This commit is contained in:
Antonio Scandurra 2022-06-09 10:59:02 +02:00
parent 69170fc33a
commit 213b31607c
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/project/src/project.rs
View file

@ -2130,10 +2130,15 @@ impl Project {
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) -> Task<()> { ) -> Task<()> {
let key = (worktree_id, adapter_name); let key = (worktree_id, adapter_name);
self.language_servers.remove(&key); if let Some((_, language_server)) = self.language_servers.remove(&key) {
if let Some(language_server) = self.started_language_servers.remove(&key) { self.language_server_statuses
.remove(&language_server.server_id());
cx.notify();
}
if let Some(started_language_server) = self.started_language_servers.remove(&key) {
cx.spawn_weak(|this, mut cx| async move { cx.spawn_weak(|this, mut cx| async move {
if let Some(language_server) = language_server.await { if let Some(language_server) = started_language_server.await {
if let Some(shutdown) = language_server.shutdown() { if let Some(shutdown) = language_server.shutdown() {
shutdown.await; shutdown.await;
} }