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

Allow overriding vscode language server options

Browse Source 
JAVA_HOME and heap can now be overridden by the user from
vscode worspace settings, in a similar way for all our language servers,
by setting XXX.java.home and XXX.java.heap configuration keys.
This commit is contained in:
Kris De Volder
2018-05-03 12:41:29 -07:00
parent e3301506a4
commit 15e3230e3b
9 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,13 +31,14 @@ export interface ActivatorOptions {
extensionId: string;
clientOptions: LanguageClientOptions;
jvmHeap?: string;
workspaceOptions?: VSCode.WorkspaceConfiguration;
workspaceOptions: VSCode.WorkspaceConfiguration;
checkjvm?: (context: VSCode.ExtensionContext, jvm: JVM) => any;
preferJdk?: boolean;
}
type JavaOptions = {
heap?: string
home?: string
}
function getUserDefinedJvmHeap(wsOpts : VSCode.WorkspaceConfiguration, dflt : string) : string {
@@ -48,6 +49,14 @@ function getUserDefinedJvmHeap(wsOpts : VSCode.WorkspaceConfiguration, dflt : s
return (javaOptions && javaOptions.heap) || dflt;
}
function getUserDefinedJavaHome(wsOpts : VSCode.WorkspaceConfiguration) : string {
if (!wsOpts) {
return null;
}
let javaOptions : JavaOptions = wsOpts.get("java");
return javaOptions && javaOptions.home;
}
export function activate(options: ActivatorOptions, context: VSCode.ExtensionContext): Thenable<LanguageClient> {
let DEBUG = options.DEBUG;
let jvmHeap = getUserDefinedJvmHeap(options.workspaceOptions, options.jvmHeap);
@@ -74,7 +83,7 @@ export function activate(options: ActivatorOptions, context: VSCode.ExtensionCon
let findJRE = options.preferJdk ? findJdk : findJvm;
return findJRE()
return findJRE(getUserDefinedJavaHome(options.workspaceOptions))
.catch(error => {
VSCode.window.showErrorMessage("Error trying to find JVM: "+error);
return Promise.reject(error);