From 70a9629dec333f1af53d495e686348752d079744 Mon Sep 17 00:00:00 2001
From: SeeBasTStick <sebastian.stock@hhu.de>
Date: Wed, 12 Aug 2020 11:29:46 +0200
Subject: [PATCH] prepared version 1.0
---
README.md | 2 +-
src/extension.ts | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 9b0c1c6..5ace06b 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 d74b53c..720ad80 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
--
GitLab