diff --git a/README.md b/README.md index 9b0c1c66f7b21d20046487dd324dc7db4c8c2e7c..5ace06b58be044c65dfa9990d21f52fbfe2874db 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Compiler support for B via ProB. You need a nightly build of ProB to fully use t ## Requirements - Latest nightly build of ProB. -- Java v.11 or higher +- Java v.8 or higher. By default java home is considerd to be accesseble by 'java' in terminal/powershell ## Extension Settings diff --git a/src/extension.ts b/src/extension.ts index d74b53cf0417bde029842f7a6e9fdf13c77c4fe3..720ad8043933e0403328abb30b92ad4c0afb6815 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -12,21 +12,27 @@ import { LanguageClientOptions, ServerOptions, } from 'vscode-languageclient'; - +import fs from "fs" +import * as path from 'path' let client: LanguageClient; export function activate(context: ExtensionContext) { + const serverHome = context.asAbsolutePath(path.join('node_modules', 'b-language-server', 'build', 'libs', 'b-language-server-all.jar')) + //const serverHome = "/home/sebastian/IdeaProjects/b-language-server/build/libs/b-language-server-all.jar" + const javaHome : string = workspace.getConfiguration("common").get("javaHome") + let serverOptions: ServerOptions = { - command: '/usr/bin/java', - args: [ "-jar", "./node_modules/b-language-server/build/libs/b-language-server-all.jar"] + command: javaHome, + args: [ "-jar", serverHome] }; let debugChannle = window.createOutputChannel("ProB language server") - + debugChannle.appendLine("starting server at <" + javaHome + " -jar " + serverHome + ">") + debugChannle.appendLine("fs exits " + fs.existsSync(serverHome)) // Options to control the language client let clientOptions: LanguageClientOptions = { // Register the server for B files