maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add extra options when launching Java langserver if JDK's version > 8 (#36100)

Browse source 
* Add extra options when launching Java langserver if JDK's version > 8

* Rename to needModuleArguments

* Add more comments about extra arguments
This commit is contained in:
Pengcheng Xu 2019-05-07 15:49:39 +08:00 committed by GitHub
parent 8fe1eb2086
commit 7711b652cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
x-pack/plugins/code/server/lsp/java_launcher.ts
View file

@ -19,6 +19,7 @@ import { RequestExpander } from './request_expander';
export class JavaLauncher implements ILanguageServerLauncher {
private isRunning: boolean = false;
private needModuleArguments: boolean = true;
constructor(
readonly targetHost: string,
readonly options: ServerOptions,
@ -115,8 +116,16 @@ export class JavaLauncher implements ILanguageServerLauncher {
if (this.getSystemJavaHome()) {
const javaHomePath = this.getSystemJavaHome();
if (await this.checkJavaVersion(javaHomePath)) {
const javaVersion = await this.getJavaVersion(javaHomePath);
if (javaVersion > 8) {
// for JDK's versiob > 8, we need extra arguments as default
return javaHomePath;
} else if (javaVersion === 8) {
// JDK's version = 8, needn't extra arguments
this.needModuleArguments = false;
return javaHomePath;
} else {
// JDK's version < 8, use bundled JDK instead, whose version > 8, so need extra arguments as default
}
}
@ -142,22 +151,32 @@ export class JavaLauncher implements ILanguageServerLauncher {
process.platform === 'win32' ? 'java.exe' : 'java'
);
let params: string[] = [
'-Declipse.application=org.elastic.jdt.ls.core.id1',
'-Dosgi.bundles.defaultStartLevel=4',
'-Declipse.product=org.elastic.jdt.ls.core.product',
'-Dlog.level=ALL',
'-noverify',
'-Xmx4G',
'-jar',
path.resolve(installationPath, launchersFound[0]),
'-configuration',
this.options.jdtConfigPath,
'-data',
this.options.jdtWorkspacePath,
];
if (this.needModuleArguments) {
params.push('--add-modules=ALL-SYSTEM',
'--add-opens',
'java.base/java.util=ALL-UNNAMED',
'--add-opens',
'java.base/java.lang=ALL-UNNAMED');
}
const p = spawn(
javaPath,
[
'-Declipse.application=org.elastic.jdt.ls.core.id1',
'-Dosgi.bundles.defaultStartLevel=4',
'-Declipse.product=org.elastic.jdt.ls.core.product',
'-Dlog.level=ALL',
'-noverify',
'-Xmx4G',
'-jar',
path.resolve(installationPath, launchersFound[0]),
'-configuration',
this.options.jdtConfigPath,
'-data',
this.options.jdtWorkspacePath,
],
params,
{
detached: false,
stdio: 'pipe',
@ -201,7 +220,7 @@ export class JavaLauncher implements ILanguageServerLauncher {
return '';
}
private checkJavaVersion(javaHome: string): Promise<boolean> {
private getJavaVersion(javaHome: string): Promise<number> {
return new Promise((resolve, reject) => {
execFile(
path.resolve(javaHome, 'bin', process.platform === 'win32' ? 'java.exe' : 'java'),
@ -209,11 +228,7 @@ export class JavaLauncher implements ILanguageServerLauncher {
{},
(error, stdout, stderr) => {
const javaVersion = this.parseMajorVersion(stderr);
if (javaVersion < 8) {
resolve(false);
} else {
resolve(true);
}
resolve(javaVersion);
}
);
});