Merge pull request #374 from ziglang/techatrix/prevent-duplicate-zls

prevent cases where ZLS is started multiple times

src/zigSetup.ts

@@ -3,6 +3,7 @@ import vscode from "vscode";
 import path from "path";
 
 import axios from "axios";
+import { debounce } from "lodash-es";
 import semver from "semver";
 
 import * as minisign from "./minisign";
@@ -537,13 +538,13 @@ export async function setupZig(context: vscode.ExtensionContext) {
     const watcher1 = vscode.workspace.createFileSystemWatcher("**/.zigversion");
     const watcher2 = vscode.workspace.createFileSystemWatcher("**/build.zig.zon");
 
-    const refreshZigInstallation = async () => {
+    const refreshZigInstallation = debounce(async () => {
         if (!vscode.workspace.getConfiguration("zig").get<string>("path")) {
             await installZig(context);
         } else {
             await updateStatus(context);
         }
-    };
+    }, 200);
 
     const onDidChangeActiveTextEditor = (editor: vscode.TextEditor | undefined) => {
         if (editor?.document.languageId === "zig") {

src/zls.ts

@@ -41,7 +41,7 @@ export async function restartClient(context: vscode.ExtensionContext): Promise<v
 
     try {
         const newClient = await startClient(result.exe, result.version);
-        await stopClient();
+        void stopClient();
         client = newClient;
         updateStatusItem(result.version);
     } catch (reason) {
@@ -94,11 +94,12 @@ async function startClient(zlsPath: string, zlsVersion: semver.SemVer): Promise<
 
 async function stopClient(): Promise<void> {
     if (!client) return;
+    const oldClient = client;
+    client = null;
     // The `stop` call will send the "shutdown" notification to the LSP
-    await client.stop();
+    await oldClient.stop();
     // The `dipose` call will send the "exit" request to the LSP which actually tells the child process to exit
-    await client.dispose();
-    client = null;
+    await oldClient.dispose();
 }
 
 /** returns the file system path to the zls executable */