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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ export interface ActivatorOptions {
clientOptions: LanguageClientOptions; clientOptions: LanguageClientOptions;
launcher: (context: VSCode.ExtensionContext) => string; launcher: (context: VSCode.ExtensionContext) => string;
jvmHeap?: 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> { 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 '-Dorg.slf4j.simpleLogger.logFile=' + logfile
]; ];
if (options.classpath) { if (options.classpath) {
const classpath = options.classpath(context); const classpath = options.classpath(context, version);
if (classpath) { if (classpath) {
args.push('-cp'); args.push('-cp');
args.push(classpath.join(Path.delimiter)); args.push(classpath.join(Path.delimiter));

16
vscode-extensions/vscode-boot-java/lib/Main.ts
View File

@@ -22,16 +22,20 @@ export function activate(context: VSCode.ExtensionContext) {
CONNECT_TO_LS: false, CONNECT_TO_LS: false,
extensionId: 'boot-java', extensionId: 'boot-java',
launcher: (context: VSCode.ExtensionContext) => 'org.springframework.boot.loader.JarLauncher', launcher: (context: VSCode.ExtensionContext) => 'org.springframework.boot.loader.JarLauncher',
classpath: (context: VSCode.ExtensionContext) => { classpath: (context: VSCode.ExtensionContext, javaVersion: number) => {
const classpath = [ const classpath = [
Path.resolve(context.extensionPath, 'jars/language-server.jar') Path.resolve(context.extensionPath, 'jars/language-server.jar')
]; ];
const toolsJar = commons.findJvmFile('lib', 'tools.jar');
if (toolsJar) { if (javaVersion < 9) {
classpath.push(toolsJar); const toolsJar = commons.findJvmFile('lib', 'tools.jar');
} else { if (toolsJar) {
VSCode.window.showWarningMessage('JAVA_HOME environment variable points either to JRE or JDK missing "lib/tools.jar" hence Boot Hints are unavailable'); classpath.push(toolsJar);
} else {
VSCode.window.showWarningMessage('JAVA_HOME environment variable points either to JRE or JDK missing "lib/tools.jar" hence Boot Hints are unavailable');
}
} }
return classpath; return classpath;
}, },
clientOptions: { clientOptions: {