Auto merge of #12847 - Veykril:vscode-downgrade, r=Veykril

fix: Fix restart server duplicating language clients

Reverts 03a62c180e6a7300d0d7b8c4d680b749c101bcbb
vscode-languageclient@8.0.0-next.15 and beyond changed the behaviour of language clients to be automatically started if a request comes in while they are not running. Currently when we restart the server via the restart command we recreate the language client, which causes VSCode to restart the stopped server, effectively duplicating our language clients...

Reverting the commit is simpler right now, the proper fix would be to only create a language client once and then use the `restart` functionality on it instead.

Fixes https://github.com/rust-lang/rust-analyzer/issues/12836

2 files changed, 2 insertions, 5 deletions

diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index a8d57a0e684..8a2dea6b35b 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -261,10 +261,6 @@ export async function createClient(
 }
 
 class ExperimentalFeatures implements lc.StaticFeature {
-    getState(): lc.FeatureState {
-        return { kind: "static" };
-    }
-
     fillClientCapabilities(capabilities: lc.ClientCapabilities): void {
         const caps: any = capabilities.experimental ?? {};
         caps.snippetTextEdit = true;
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index f2d47370105..0dea1b87b2f 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -42,7 +42,8 @@ export class Ctx {
 
         const res = new Ctx(config, extCtx, client, serverPath, statusBar);
 
-        await client.start();
+        res.pushCleanup(client.start());
+        await client.onReady();
         client.onNotification(ra.serverStatus, (params) => res.setServerStatus(params));
         return res;
     }