PT #153612030 Don't show tools.jar message for Java 9

This commit is contained in:
BoykoAlex
2017-12-29 13:22:00 -05:00
parent 2c74a45d76
commit 16888fe1fe
2 changed files with 12 additions and 8 deletions

View File

@@ -33,7 +33,7 @@ export interface ActivatorOptions {
clientOptions: LanguageClientOptions;
launcher: (context: VSCode.ExtensionContext) => string;
jvmHeap?: string;
classpath?: (context: VSCode.ExtensionContext) => string[];
classpath?: (context: VSCode.ExtensionContext, javaVersion: number) => string[];
}
export function activate(options: ActivatorOptions, context: VSCode.ExtensionContext): Promise<LanguageClient> {
@@ -98,7 +98,7 @@ export function activate(options: ActivatorOptions, context: VSCode.ExtensionCon
'-Dorg.slf4j.simpleLogger.logFile=' + logfile
];
if (options.classpath) {
const classpath = options.classpath(context);
const classpath = options.classpath(context, version);
if (classpath) {
args.push('-cp');
args.push(classpath.join(Path.delimiter));