Make sure we ignore whitespace in java options

scalameta · Mar 24, 2020 · 3383b7f · 3383b7f
1 parent 0aaa141
commit 3383b7f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/metals-languageclient/src/__tests__/getJavaOptions.test.ts b/packages/metals-languageclient/src/__tests__/getJavaOptions.test.ts
@@ -24,6 +24,14 @@ describe("getJavaOptions", () => {
     expect(options).toEqual(proxyOptions);
   });
 
+  it("sanitizes options from .jvmopts", () => {
+    const malformedOptions = ["-XX:+UseNUMA   ", "-XX:+UseZGC  "];
+    const expectedOptions = ["-XX:+UseNUMA", "-XX:+UseZGC"];
+    const workspaceRoot = createWorskpace(malformedOptions);
+    const options = getJavaOptions(workspaceRoot);
+    expect(options).toEqual(expectedOptions);
+  });
+
   it("reads from JAVA_OPTS", () => {
     process.env = { ...originalEnv, JAVA_OPTS: proxyOptions.join(" ") };
     const workspaceRoot = createWorskpace([]);

diff --git a/packages/metals-languageclient/src/getJavaOptions.ts b/packages/metals-languageclient/src/getJavaOptions.ts
@@ -12,7 +12,11 @@ import { parse } from "shell-quote";
  */
 export function getJavaOptions(workspaceRoot: string | undefined): string[] {
   const allOptions = [...fromEnv(), ...fromJvmoptsFile(workspaceRoot)];
-  return allOptions.filter(isValidOption);
+  return allOptions.filter(isValidOption).map(sanitizeOption);
+}
+
+function sanitizeOption(option: string): string {
+  return option.trim();
 }
 
 function isValidOption(option: string): boolean {