bugfix: Add java options while fetching java via coursier

scalameta · Oct 25, 2024 · 3f33103 · 3f33103
1 parent 7bf4bfc
commit 3f33103
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/metals-languageclient/src/index.ts b/packages/metals-languageclient/src/index.ts
@@ -6,6 +6,7 @@ export * from "./checkServerVersion";
 export * from "./fetchMetals";
 export * from "./getServerOptions";
 export * from "./getJavaConfig";
+export * from "./getJavaOptions";
 export * from "./getJavaHome";
 export * from "./setupCoursier";
 

diff --git a/packages/metals-vscode/src/extension.ts b/packages/metals-vscode/src/extension.ts
@@ -45,6 +45,7 @@ import * as fs from "fs";
 import {
   restartServer,
   getJavaConfig,
+  getJavaOptions,
   fetchMetals,
   JavaConfig,
   getServerOptions,
@@ -220,7 +221,9 @@ async function fetchAndLaunchMetals(
   const coursierMirror = getCoursierMirrorPath(config);
 
   const metalsDirPath = metalsDir(ConfigurationTarget.Global);
-
+  const workspaceRoot = workspace.workspaceFolders
+    ? workspace.workspaceFolders[0]?.uri.fsPath
+    : undefined;
   if (!fs.existsSync(metalsDirPath)) {
     fs.mkdirSync(metalsDirPath);
   }
@@ -231,7 +234,7 @@ async function fetchAndLaunchMetals(
     context.extensionPath,
     outputChannel,
     forceCoursierJar,
-    serverProperties
+    serverProperties.concat(getJavaOptions(workspaceRoot))
   );
 
   const canRetryWithJar =
@@ -249,9 +252,7 @@ async function fetchAndLaunchMetals(
   }
 
   const javaConfig = getJavaConfig({
-    workspaceRoot: workspace.workspaceFolders
-      ? workspace.workspaceFolders[0]?.uri.fsPath
-      : undefined,
+    workspaceRoot,
     javaHome,
     coursier,
     customRepositories,