Modify installation model, fix mkdirp issue

Closes #43

Author: SuperAuguste

CHANGELOG.md

@@ -37,3 +37,7 @@ instead of using `zls.json`!
 ## 1.1.0
 
 > You can now install zls directly from the extension! Enjoy!
+
+## 1.1.1
+
+> Bug fixes, more streamlined installation

README.md

@@ -6,9 +6,9 @@
 
 ## Installing
 
-Simply install the extension and follow the instructions in the "It seems that we couldn't find your zls install" popup if it appears - we recommend clicking the "Install zls for me!" button if you're a typical user that's not planning to contribute to zls itself. :)
+Simply install the extension and you'll be good to go!
 
-If you *aren't* a typical user, follow the instructions [https://github.com/zigtools/zls#from-source](here) and then add zls to your system PATH or specify the path of the zls binary with the `zls.path` option in VSCode!
+If you want to build zls yourself, follow the instructions [https://github.com/zigtools/zls#from-source](here) and then specify the path of the zls binary with the `zls.path` option in VSCode!
 
 Happy Zig-ing!
 
@@ -51,3 +51,7 @@ instead of using `zls.json`!
 ### 1.1.0
 
 > You can now install zls directly from the extension! Enjoy!
+
+### 1.1.1
+
+> Bug fixes, more streamlined installation

package-lock.json

@@ -11,7 +11,7 @@
 		"type": "git",
 		"url": "https://github.com/zigtools/zls-vscode"
 	},
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"engines": {
 		"vscode": "^1.68.0"
 	},
@@ -176,7 +176,9 @@
 		"test": "node ./out/test/runTest.js"
 	},
 	"dependencies": {
+		"@types/mkdirp": "^1.0.2",
 		"axios": "^0.27.2",
+		"mkdirp": "^1.0.4",
 		"vscode-languageclient": "8.0.2-next.5"
 	},
 	"devDependencies": {

package.json

@@ -7,7 +7,8 @@ import {
   ServerOptions
 } from "vscode-languageclient/node";
 import axios from "axios";
-import { existsSync, mkdirSync, writeFileSync } from "fs";
+import { existsSync, writeFileSync } from "fs";
+import * as mkdirp from "mkdirp";
 
 let outputChannel: vscode.OutputChannel;
 let client: LanguageClient | null = null;
@@ -46,23 +47,30 @@ async function installExecutable(context: ExtensionContext): Promise<void> {
     return;
   }
 
-  const buildRunner = (await axios.get(`${downloadsRoot}/${def}/bin/build_runner.zig`)).data;
-  const exe = (await axios.get(`${downloadsRoot}/${def}/bin/zls${def.endsWith("windows") ? ".exe" : ""}`, {
-    responseType: "arraybuffer"
-  })).data;
-
-  const installDir = vscode.Uri.joinPath(context.globalStorageUri, "zls_install");
-  if (!existsSync(installDir.fsPath))
-    mkdirSync(installDir.fsPath);
-
-  writeFileSync(vscode.Uri.joinPath(installDir, `build_runner.zig`).fsPath, buildRunner);
-  writeFileSync(vscode.Uri.joinPath(installDir, `zls${def.endsWith("windows") ? ".exe" : ""}`).fsPath, exe, "binary");
-
-  let config = workspace.getConfiguration("zls");
-  await config.update("path", vscode.Uri.joinPath(installDir, `zls${def.endsWith("windows") ? ".exe" : ""}`).fsPath, true);
-
-  window.showInformationMessage("zls has been installed and your `zls.path` has been set accordingly!");
-  startClient(context);
+  return window.withProgress({
+    title: "Installing zls...",
+    location: vscode.ProgressLocation.Notification,
+  }, async progress => {
+    progress.report({message: "Downloading build runner..."});
+    const buildRunner = (await axios.get(`${downloadsRoot}/${def}/bin/build_runner.zig`)).data;
+    progress.report({message: "Downloading zls executable..."});
+    const exe = (await axios.get(`${downloadsRoot}/${def}/bin/zls${def.endsWith("windows") ? ".exe" : ""}`, {
+      responseType: "arraybuffer"
+    })).data;
+
+    progress.report({message: "Installing..."});
+    const installDir = vscode.Uri.joinPath(context.globalStorageUri, "zls_install");
+    if (!existsSync(installDir.fsPath))
+      mkdirp.sync(installDir.fsPath);
+
+    writeFileSync(vscode.Uri.joinPath(installDir, `build_runner.zig`).fsPath, buildRunner);
+    writeFileSync(vscode.Uri.joinPath(installDir, `zls${def.endsWith("windows") ? ".exe" : ""}`).fsPath, exe, "binary");
+
+    let config = workspace.getConfiguration("zls");
+    await config.update("path", vscode.Uri.joinPath(installDir, `zls${def.endsWith("windows") ? ".exe" : ""}`).fsPath, true);
+
+    startClient(context);
+  });
 }
 
 export function activate(context: ExtensionContext) {
@@ -115,15 +123,8 @@ function startClient(context: ExtensionContext): Promise<void> {
   return new Promise<void>(resolve => {
     if (client)
       client.start().catch(err => {
-        window.showInformationMessage(
-          "It seems that we couldn't find your zls install! Either: Add zls to your system PATH, specify where to find zls with the `zls.path` option, or automatically install zls with the button below (recommended!)",
-          {},
-          "Install zls for me!",
-        ).then(value => {
-          if (value) {
-            installExecutable(context);
-          }
-        });
+        window.showInformationMessage("We're installing zls for you! Feel free to change your `zls.path` later if you so wish!");
+        installExecutable(context);
         client = null;
       }).then(() => {
         if (client) {