From bb2c81a539c9849ba2b74da933d7438699e17e9f Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 28 Oct 2019 22:26:55 +0100 Subject: [PATCH] recognize java 14 sdk version allow to run on module path GitOrigin-RevId: ea03ba98d399eb7386e3c8894004ab591907b982 --- .../src/com/intellij/openapi/projectRoots/JavaSdkVersion.java | 3 ++- .../intellij/java/openapi/projectRoots/JavaSdkVersionTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java b/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java index 473ed60c39fc..58fb7b35c1a9 100644 --- a/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java +++ b/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java @@ -28,7 +28,8 @@ public enum JavaSdkVersion { JDK_10(LanguageLevel.JDK_10), JDK_11(LanguageLevel.JDK_11), JDK_12(LanguageLevel.JDK_12), - JDK_13(LanguageLevel.JDK_13); + JDK_13(LanguageLevel.JDK_13), + JDK_14(LanguageLevel.JDK_X); private final LanguageLevel myMaxLanguageLevel; diff --git a/java/java-tests/testSrc/com/intellij/java/openapi/projectRoots/JavaSdkVersionTest.java b/java/java-tests/testSrc/com/intellij/java/openapi/projectRoots/JavaSdkVersionTest.java index 2781e64d2208..4e0e4509ca21 100644 --- a/java/java-tests/testSrc/com/intellij/java/openapi/projectRoots/JavaSdkVersionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/openapi/projectRoots/JavaSdkVersionTest.java @@ -36,6 +36,7 @@ public class JavaSdkVersionTest { assertEquals(JavaSdkVersion.JDK_1_9, JavaSdkVersion.fromVersionString("java version \"9\"")); assertEquals(JavaSdkVersion.JDK_1_9, JavaSdkVersion.fromVersionString("java version \"9-ea\"")); assertEquals(JavaSdkVersion.JDK_1_9, JavaSdkVersion.fromVersionString("java version \"9.1.2\"")); + assertEquals(JavaSdkVersion.JDK_14, JavaSdkVersion.fromVersionString("java version \"14\"")); } @Test