Add a status bar for the extension

Author: antaalt

README.md

@@ -139,8 +139,11 @@ This extension contributes the following settings:
 
 ## Commands
 
-*   `shader-validator.restartServer`: Restart the server if you have any issue
+*   `shader-validator.startServer`: Start the server if it was stopped or crashed.
+*   `shader-validator.stopServer`: Stop the server.
+*   `shader-validator.restartServer`: Restart the server if you have any issue.
 *   `shader-validator.addCurrentFileVariant`: Add a variant to the current file.
+*   `shader-validator.showLogs`: Open the extension log window.
 *   `shader-validator.dumpDependency`: Print dependency tree in logs. mostly for debug.
 *   `shader-validator.dumpAst`: Print internal ast in logs. mostly for debug.
 

package.json

@@ -295,11 +295,29 @@
       }
     ],
     "commands": [
+      {
+        "command": "shader-validator.showLogs",
+        "title": "Show logs",
+        "category": "Shader validator",
+        "icon": "$(terminal)"
+      },
+      {
+        "command": "shader-validator.startServer",
+        "title": "Start server",
+        "category": "Shader validator",
+        "icon": "$(debug-start)"
+      },
+      {
+        "command": "shader-validator.stopServer",
+        "title": "Stop server",
+        "category": "Shader validator",
+        "icon": "$(debug-stop)"
+      },
       {
         "command": "shader-validator.restartServer",
         "title": "Restart server",
         "category": "Shader validator",
-        "icon": "$(check)"
+        "icon": "$(debug-restart)"
       },
       {
         "command": "shader-validator.validateFile",

src/extension.ts

@@ -2,10 +2,11 @@
 // Import the module and reference it with the alias vscode in your code below
 import * as vscode from 'vscode';
 
-import { createLanguageClient, getServerPlatform, ServerPlatform, ShaderLanguageClient } from './validator';
+import { createLanguageClient, getServerPlatform, ServerPlatform, ServerStatus, ShaderLanguageClient } from './validator';
 import { dumpAstRequest, dumpDependencyRequest } from './request';
 import { ShaderVariantTreeDataProvider } from './shaderVariant';
-import { DidChangeConfigurationNotification, LanguageClient } from 'vscode-languageclient';
+import { DidChangeConfigurationNotification, LanguageClient, Trace } from 'vscode-languageclient';
+import { ShaderStatusBar } from './view/shaderStatusBar';
 
 export let sidebar: ShaderVariantTreeDataProvider;
 
@@ -41,34 +42,56 @@ export async function activate(context: vscode.ExtensionContext)
     }
 
     // Create language client
-    const server = new ShaderLanguageClient;
+    const server = new ShaderLanguageClient(context);
     context.subscriptions.push(server);
-    const isInitialized = await server.start(context);
-    if (!isInitialized) {
-        console.error("Failed to launch shader-validator language server.");
-        return;
-    }
-    let supportedLangId = ["hlsl", "glsl", "wgsl"];
+    const serverStatus = await server.start(context);
 
     // Create sidebar
     sidebar = new ShaderVariantTreeDataProvider(context, server);
+    context.subscriptions.push(sidebar);
+
+    // Create status bar
+    let statusBar = new ShaderStatusBar(context, server);
+    context.subscriptions.push(statusBar);
 
     // Subscribe commands
     context.subscriptions.push(vscode.commands.registerCommand("shader-validator.validateFile", (uri: vscode.Uri) => {
         //client.sendRequest()
         vscode.window.showInformationMessage("Cannot validate file manually for now");
     }));
-    context.subscriptions.push(vscode.commands.registerCommand("shader-validator.restartServer", (uri: vscode.Uri) => {
-        server.restart(context);
+    context.subscriptions.push(vscode.commands.registerCommand("shader-validator.startServer", async () => {
+        await server.start(context);
+        statusBar.updateStatusBar();
+    }));
+    context.subscriptions.push(vscode.commands.registerCommand("shader-validator.stopServer", async () => {
+        await server.stop();
+        statusBar.updateStatusBar();
+    }));
+    context.subscriptions.push(vscode.commands.registerCommand("shader-validator.restartServer", async () => {
+        await server.restart(context);
+        statusBar.updateStatusBar();
+    }));
+    context.subscriptions.push(vscode.commands.registerCommand("shader-validator.showLogs", () => {
+        const level = ShaderLanguageClient.getTraceLevel();
+        if (level == Trace.Off) {
+            vscode.window.showWarningMessage("Server trace is set to off. Set setting shader-validator.trace.server to messages or verbose to view logs.");
+        } else {
+            server.showLogs();
+        }
     }));
     context.subscriptions.push(vscode.commands.registerCommand("shader-validator.dumpAst", () => {
         let activeTextEditor = vscode.window.activeTextEditor;
-        if (activeTextEditor && activeTextEditor.document.uri.scheme === 'file' && supportedLangId.includes(activeTextEditor.document.languageId)) {            
+        if (activeTextEditor && activeTextEditor.document.uri.scheme === 'file' && ShaderLanguageClient.isSupportedLangId(activeTextEditor.document.languageId)) {
             server.sendRequest(dumpAstRequest, {
                 uri: server.uriAsString(activeTextEditor.document.uri)
             }).then((value: string | null) => {
                 console.info(value);
-                server.log(value || "No AST to dump");
+                if (value) {
+                    server.log(value);
+                    server.showLogs();
+                } else {
+                    server.log("No AST to dump");
+                }
             }, (reason: any) => {
                 server.log("Failed to get ast: " + reason);
             });
@@ -78,12 +101,17 @@ export async function activate(context: vscode.ExtensionContext)
     }));
     context.subscriptions.push(vscode.commands.registerCommand("shader-validator.dumpDependency", () => {
         let activeTextEditor = vscode.window.activeTextEditor;
-        if (activeTextEditor && activeTextEditor.document.uri.scheme === 'file' && supportedLangId.includes(activeTextEditor.document.languageId)) {            
+        if (activeTextEditor && activeTextEditor.document.uri.scheme === 'file' && ShaderLanguageClient.isSupportedLangId(activeTextEditor.document.languageId)) {
             server.sendRequest(dumpDependencyRequest, {
                 uri: server.uriAsString(activeTextEditor.document.uri)
             }).then((value: string | null) => {
                 console.info(value);
-                server.log(value || "No deps tree to dump");
+                if (value) {
+                    server.log(value);
+                    server.showLogs();
+                } else {
+                    server.log("No deps tree to dump");
+                }
             }, (reason: any) => {
                 server.log("Failed to get deps tree: " + reason);
             });

src/shaderVariant.ts

@@ -202,15 +202,13 @@ export class ShaderVariantTreeDataProvider implements vscode.TreeDataProvider<Sh
             borderStyle: 'solid',
         });
         context.subscriptions.push(vscode.commands.registerCommand("shader-validator.addCurrentFile", (): void => {
-            let supportedLangId = ["hlsl", "glsl", "wgsl"];
-            if (vscode.window.activeTextEditor && supportedLangId.includes(vscode.window.activeTextEditor.document.languageId)) {
+            if (vscode.window.activeTextEditor && ShaderLanguageClient.isSupportedLangId(vscode.window.activeTextEditor.document.languageId)) {
                 this.open(vscode.window.activeTextEditor.document.uri);
             }
             this.save();
         }));
         context.subscriptions.push(vscode.commands.registerCommand("shader-validator.addCurrentFileVariant", async () => {
-            let supportedLangId = ["hlsl", "glsl", "wgsl"];
-            if (vscode.window.activeTextEditor && supportedLangId.includes(vscode.window.activeTextEditor.document.languageId)) {
+            if (vscode.window.activeTextEditor && ShaderLanguageClient.isSupportedLangId(vscode.window.activeTextEditor.document.languageId)) {
                 let entryPoint = await this.promptEntryPoint();
                 if (entryPoint) {
                     let stage = await this.promptShaderStage();
@@ -302,6 +300,9 @@ export class ShaderVariantTreeDataProvider implements vscode.TreeDataProvider<Sh
             }
         }));
         this.updateDependencies();
+    }
+    dispose() {
+        
     }
     private getActiveVariant() : ShaderVariant | null {
         for (const file of this.files.values()) {