Build changes and minor tweaks (#6)

* Add VSCode workspace files for local development

* Minor code cleanup

* Re-label "Restart LSP Server" command for clarity

* Tweak how output channels are handled when running Brioche builds

* Tweak "Show output" button labels

* Add missing new line

---------

Co-authored-by: Ashley Hutson <[email protected]>

Author: kylewlacy

.gitignore

@@ -3,3 +3,6 @@ dist
 node_modules
 .vscode-test/
 *.vsix
+
+# Include .vscode even when excluded globally
+!.vscode

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// for the documentation about the extensions.json format
+	"recommendations": [
+		"dbaeumer.vscode-eslint",
+        "ms-vscode.extension-test-runner"
+	]
+}

.vscode/launch.json

@@ -0,0 +1,21 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Run Extension",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"preLaunchTask": "${defaultBuildTask}"
+		}
+	]
+}

.vscode/settings.json

@@ -0,0 +1,11 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "files.exclude": {
+        "out": false // set this to true to hide the "out" folder with the compiled JS files
+    },
+    "search.exclude": {
+        "out": true // set this to false to include "out" folder in search results
+    },
+    // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
+    "typescript.tsc.autoDetect": "off"
+}

.vscode/tasks.json

@@ -0,0 +1,20 @@
+// See https://go.microsoft.com/fwlink/?LinkId=733558
+// for the documentation about the tasks.json format
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "npm",
+			"script": "watch",
+			"problemMatcher": "$tsc-watch",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}

package.json

@@ -25,7 +25,7 @@
     "commands": [
       {
         "command": "brioche-vscode.restartLsp",
-        "title": "Brioche LSP: Restart LSP Server"
+        "title": "Brioche: Restart LSP Server"
       },
       {
         "command": "brioche-vscode.runBriocheBuild",

src/extension.ts

@@ -35,8 +35,9 @@ let lspOutputChannel: OutputChannel;
 function getBriocheBinaryPath(): string {
   const configPath = workspace
     .getConfiguration("brioche")
-    .get<string>("binaryPath");
-  return configPath && configPath.trim() ? configPath.trim() : "brioche";
+    .get<string>("binaryPath")
+    ?.trim();
+  return configPath || "brioche";
 }
 
 /**
@@ -67,22 +68,7 @@ function getBriocheLogLevel(): string | undefined {
   const logLevel =
     workspace.getConfiguration("brioche").get<string>("log.level") || "off";
 
-  switch (logLevel) {
-    case "off":
-      return "brioche=off";
-    case "error":
-      return "brioche=error";
-    case "warn":
-      return "brioche=warn";
-    case "info":
-      return "brioche=info";
-    case "debug":
-      return "brioche=debug";
-    case "trace":
-      return "brioche=trace";
-    default:
-      return undefined;
-  }
+  return `brioche=${logLevel}`;
 }
 
 async function startClient(): Promise<void> {
@@ -98,17 +84,12 @@ async function startClient(): Promise<void> {
     const rustLogLevel = getBriocheLogLevel();
 
     // Build environment variables for LSP
-    let env = {
+    const env = {
       ...process.env,
+      ...(rustLogLevel ? {RUST_LOG: rustLogLevel} : {}),
+      ...lspEnvVars,
     };
 
-    // Add RUST_LOG if specified
-    if (rustLogLevel) {
-      env["RUST_LOG"] = rustLogLevel;
-    }
-
-    env = { ...env, ...lspEnvVars };
-
     // Configure server options
     const serverOptions: ServerOptions = {
       command: briochePath,
@@ -288,13 +269,12 @@ async function runBriocheBuild(): Promise<void> {
           process.stdout?.on("data", (data: Buffer) => {
             const output = data.toString();
             outputChannel.append(output);
-            outputChannel.show(true); // Force the output channel to remain visible
             progress.report({ message: "Building project..." });
           });
 
           process.stderr?.on("data", (data: Buffer) => {
             outputChannel.append(data.toString());
-            outputChannel.show(true); // Show output immediately for errors
+            progress.report({ message: "Building project..." });
           });
 
           token.onCancellationRequested(() => {
@@ -304,15 +284,39 @@ async function runBriocheBuild(): Promise<void> {
           });
 
           process.on("close", (code: number | null) => {
+            const showOutputButton = "Show output";
+
             if (code === 0) {
               outputChannel.appendLine("\nBuild completed successfully!");
-              window.showInformationMessage("Build completed successfully!");
+              window.showInformationMessage("Build completed successfully!", showOutputButton).then((item) => {
+                // Show the output if the user clicks "Show output"
+                if (item === showOutputButton) {
+                  outputChannel.show(true);
+                }
+              });
+              resolve();
+            } else if (code != null) {
+              const message = `Build failed with exit code ${code}`;
+              outputChannel.appendLine(`\n${message}`);
+
+              window.showErrorMessage(message, showOutputButton).then((item) => {
+                // Show the output if the user clicks "Show output"
+                if (item === showOutputButton) {
+                  outputChannel.show(true);
+                }
+              });
               resolve();
             } else {
-              const message = `Build failed with code ${code}`;
+              const message = "Build stopped";
               outputChannel.appendLine(`\n${message}`);
-              window.showErrorMessage(message);
-              reject(new Error(message));
+
+              window.showErrorMessage(message, showOutputButton).then((item) => {
+                // Show the output if the user clicks "Show output"
+                if (item === showOutputButton) {
+                  outputChannel.show(true);
+                }
+              });
+              resolve();
             }
           });