Add a way to enable only certain languages if not all are required to avoid some language specific crash.

Author: antaalt

package.json

@@ -174,6 +174,11 @@
       {
         "title": "Hlsl",
         "properties": {
+          "shader-validator.hlsl.enabled": {
+            "description": "Enable HLSL support for language server.",
+            "type": "boolean",
+            "default": true
+          },
           "shader-validator.hlsl.shaderModel": {
             "type": "string",
             "description": "Shader model targeted for DXC HLSL (DXC only support up to sm 6.0).",
@@ -233,6 +238,11 @@
       {
         "title": "Glsl",
         "properties": {
+          "shader-validator.glsl.enabled": {
+            "description": "Enable GLSL support for language server.",
+            "type": "boolean",
+            "default": true
+          },
           "shader-validator.glsl.targetClient": {
             "type": "string",
             "description": "Shader client for GLSL.",
@@ -277,6 +287,16 @@
           }
         }
       },
+      {
+        "title": "Wgsl",
+        "properties": {
+          "shader-validator.wgsl.enabled": {
+            "description": "Enable WGSL support for language server.",
+            "type": "boolean",
+            "default": true
+          }
+        }
+      },
       {
         "title": "Debug",
         "properties": {

src/client.ts

@@ -368,13 +368,23 @@ export class ShaderLanguageClient {
         }
     }
     private getClientOption() {
+        // Pass languages that should be enabled to server.
+        let hlslSupported = vscode.workspace.getConfiguration("shader-validator").get<boolean>("hlsl.enabled")!;
+        let glslSupported = vscode.workspace.getConfiguration("shader-validator").get<boolean>("glsl.enabled")!;
+        let wgslSupported = vscode.workspace.getConfiguration("shader-validator").get<boolean>("wgsl.enabled")!;
+        let documentSelector = [];
+        if (hlslSupported) {
+            documentSelector.push({ scheme: 'file', language: 'hlsl' });
+        }
+        if (glslSupported) {
+            documentSelector.push({ scheme: 'file', language: 'glsl' });
+        }
+        if (wgslSupported) {
+            documentSelector.push({ scheme: 'file', language: 'wgsl' });
+        }
         const clientOptions: LanguageClientOptions = {
             // Register the server for shader documents
-            documentSelector: [
-                { scheme: 'file', language: 'hlsl' },
-                { scheme: 'file', language: 'glsl' },
-                { scheme: 'file', language: 'wgsl' },
-            ],
+            documentSelector: documentSelector,
             outputChannel: this.channel ? this.channel : undefined,
             traceOutputChannel: this.channel ? this.channel : undefined,
             middleware: getMiddleware(),
@@ -384,10 +394,26 @@ export class ShaderLanguageClient {
         return clientOptions;
     }
     private getServerArg(): string[] {
-        return [
+        let hlslSupported = vscode.workspace.getConfiguration("shader-validator").get<boolean>("hlsl.enabled")!;
+        let glslSupported = vscode.workspace.getConfiguration("shader-validator").get<boolean>("glsl.enabled")!;
+        let wgslSupported = vscode.workspace.getConfiguration("shader-validator").get<boolean>("wgsl.enabled")!;
+        let commonArgs = [
             "--config",
             getConfigurationAsString()
         ];
+        if (hlslSupported) {
+            commonArgs.push("--hlsl");
+        }
+        if (glslSupported) {
+            commonArgs.push("--glsl");
+        }
+        if (wgslSupported) {
+            commonArgs.push("--wgsl");
+        }
+        if (!hlslSupported && !glslSupported && !wgslSupported) {
+            vscode.window.showWarningMessage("No language enabled for shader-language-server. Server will still start.");
+        }
+        return commonArgs;
     }
     private getServerEnv() {
         const trace = vscode.workspace.getConfiguration("shader-validator").get<string>("trace.server");

src/extension.ts

@@ -139,8 +139,21 @@ export async function activate(context: vscode.ExtensionContext)
     context.subscriptions.push(
         vscode.workspace.onDidChangeConfiguration(async (event : vscode.ConfigurationChangeEvent) => {
             if (event.affectsConfiguration("shader-validator")) {
-                if (event.affectsConfiguration("shader-validator.trace.server") || 
-                    event.affectsConfiguration("shader-validator.serverPath")) {
+                let configurationRequiringAServerRestart = [
+                    "shader-validator.trace.server",
+                    "shader-validator.serverPath",
+                    "shader-validator.hlsl.enabled",
+                    "shader-validator.glsl.enabled",
+                    "shader-validator.wgsl.enabled",
+                ];
+                let requiresRestart = false;
+                for (let configuration of configurationRequiringAServerRestart) {
+                    if (event.affectsConfiguration(configuration)) {
+                        requiresRestart = true;
+                        break;
+                    }
+                }
+                if (requiresRestart) {
                     server.restart(context);
                 } else {
                     await server.sendNotification(DidChangeConfigurationNotification.type, {