fix: current LS JDK not selected on start (#508)

* fix: current LS JDK not selected on start

Signed-off-by: Yan Zhang <[email protected]>

* refine error hint

Signed-off-by: Yan Zhang <[email protected]>

Author: Eskibear

src/java-runtime/index.ts

@@ -197,7 +197,9 @@ export async function findJavaRuntimeEntries(): Promise<{
   let javaDotHome;
   let javaHomeError;
   try {
-    const {java_home: javaDotHome, java_version: javaVersion } = await resolveRequirements();
+    const runtime = await resolveRequirements();
+    javaDotHome = runtime.java_home;
+    const javaVersion = runtime.java_version;
     if (!javaVersion || javaVersion < 11) {
       javaHomeError = `Java 11 or more recent is required to run the Java extension. Preferred JDK "${javaDotHome}" (version ${javaVersion}) doesn't meet the requirement. Please specify or install a recent JDK.`;
     }

src/java-runtime/utils/upstreamApi.ts

@@ -49,7 +49,11 @@ export async function resolveRequirements(): Promise<any> {
         }
 
         if (javaVersion < REQUIRED_JDK_VERSION) {
-            invalidJavaHome(reject, `Java ${REQUIRED_JDK_VERSION} or more recent is required to run the Java extension. (Current version: ${javaVersion}, JDK: ${javaHome})`);
+            let message = `Java ${REQUIRED_JDK_VERSION} or more recent is required to run the Java extension.`;
+            if (javaHome) {
+                message += `(Current JDK: ${javaHome})`;
+            }
+            invalidJavaHome(reject, message);
         }
 
         resolve({ java_home: javaHome, java_version: javaVersion });