fix - Gradle server jvm opts alignment (#1541)

microsoft · Jul 31, 2024 · 3cfecc8 · 3cfecc8
1 parent 702d1cc
commit 3cfecc8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -54,7 +54,7 @@
         "order": 2
       },
       "env": {
-        "GRADLE_SERVER_OPTS":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8089"
+        "DEBUG_GRADLE_SERVER": "true",
       },
     },
     {

diff --git a/extension/src/constant.ts b/extension/src/constant.ts
@@ -23,6 +23,9 @@ export const NO_JAVA_EXECUTABLE =
 
 export const OPT_RESTART = "Restart";
 
+export const GRADLE_SERVER_BASE_JVM_OPTS =
+    "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED";
+
 export enum CompletionKinds {
     DEPENDENCY_GROUP = "dependency_group",
     DEPENDENCY_ARTIFACT = "dependency_artifact",

diff --git a/extension/src/server/serverUtil.ts b/extension/src/server/serverUtil.ts
@@ -4,6 +4,7 @@ import {
     getConfigJavaImportGradleJavaHome,
     getRedHatJavaEmbeddedJRE,
 } from "../util/config";
+import { GRADLE_SERVER_BASE_JVM_OPTS } from "../constant";
 
 export function getGradleServerCommand(): string {
     const platform = process.platform;
@@ -27,6 +28,12 @@ export async function getGradleServerEnv(): Promise<ProcessEnv | undefined> {
         Object.assign(env, {
             VSCODE_JAVA_HOME: javaHome,
         });
+        if (env["DEBUG_GRADLE_SERVER"] === "true") {
+            env.GRADLE_SERVER_OPTS =
+                "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8089 " + GRADLE_SERVER_BASE_JVM_OPTS;
+        } else {
+            env.GRADLE_SERVER_OPTS = GRADLE_SERVER_BASE_JVM_OPTS;
+        }
     } else if (!checkEnvJavaExecutable()) {
         return undefined;
     }