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

Try Use java.home setting if spring settings for JDK isn't specified

Browse Source
This commit is contained in:
BoykoAlex
2021-08-11 10:37:54 -04:00
parent dd7cb4aa3a
commit d377672706
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,10 @@ function getUserDefinedJavaHome(wsOpts : VSCode.WorkspaceConfiguration) : string
return javaOptions && javaOptions.home;
}
function getJdtUserDefinedJavaHome(): string {
return VSCode.workspace.getConfiguration('java')?.get('home');
}
export function activate(options: ActivatorOptions, context: VSCode.ExtensionContext): Thenable<LanguageClient> {
let DEBUG = options.DEBUG;
let jvmHeap = getUserDefinedJvmHeap(options.workspaceOptions, options.jvmHeap);
@@ -117,7 +121,7 @@ export function activate(options: ActivatorOptions, context: VSCode.ExtensionCon
let findJRE = options.preferJdk ? findJdk : findJvm;
return findJRE(getUserDefinedJavaHome(options.workspaceOptions))
return findJRE(getUserDefinedJavaHome(options.workspaceOptions) || getJdtUserDefinedJavaHome())
.catch(error => {
VSCode.window.showErrorMessage("Error trying to find JVM: "+error);
return Promise.reject(error);