package.json

@@ -2,7 +2,7 @@
     "name": "vhdl-tool",
     "displayName": "VHDL Language Server",
     "description": "Language Server Protocol for VHDL via VHDL-Tool",
-    "version": "0.0.2",
+    "version": "0.0.5",
     "license": "MIT",
     "publisher": "vhdl-tool",
     "homepage": "https://www.vhdltool.com",

src/extension.ts

@@ -1,29 +1,48 @@
 'use strict';
 
 import * as path from 'path';
-import { workspace, Disposable, ExtensionContext } from 'vscode';
+import { workspace, Disposable, ExtensionContext, window } from 'vscode';
 import { LanguageClient, LanguageClientOptions, SettingMonitor, ServerOptions, TransportKind } from 'vscode-languageclient';
+import * as child_process from 'child_process';
+import * as fs from 'fs';
+
+/*
+ * Checks if the executable is on the PATH
+ */
+export function executableExists(exe: string): boolean {
+  const isWindows = process.platform === 'win32';
+  const cmd: string = isWindows ? 'where' : 'which';
+  const out = child_process.spawnSync(cmd, [exe]);
+  return out.status === 0 || (isWindows && fs.existsSync(exe));
+}
 
 export function activate(context: ExtensionContext) {
 
-	let serverPath   = context.asAbsolutePath(path.join('.', 'vhdltool-wrapper.sh'));
-	
-	// If the extension is launched in debug mode then the debug server options are used
-	// Otherwise the run options are used
-	let serverOptions: ServerOptions = {
-		run:   { command: serverPath },
-		debug: { command: serverPath }
-	} 
-	
-	// Options to control the language client
-	let clientOptions: LanguageClientOptions = {
-		// Register the server for VHDL files
-		documentSelector: ['vhdl'],
+	if (executableExists('vhdl-tool')) {
+
+		let args: string[] = ['lsp'];
+
+		// If the extension is launched in debug mode then the debug server options are used
+		// Otherwise the run options are used
+		let serverOptions: ServerOptions = {
+			run:   { command: 'vhdl-tool', args},
+			debug: { command: 'vhdl-tool', args}
+		} 
+		
+		// Options to control the language client
+		let clientOptions: LanguageClientOptions = {
+			// Register the server for VHDL files
+			documentSelector: ['vhdl'],
+		}
+		
+		// Create the language client and start the client.
+		let disposable = new LanguageClient('vhdltool', 'Language Server VHDL', serverOptions, clientOptions).start();
+		
+		// Push the disposable to the context's subscriptions so that the client can be deactivated on extension deactivation
+		context.subscriptions.push(disposable);
+	} else {
+		const notInstalledMsg: string =
+			'Please download VHDL-Tool from https://www.vhdltool.com/download and place it somewhere in your $PATH';
+		window.showErrorMessage(notInstalledMsg);
 	}
-	
-	// Create the language client and start the client.
-	let disposable = new LanguageClient('vhdltool', 'Language Server VHDL', serverOptions, clientOptions).start();
-	
-	// Push the disposable to the context's subscriptions so that the client can be deactivated on extension deactivation
-	context.subscriptions.push(disposable);
 }

vhdltool-wrapper.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-export WRAPPER_PATH=`which vhdl-tool`
-
-if [ "X" = "X$WRAPPER_PATH" ]; then
-  echo "Content-Length: 100\r\n\r"
-  echo '{"jsonrpc":"2.0","id":1,"error":{"code":-32099,"message":"Cannot find vhdl-tool executable in $PATH"}}'
-  exit 1
-fi
-
-vhdl-tool lsp