Java: enable preview features by default when setting the language le…

…vel to X - Experimental features (IDEA-325463) GitOrigin-RevId: 2237198742b7561e99de39bad6291304ad1b183e
JetBrains · Jul 19, 2023 · 89a73e9 · 89a73e9
1 parent 76efbe8
commit 89a73e9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/java/java-impl/src/com/intellij/pom/java/AcceptedLanguageLevelsSettings.java b/java/java-impl/src/com/intellij/pom/java/AcceptedLanguageLevelsSettings.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.pom.java;
 
 import com.intellij.ide.IdeBundle;
@@ -89,6 +89,7 @@ private static void applyUnnacceptedLevels(@NotNull Project project,
       }
       if (!previewLevels.isEmpty() && !PropertiesComponent.getInstance(project).getBoolean(IGNORE_USED_PREVIEW_FEATURES, false)) {
         LanguageLevel languageLevel = previewLevels.first();
+        if (languageLevel == LanguageLevel.JDK_X) return;
         int previewFeature = languageLevel.toJavaVersion().feature;
         PREVIEW_NOTIFICATION_GROUP.createNotification(
             JavaBundle.message("java.preview.features.notification.title"),

diff --git a/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java b/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
@@ -56,7 +56,7 @@ public enum LanguageLevel {
   LanguageLevel(Supplier<@Nls String> presentableTextSupplier, int major) {
     myPresentableText = presentableTextSupplier;
     myVersion = JavaVersion.compose(major);
-    myPreview = name().endsWith("_PREVIEW");
+    myPreview = name().endsWith("_PREVIEW") || name().endsWith("_X");
   }
 
   public boolean isPreview() {

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
@@ -1,4 +1,4 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.java.openapi.projectRoots;
 
 import com.intellij.openapi.projectRoots.JavaSdkVersion;
@@ -21,7 +21,8 @@ public void sdkVersionFromLanguageLevel() {
   @Test
   public void maxLanguageLevelSanity() {
     for (JavaSdkVersion version : JavaSdkVersion.values()) {
-      assertFalse("Fails for " + version.toString(), version.getMaxLanguageLevel().isPreview());
+      LanguageLevel languageLevel = version.getMaxLanguageLevel();
+      assertFalse("Fails for " + version, languageLevel.isPreview() && languageLevel != LanguageLevel.JDK_X);
     }
   }
 

diff --git a/jps/model-api/src/org/jetbrains/jps/model/java/LanguageLevel.java b/jps/model-api/src/org/jetbrains/jps/model/java/LanguageLevel.java
@@ -43,6 +43,6 @@ public JavaVersion toJavaVersion() {
   }
 
   public boolean isPreview() {
-    return name().endsWith("_PREVIEW");
+    return name().endsWith("_PREVIEW") || name().endsWith("_X");
   }
 }