Global 'java.jdt.ls.vmargs' setting is ignored

Signed-off-by: Snjezana Peco <[email protected]>

Author: snjeza

src/javaServerStarter.ts

@@ -72,6 +72,8 @@ function prepareParams(requirements: RequirementsData, javaConfiguration, worksp
 				vmargsCheck = workspace.getConfiguration().inspect('java.jdt.ls.vmargs').globalValue;
 			}
 		}
+	} else {
+		vmargsCheck = getJavaConfiguration().get('jdt.ls.vmargs');
 	}
 	let vmargs;
 	if (vmargsCheck !== undefined) {

src/settings.ts

@@ -125,7 +125,7 @@ export async function checkJavaPreferences(context: ExtensionContext) {
 	let javaHome = workspace.getConfiguration().inspect<string>('java.home').workspaceValue;
 	let isVerified = javaHome === undefined || javaHome === null;
 	if (isVerified) {
-		javaHome = workspace.getConfiguration().inspect<string>('java.home').globalValue;
+		javaHome = getJavaConfiguration().get('home');
 	}
 	const allow = 'Allow';
 	const disallow = 'Disallow';