From abf9e2325ee2e3beb33f344018c21bd4cd2ef82b Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 15 Feb 2018 16:07:36 -0800 Subject: [PATCH] Add jdk-find logic to vscode-spring-boot launcher also give more heap As this is now a merge of boot-properties and boot-java support it needs those things, just like boot-java used to need them. --- vscode-extensions/vscode-spring-boot/lib/Main.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/vscode-extensions/vscode-spring-boot/lib/Main.ts b/vscode-extensions/vscode-spring-boot/lib/Main.ts index bde9bb3a0..17f8e2ecc 100644 --- a/vscode-extensions/vscode-spring-boot/lib/Main.ts +++ b/vscode-extensions/vscode-spring-boot/lib/Main.ts @@ -23,7 +23,19 @@ export function activate(context: VSCode.ExtensionContext) { CONNECT_TO_LS: false, extensionId: 'vscode-spring-boot', launcher: (context: VSCode.ExtensionContext) => Path.resolve(context.extensionPath, 'jars/language-server.jar'), - jvmHeap: "160m", + classpath: (context: VSCode.ExtensionContext, jvm: commons.JVM) => { + const classpath = [ + Path.resolve(context.extensionPath, 'jars/language-server.jar') + ]; + if (!jvm.isJdk()) { + VSCode.window.showWarningMessage('JAVA_HOME or PATH environment variable seems to point to a JRE. A JDK is required, hence Boot Hints are unavailable.'); + } + const toolsJar = jvm.getToolsJar(); + if (toolsJar) { + classpath.unshift(toolsJar); + } + return classpath; + }, clientOptions: { documentSelector: [ PROPERTIES_LANGUAGE_ID, YAML_LANGUAGE_ID, JAVA_LANGUAGE_ID ] }