Restore client in extension.ts (#218)

## Summary

In #194, we stopped setting the `client` returned by the
`clientPromise`. As a result, the "Fix all" action stopped working,
since it relies on the `client`.

Closes #194.

Author: charliermarsh

package.json

@@ -48,6 +48,7 @@
     "lint": "eslint src --ext ts",
     "typecheck": "tsc --noEmit",
     "package": "webpack --mode production --devtool source-map --config ./webpack.config.js",
+    "watch": "webpack --watch",
     "vsce-package": "vsce package -o ruff.vsix",
     "vscode:prepublish": "npm run package"
   },

src/common/server.ts

@@ -112,11 +112,11 @@ export async function restartServer(
   serverId: string,
   serverName: string,
   outputChannel: OutputChannel,
-  lsClient?: LanguageClient,
+  client?: LanguageClient,
 ): Promise<LanguageClient | undefined> {
-  if (lsClient) {
+  if (client) {
     traceInfo(`Server: Stop requested`);
-    await lsClient.stop();
+    await client.stop();
     _disposables.forEach((d) => d.dispose());
     _disposables = [];
   }
@@ -132,7 +132,7 @@ export async function restartServer(
     return undefined;
   }
 
-  const newLSClient = await createServer(
+  const newClient = await createServer(
     resourceSettings.interpreter,
     serverId,
     serverName,
@@ -144,10 +144,10 @@ export async function restartServer(
     resourceSettings,
   );
 
-  newLSClient.trace = traceLevelToLSTrace(resourceSettings.logLevel);
+  newClient.trace = traceLevelToLSTrace(resourceSettings.logLevel);
   traceInfo(`Server: Start requested.`);
   _disposables.push(
-    newLSClient.onDidChangeState((e) => {
+    newClient.onDidChangeState((e) => {
       switch (e.newState) {
         case State.Stopped:
           traceVerbose(`Server State: Stopped`);
@@ -160,7 +160,7 @@ export async function restartServer(
           break;
       }
     }),
-    newLSClient.start(),
+    newClient.start(),
   );
-  return newLSClient;
+  return newClient;
 }

src/extension.ts

@@ -17,8 +17,8 @@ import { createOutputChannel, onDidChangeConfiguration, registerCommand } from "
 const issueTracker = "https://github.com/charliermarsh/ruff/issues";
 
 let client: LanguageClient | undefined;
-let clientPromise: Promise<LanguageClient | undefined> | undefined = undefined;
-let isNewRestartQueued = false;
+let restartInProgress = false;
+let restartQueued = false;
 
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
   // This is required to get server name and module. This should be
@@ -37,31 +37,26 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
   traceVerbose(`Configuration: ${JSON.stringify(serverInfo)}`);
 
   const runServer = async () => {
-    if (clientPromise != null) {
-      traceLog(
-        `Triggered ${serverName} restart while restart already in progress, queuing another restart`,
-      );
-      if (!isNewRestartQueued) {
-        // Schedule a new restart after the current one, but also make it so that there is one restart queue at a time,
-        // this restart will have the latest settings anyway.
-        isNewRestartQueued = true;
-        try {
-          await clientPromise;
-        } catch {
-          // We don't care whether this failed, we'll restart afterward anyway.
-        }
-      } else {
-        // In this case, we're currently restarting and a new restart is also queued, so we just do nothing and
-        // let the other restart handle this
+    if (restartInProgress) {
+      if (!restartQueued) {
+        // Schedule a new restart after the current restart.
         traceLog(
-          `Triggered ${serverName} restart while restart already in progress and another already queued, doing nothing`,
+          `Triggered ${serverName} restart while restart is in progress; queuing a restart.`,
         );
-        return;
+        restartQueued = true;
       }
+      return;
+    }
+
+    restartInProgress = true;
+    client = await restartServer(serverId, serverName, outputChannel, client);
+
+    restartInProgress = false;
+
+    if (restartQueued) {
+      restartQueued = false;
+      await runServer();
     }
-    clientPromise = restartServer(serverId, serverName, outputChannel, client);
-    isNewRestartQueued = false;
-    await clientPromise;
   };
 
   context.subscriptions.push(