Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support VSCode extensions launch with JDK9

Browse Source
This commit is contained in:
BoykoAlex
2017-10-11 11:42:10 -04:00
parent e9010d1588
commit b7a3b4649b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vscode-extensions/commons-vscode/src/launch-util.ts
View File

@@ -66,12 +66,12 @@ export function activate(options: ActivatorOptions, context: VSCode.ExtensionCon
log("Found java exe: " + javaExecutablePath);
return isJava8(javaExecutablePath).then(eight => {
if (!eight) {
VSCode.window.showErrorMessage('Java-based Language Server requires Java 8 (using ' + javaExecutablePath + ')');
return javaVersion(javaExecutablePath).then(version => {
if (!version) {
VSCode.window.showErrorMessage('Java-based Language Server requires Java 8 or higher (using ' + javaExecutablePath + ')');
return;
}
log("isJavaEight => true");
log("isJavaEightOrHigher => true");
function createServer(): Promise<StreamInfo> {
return new Promise((resolve, reject) => {
@@ -188,11 +188,16 @@ function setupLanguageClient(context: VSCode.ExtensionContext, createServer: Ser
});
}
function isJava8(javaExecutablePath: string): Promise<boolean> {
function javaVersion(javaExecutablePath: string): Promise<number> {
return new Promise((resolve, reject) => {
let result = ChildProcess.execFile(javaExecutablePath, ['-version'], {}, (error, stdout, stderr) => {
let eight = stderr.indexOf('1.8') >= 0;
resolve(eight);
ChildProcess.execFile(javaExecutablePath, ['-version'], {}, (error, stdout, stderr) => {
if (stderr.indexOf('1.8') >= 0) {
resolve(8);
} else if (stderr.indexOf('java version "9"') >= 0) {
resolve(9);
} else {
resolve(0);
}
});
});
}