fix: Stop overwriting user-configured paths

src/zigProvider.ts

@@ -44,6 +44,7 @@ export class ZigProvider {
         const zigConfig = vscode.workspace.getConfiguration("zig");
         if (!zigPath) {
             await workspaceConfigUpdateNoThrow(zigConfig, "path", undefined, true);
+            this.set(null);
             return;
         }
         const newValue = this.resolveZigPathConfigOption(zigPath);
@@ -59,16 +60,9 @@ export class ZigProvider {
         const result = resolveExePathAndVersion(zigPath, "version");
         if ("message" in result) {
             vscode.window
-                .showErrorMessage(`Unexpected 'zig.path': ${result.message}`, "install Zig", "open settings")
+                .showErrorMessage(`Unexpected 'zig.path': ${result.message}`, "open settings")
                 .then(async (response) => {
                     switch (response) {
-                        case "install Zig":
-                            await workspaceConfigUpdateNoThrow(
-                                vscode.workspace.getConfiguration("zig"),
-                                "path",
-                                undefined,
-                            );
-                            break;
                         case "open settings":
                             await vscode.commands.executeCommand("workbench.action.openSettings", "zig.path");
                             break;

src/zigSetup.ts

@@ -24,8 +24,17 @@ let languageStatusItem: vscode.LanguageStatusItem;
 let versionManagerConfig: versionManager.Config;
 export let zigProvider: ZigProvider;
 
-/** Removes the `zig.path` config option. */
+/** Installs Zig, respecting existing `zig.path` config option. */
 async function installZig(context: vscode.ExtensionContext, temporaryVersion?: semver.SemVer) {
+    const existingPath = vscode.workspace.getConfiguration("zig").get<string>("path");
+    if (existingPath) {
+        const result = resolveExePathAndVersion(existingPath, "version");
+        if ("exe" in result) {
+            zigProvider.set(result);
+            return;
+        }
+    }
+
     let version = temporaryVersion;
 
     if (!version) {
@@ -43,7 +52,6 @@ async function installZig(context: vscode.ExtensionContext, temporaryVersion?: s
         // Lookup zig in $PATH
         const result = resolveExePathAndVersion("zig", "version");
         if ("exe" in result) {
-            await vscode.workspace.getConfiguration("zig").update("path", undefined, true);
             zigProvider.set(result);
             return;
         }
@@ -61,8 +69,6 @@ async function installZig(context: vscode.ExtensionContext, temporaryVersion?: s
 
     try {
         const exePath = await versionManager.install(versionManagerConfig, version);
-        const zigConfig = vscode.workspace.getConfiguration("zig");
-        await workspaceConfigUpdateNoThrow(zigConfig, "path", undefined, true);
         zigProvider.set({ exe: exePath, version: version });
     } catch (err) {
         zigProvider.set(null);
@@ -690,15 +696,26 @@ export async function setupZig(context: vscode.ExtensionContext) {
     const watcher2 = vscode.workspace.createFileSystemWatcher("**/build.zig.zon");
 
     const refreshZigInstallation = asyncDebounce(async () => {
-        if (!vscode.workspace.getConfiguration("zig").get<string>("path")) {
+        const zigPath = vscode.workspace.getConfiguration("zig").get<string>("path");
+        if (!zigPath) {
             await installZig(context);
         } else {
-            await updateStatus(context);
+            const result = zigProvider.resolveZigPathConfigOption(zigPath);
+            if (result) {
+                zigProvider.set(result);
+            }
         }
+        await updateStatus(context);
     }, 200);
 
-    if (!vscode.workspace.getConfiguration("zig").get<string>("path")) {
+    const zigPath = vscode.workspace.getConfiguration("zig").get<string>("path");
+    if (!zigPath) {
         await installZig(context);
+    } else {
+        const result = zigProvider.resolveZigPathConfigOption(zigPath);
+        if (result) {
+            zigProvider.set(result);
+        }
     }
     await updateStatus(context);
 
@@ -724,10 +741,12 @@ export async function setupZig(context: vscode.ExtensionContext) {
             if (change.affectsConfiguration("zig.path")) {
                 const result = zigProvider.resolveZigPathConfigOption();
                 if (result === undefined) return; // error message already reported
-                if (result !== null) {
+                if (result === null) {
+                    void refreshZigInstallation();
+                } else {
                     zigProvider.set(result);
+                    void updateStatus(context);
                 }
-                void refreshZigInstallation();
             }
         }),
         vscode.window.onDidChangeActiveTextEditor(onDidChangeActiveTextEditor),

src/zigUtil.ts

@@ -84,12 +84,9 @@ export function resolveExePathAndVersion(
         };
     }
 
-    const exePath = which.sync(cmd, { nothrow: true });
-    if (!exePath) {
-        if (!isAbsolute) {
-            return { message: `Could not find '${cmd}' in PATH.` };
-        }
+    let exePath: string | null = null;
 
+    if (isAbsolute) {
         const stats = fs.statSync(cmd, { throwIfNoEntry: false });
         if (!stats) {
             return {
@@ -103,9 +100,12 @@ export function resolveExePathAndVersion(
             };
         }
 
-        return {
-            message: `'${cmd}' is not an executable.`,
-        };
+        exePath = cmd;
+    } else {
+        exePath = which.sync(cmd, { nothrow: true });
+        if (!exePath) {
+            return { message: `Could not find '${cmd}' in PATH.` };
+        }
     }
 
     const version = getVersion(exePath, versionArg);

src/zls.ts

@@ -119,14 +119,9 @@ async function getZLSPath(context: vscode.ExtensionContext): Promise<{ exe: stri
         const result = resolveExePathAndVersion(zlsExePath, "--version");
         if ("message" in result) {
             vscode.window
-                .showErrorMessage(`Unexpected 'zig.zls.path': ${result.message}`, "install ZLS", "open settings")
+                .showErrorMessage(`Unexpected 'zig.zls.path': ${result.message}`, "open settings")
                 .then(async (response) => {
                     switch (response) {
-                        case "install ZLS":
-                            const zlsConfig = vscode.workspace.getConfiguration("zig.zls");
-                            await workspaceConfigUpdateNoThrow(zlsConfig, "enabled", "on", true);
-                            await workspaceConfigUpdateNoThrow(zlsConfig, "path", undefined);
-                            break;
                         case "open settings":
                             await vscode.commands.executeCommand("workbench.action.openSettings", "zig.zls.path");
                             break;