change regex pattern to find java version

scalameta · Mar 1, 2024 · 1d7f7f4 · 1d7f7f4
1 parent 664f924
commit 1d7f7f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/metals-languageclient/src/__tests__/getJavaHome.test.ts b/packages/metals-languageclient/src/__tests__/getJavaHome.test.ts
@@ -1,7 +1,7 @@
 import { IJavaHomeInfo } from "@viperproject/locate-java-home/js/es5/lib/interfaces";
 import path from "path";
 
-const exampleJavaVersionString = `openjdk 17.0.1 2021-10-19
+const exampleJavaVersionString = `openjdk "17.0.1" 2021-10-19
   OpenJDK Runtime Environment (build 17.0.1+12-39)
   OpenJDK 64-Bit Server VM (build 17.0.1+12-39, mixed mode, sharing)`;
 

diff --git a/packages/metals-languageclient/src/getJavaHome.ts b/packages/metals-languageclient/src/getJavaHome.ts
@@ -34,7 +34,7 @@ export async function getJavaHome(
   return fromEnvValue ? fromEnvValue : await locate(javaVersion);
 }
 
-const versionRegex = /\d+\.\d+\.\d+/;
+const versionRegex = /\"\d\d/;
 async function validateJavaVersion(
   javaHome: string,
   javaVersion: JavaVersion,
@@ -55,7 +55,7 @@ async function validateJavaVersion(
     const javaInfoStr = (await javaVersionOut).stderr as string;
     const matches = javaInfoStr.match(versionRegex);
     if (matches) {
-      return +matches[0].slice(0, 2) >= +javaVersion;
+      return +matches[0].slice(1, 3) >= +javaVersion;
     }
   } catch (error) {
     outputChannel.appendLine(`failed while running ${javaBin} -version`);