diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index a188fe64880a..494ea888fefd 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -3222,8 +3222,8 @@ public class HighlightUtil extends HighlightUtilBase {
     STATIC_INTERFACE_CALLS(LanguageLevel.JDK_1_8, "feature.static.interface.calls"),
     REFS_AS_RESOURCE(LanguageLevel.JDK_1_9, "feature.try.with.resources.refs"),
     MODULES(LanguageLevel.JDK_1_9, "feature.modules"),
-    ENHANCED_SWITCH(LanguageLevel.JDK_12_PREVIEW, "feature.enhanced.switch"),
-    SWITCH_EXPRESSION(LanguageLevel.JDK_12_PREVIEW, "feature.switch.expressions"),
+    ENHANCED_SWITCH(LanguageLevel.JDK_13_PREVIEW, "feature.enhanced.switch"),
+    SWITCH_EXPRESSION(LanguageLevel.JDK_13_PREVIEW, "feature.switch.expressions"),
     TEXT_BLOCKS(LanguageLevel.JDK_13_PREVIEW, "feature.text.blocks"),
     RAW_LITERALS(LanguageLevel.JDK_X, "feature.raw.literals");
 
diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index 219d83d90ffc..5e733dd1e2f8 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -1606,7 +1606,7 @@
                      implementationClass="com.intellij.codeInspection.OverflowingLoopIndexInspection" />
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="EnhancedSwitchMigration"
                      key="inspection.switch.expression.migration.inspection.name" bundle="messages.InspectionsBundle"
-                     groupKey="group.names.language.level.specific.issues.and.migration.aids12" groupBundle="messages.InspectionsBundle"
+                     groupKey="group.names.language.level.specific.issues.and.migration.aids13" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.EnhancedSwitchMigrationInspection" />
     <localInspection groupPath="Java" language="JAVA" shortName="RedundantLabeledSwitchRuleCodeBlock"
@@ -1616,7 +1616,7 @@
                      implementationClass="com.intellij.codeInspection.enhancedSwitch.RedundantLabeledSwitchRuleCodeBlockInspection" />
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="EnhancedSwitchBackwardMigration"
                      key="inspection.switch.expression.backward.migration.inspection.name" bundle="messages.InspectionsBundle"
-                     groupKey="group.names.language.level.specific.issues.and.migration.aids12" groupBundle="messages.InspectionsBundle"
+                     groupKey="group.names.language.level.specific.issues.and.migration.aids13" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.intellij.codeInspection.EnhancedSwitchBackwardMigrationInspection" />
     <localInspection groupPath="Java" language="JAVA" shortName="SwitchLabeledRuleCanBeCodeBlock"
diff --git a/java/java-impl/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java b/java/java-impl/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java
index f45f50fa4bfd..4fd9fb5ea85e 100644
--- a/java/java-impl/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/enhancedSwitch/SwitchLabeledRuleCanBeCodeBlockInspection.java
@@ -8,10 +8,8 @@ import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.pom.java.LanguageLevel;
 import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
 import com.intellij.psi.*;
-import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.ObjectUtils;
 import com.siyeh.ig.psiutils.CommentTracker;
 import org.jetbrains.annotations.Nls;
@@ -104,7 +102,7 @@ public class SwitchLabeledRuleCanBeCodeBlockInspection extends LocalInspectionTo
 
     private static void wrapExpression(PsiExpressionStatement expressionStatement) {
       CommentTracker tracker = new CommentTracker();
-      String valueKeyword = PsiUtil.getLanguageLevel(expressionStatement) == LanguageLevel.JDK_12_PREVIEW ? PsiKeyword.BREAK : PsiKeyword.YIELD;
+      String valueKeyword = PsiKeyword.YIELD;
       tracker.replaceAndRestoreComments(expressionStatement, "{ " + valueKeyword + " " + tracker.text(expressionStatement) + " }");
     }
 
diff --git a/java/java-impl/src/inspectionDescriptions/EnhancedSwitchBackwardMigration.html b/java/java-impl/src/inspectionDescriptions/EnhancedSwitchBackwardMigration.html
index 9d4f516edab9..21e601af841d 100644
--- a/java/java-impl/src/inspectionDescriptions/EnhancedSwitchBackwardMigration.html
+++ b/java/java-impl/src/inspectionDescriptions/EnhancedSwitchBackwardMigration.html
@@ -3,7 +3,7 @@
 Reports enhanced 'switch' statements and expressions which can be replaced with a traditional 'switch' statement.
 
 <!-- tooltip end -->
-<p>This inspection only reports if the language level of the project or module is 12 Preview</p>
+<p>This inspection only reports if the language level is 13 Preview</p>
 <p><small>New in 2019.1</small></p>
 </body>
 </html>
\ No newline at end of file
diff --git a/java/java-impl/src/inspectionDescriptions/EnhancedSwitchMigration.html b/java/java-impl/src/inspectionDescriptions/EnhancedSwitchMigration.html
index 3033ea2c5464..90b3aae3fc2e 100644
--- a/java/java-impl/src/inspectionDescriptions/EnhancedSwitchMigration.html
+++ b/java/java-impl/src/inspectionDescriptions/EnhancedSwitchMigration.html
@@ -3,7 +3,7 @@
 Reports 'switch' statements, which can be replaced with enhanced 'switch' statement or expression.
 
 <!-- tooltip end -->
-<p>This inspection only reports if the language level of the project or module is 12 Preview</p>
+<p>This inspection only reports if the language level is 13 Preview</p>
 <p><small>New in 2019.1</small></p>
 </body>
 </html>
\ No newline at end of file
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
index 130fa62c47c8..696d717cebee 100644
--- a/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
+++ b/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
@@ -32,7 +32,6 @@ public enum LanguageLevel {
   JDK_10(JavaCoreBundle.message("jdk.10.language.level.description"), 10),
   JDK_11(JavaCoreBundle.message("jdk.11.language.level.description"), 11),
   JDK_12(JavaCoreBundle.message("jdk.12.language.level.description"), 12),
-  JDK_12_PREVIEW(JavaCoreBundle.message("jdk.12.preview.language.level.description"), 12),
   JDK_13(JavaCoreBundle.message("jdk.13.language.level.description"), 13),
   JDK_13_PREVIEW(JavaCoreBundle.message("jdk.13.preview.language.level.description"), 13),
   JDK_X(JavaCoreBundle.message("jdk.X.language.level.description"), 14);
diff --git a/java/java-psi-api/src/messages/JavaCoreBundle.properties b/java/java-psi-api/src/messages/JavaCoreBundle.properties
index b09efaf70143..aec12f904c1f 100644
--- a/java/java-psi-api/src/messages/JavaCoreBundle.properties
+++ b/java/java-psi-api/src/messages/JavaCoreBundle.properties
@@ -11,7 +11,6 @@ jdk.1.9.language.level.description=9 - Modules, private methods in interfaces et
 jdk.10.language.level.description=10 - Local variable type inference
 jdk.11.language.level.description=11 - Local variable syntax for lambda parameters
 jdk.12.language.level.description=12 - No new language features
-jdk.12.preview.language.level.description=12 (Preview) - Switch expressions
 jdk.13.language.level.description=13 - No new language features
 jdk.13.preview.language.level.description=13 (Preview) - Switch expressions, text blocks
 jdk.X.language.level.description=X - Experimental features
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterCommentAfterReturnJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterCommentAfterReturnJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterCommentAfterReturnJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterCommentAfterReturnJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterMultilabelJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterMultilabelJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterMultilabelJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterMultilabelJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRule2Java12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRule2Java13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRule2Java12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRule2Java13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleDefaultJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleDefaultJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleDefaultJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleDefaultJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleMultilabelsJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleMultilabelsJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleMultilabelsJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/afterRuleMultilabelsJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeCommentAfterReturnJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeCommentAfterReturnJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeCommentAfterReturnJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeCommentAfterReturnJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeMultilabelJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeMultilabelJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeMultilabelJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeMultilabelJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRule2Java12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRule2Java13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRule2Java12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRule2Java13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleDefaultJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleDefaultJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleDefaultJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleDefaultJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleMultilabelsJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleMultilabelsJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleMultilabelsJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/beforeRuleMultilabelsJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteCaseMultiLabelJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteCaseMultiLabelJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteCaseMultiLabelJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteCaseMultiLabelJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteCaseRuleJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteCaseRuleJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteCaseRuleJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterDeleteCaseRuleJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpression2Java12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpression2Java13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpression2Java12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpression2Java13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpressionJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpressionJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpressionJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapExpressionJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleConflictingDeclarationJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleConflictingDeclarationJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleConflictingDeclarationJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleConflictingDeclarationJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleExpressionJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleExpressionJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleExpressionJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleExpressionJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/afterUnwrapRuleJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteCaseMultiLabelJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteCaseMultiLabelJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteCaseMultiLabelJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteCaseMultiLabelJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteCaseRuleJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteCaseRuleJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteCaseRuleJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeDeleteCaseRuleJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression2Java12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression2Java13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression2Java12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression2Java13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression3Java12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression3Java13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression3Java12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpression3Java13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpressionJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpressionJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpressionJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapExpressionJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleConflictingDeclarationJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleConflictingDeclarationJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleConflictingDeclarationJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleConflictingDeclarationJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleExpressionJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleExpressionJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleExpressionJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleExpressionJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/deleteSwitchLabel/beforeUnwrapRuleJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/afterSwitchJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/afterSwitchJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/afterSwitchJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/afterSwitchJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSwitchExpressionJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSwitchExpressionJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSwitchExpressionJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSwitchExpressionJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSwitchJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSwitchJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSwitchJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSwitchJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterSwitchExprJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterSwitchExprJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterSwitchExprJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterSwitchExprJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterSwitchJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterSwitchJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterSwitchJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/afterSwitchJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeSwitchExprJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeSwitchExprJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeSwitchExprJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeSwitchExprJava13Preview.java
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeSwitchJava12Preview.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeSwitchJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeSwitchJava12Preview.java
rename to java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedVariable/beforeSwitchJava13Preview.java
diff --git a/java/java-tests/testData/refactoring/introduceVariable/EnsureCodeBlockForThrowsJava12Preview.after.java b/java/java-tests/testData/refactoring/introduceVariable/EnsureCodeBlockForThrowsJava13Preview.after.java
similarity index 100%
rename from java/java-tests/testData/refactoring/introduceVariable/EnsureCodeBlockForThrowsJava12Preview.after.java
rename to java/java-tests/testData/refactoring/introduceVariable/EnsureCodeBlockForThrowsJava13Preview.after.java
diff --git a/java/java-tests/testData/refactoring/introduceVariable/EnsureCodeBlockForThrowsJava12Preview.java b/java/java-tests/testData/refactoring/introduceVariable/EnsureCodeBlockForThrowsJava13Preview.java
similarity index 100%
rename from java/java-tests/testData/refactoring/introduceVariable/EnsureCodeBlockForThrowsJava12Preview.java
rename to java/java-tests/testData/refactoring/introduceVariable/EnsureCodeBlockForThrowsJava13Preview.java
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/WrapSwitchRuleStatementsIntoBlockFixTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/WrapSwitchRuleStatementsIntoBlockFixTest.java
index c7f2969817e6..78a5a8046bc3 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/WrapSwitchRuleStatementsIntoBlockFixTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/WrapSwitchRuleStatementsIntoBlockFixTest.java
@@ -5,13 +5,14 @@ import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCa
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 
-import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_12;
+import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_13;
+
 
 public class WrapSwitchRuleStatementsIntoBlockFixTest extends LightQuickFixParameterizedTestCase {
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   @Override
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SplitSwitchBranchWithSeveralCaseValuesTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SplitSwitchBranchWithSeveralCaseValuesTest.java
index 81f15c35fdf8..9287a79ea7aa 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SplitSwitchBranchWithSeveralCaseValuesTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SplitSwitchBranchWithSeveralCaseValuesTest.java
@@ -5,7 +5,7 @@ import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCa
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 
-import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_12;
+import static com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase.JAVA_13;
 
 public class SplitSwitchBranchWithSeveralCaseValuesTest extends LightQuickFixParameterizedTestCase {
 
@@ -17,7 +17,7 @@ public class SplitSwitchBranchWithSeveralCaseValuesTest extends LightQuickFixPar
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   @Override
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/SwitchExpressionPostfixTemplateTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/SwitchExpressionPostfixTemplateTest.java
index 89f334bee562..8365fbe023f8 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/SwitchExpressionPostfixTemplateTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/template/postfix/templates/SwitchExpressionPostfixTemplateTest.java
@@ -14,7 +14,7 @@ public class SwitchExpressionPostfixTemplateTest extends PostfixTemplateTestCase
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   public void testIntExprInit() {
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/DuplicateBranchesInEnhancedSwitchFixTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInspection/DuplicateBranchesInEnhancedSwitchFixTest.kt
index 2a86bd91a765..33b96c4c080d 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/DuplicateBranchesInEnhancedSwitchFixTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/DuplicateBranchesInEnhancedSwitchFixTest.kt
@@ -16,5 +16,5 @@ class DuplicateBranchesInEnhancedSwitchFixTest : LightQuickFixParameterizedTestC
 
   override fun getBasePath() = "/inspection/duplicateBranchesInEnhancedSwitchFix"
 
-  override fun getProjectDescriptor(): LightProjectDescriptor = LightJavaCodeInsightFixtureTestCase.JAVA_12
+  override fun getProjectDescriptor(): LightProjectDescriptor = LightJavaCodeInsightFixtureTestCase.JAVA_13
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/EnhancedSwitchMigrationInspectionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/EnhancedSwitchMigrationInspectionTest.java
index b12f9ab624b9..a482663033cd 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/EnhancedSwitchMigrationInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/EnhancedSwitchMigrationInspectionTest.java
@@ -2,8 +2,8 @@
 package com.intellij.java.codeInspection;
 
 import com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase;
-import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.EnhancedSwitchMigrationInspection;
+import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.pom.java.LanguageLevel;
 import org.jetbrains.annotations.NotNull;
 
@@ -23,6 +23,6 @@ public class EnhancedSwitchMigrationInspectionTest extends LightQuickFixParamete
 
   @Override
   protected LanguageLevel getLanguageLevel() {
-    return LanguageLevel.JDK_12_PREVIEW;
+    return LanguageLevel.JDK_13_PREVIEW;
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java b/java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
index fb91c5246c5d..f4748a2e38f3 100644
--- a/java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/execution/configurations/JavaParametersTest.java
@@ -114,8 +114,8 @@ public class JavaParametersTest extends ModuleRootManagerTestCase {
   public void testPreviewLanguageFeatures() throws CantRunException {
     ModuleRootModificationUtil.updateModel(myModule, (model) -> {
       model.getModuleExtension(LanguageLevelModuleExtension.class)
-           .setLanguageLevel(LanguageLevel.JDK_12_PREVIEW);
-      model.setSdk(IdeaTestUtil.getMockJdk(JavaVersion.compose(12)));
+           .setLanguageLevel(LanguageLevel.JDK_13_PREVIEW);
+      model.setSdk(IdeaTestUtil.getMockJdk(JavaVersion.compose(13)));
     });
     JavaParameters javaParameters = new JavaParameters();
     javaParameters.configureByModule(myModule, JavaParameters.CLASSES_AND_TESTS);
diff --git a/java/java-tests/testSrc/com/intellij/java/parser/partial/StatementParserTest.java b/java/java-tests/testSrc/com/intellij/java/parser/partial/StatementParserTest.java
index 4a266214ad54..cea892f40157 100644
--- a/java/java-tests/testSrc/com/intellij/java/parser/partial/StatementParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/parser/partial/StatementParserTest.java
@@ -33,7 +33,7 @@ public class StatementParserTest extends JavaParsingTestCase {
   public void testYieldIncomplete0() { doParserTest("yield "); }
   public void testYieldIncomplete1() { doParserTest("yield x"); }
   public void testYieldCall() { doParserTest("foo.yield();"); }
-  public void testYieldCompatibility() { setLanguageLevel(LanguageLevel.JDK_12_PREVIEW); doParserTest("yield(2);"); }
+  public void testYieldCompatibility() { setLanguageLevel(LanguageLevel.JDK_12); doParserTest("yield(2);"); }
 
   public void testContinueNormal0() { doParserTest("continue;"); }
   public void testContinueNormal1() { doParserTest("continue LABEL;"); }
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceVariableTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceVariableTest.java
index 0896e6848c9e..e62b636261f4 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceVariableTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceVariableTest.java
@@ -117,7 +117,7 @@ public class IntroduceVariableTest extends LightJavaCodeInsightTestCase {
   public void testReturnTernary() { doTest("temp", true, false, false, CommonClassNames.JAVA_LANG_STRING); }
   public void testAssignTernary() { doTest("temp", true, false, false, CommonClassNames.JAVA_LANG_STRING); }
   public void testEnsureCodeBlockAroundBreakStatementJava13Preview() { doTest("temp", true, false, false, CommonClassNames.JAVA_LANG_STRING); }
-  public void testEnsureCodeBlockForThrowsJava12Preview() { doTest("temp", true, false, false, CommonClassNames.JAVA_LANG_STRING); }
+  public void testEnsureCodeBlockForThrowsJava13Preview() { doTest("temp", true, false, false, CommonClassNames.JAVA_LANG_STRING); }
   public void testFromSwitchStatementJava13Preview() { doTest("temp", true, false, false, CommonClassNames.JAVA_LANG_STRING); }
 
   public void testVarTypeExtractedJava10() {
diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/LightJavaCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/LightJavaCodeInsightFixtureTestCase.java
index 4c2929d6cf0c..33a5ff9943c6 100644
--- a/java/testFramework/src/com/intellij/testFramework/fixtures/LightJavaCodeInsightFixtureTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/fixtures/LightJavaCodeInsightFixtureTestCase.java
@@ -7,7 +7,10 @@ import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.roots.*;
+import com.intellij.openapi.roots.ContentEntry;
+import com.intellij.openapi.roots.LanguageLevelModuleExtension;
+import com.intellij.openapi.roots.LanguageLevelProjectExtension;
+import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.pom.java.AcceptedLanguageLevelsSettings;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
@@ -67,7 +70,7 @@ public abstract class LightJavaCodeInsightFixtureTestCase extends UsefulTestCase
   public static final @NotNull LightProjectDescriptor JAVA_10 = new ProjectDescriptor(LanguageLevel.JDK_10);
   public static final @NotNull LightProjectDescriptor JAVA_10_ANNOTATED = new ProjectDescriptor(LanguageLevel.JDK_10, true);
   public static final @NotNull LightProjectDescriptor JAVA_11 = new ProjectDescriptor(LanguageLevel.JDK_11);
-  public static final @NotNull LightProjectDescriptor JAVA_12 = new ProjectDescriptor(LanguageLevel.JDK_12_PREVIEW);
+  public static final @NotNull LightProjectDescriptor JAVA_12 = new ProjectDescriptor(LanguageLevel.JDK_12);
   public static final @NotNull LightProjectDescriptor JAVA_13 = new ProjectDescriptor(LanguageLevel.JDK_13_PREVIEW);
   public static final @NotNull LightProjectDescriptor JAVA_X = new ProjectDescriptor(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
index 5992a54b6b6e..4ad99d58a0b4 100644
--- a/jps/model-api/src/org/jetbrains/jps/model/java/LanguageLevel.java
+++ b/jps/model-api/src/org/jetbrains/jps/model/java/LanguageLevel.java
@@ -20,7 +20,7 @@ public enum LanguageLevel {
   JDK_1_9(9),
   JDK_10(10),
   JDK_11(11),
-  JDK_12(12), JDK_12_PREVIEW(12),
+  JDK_12(12),
   JDK_13(13), JDK_13_PREVIEW(13),
   JDK_X(14);
 
diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
index 30c97dd20732..ae895e4cf059 100644
--- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
@@ -604,7 +604,7 @@ group.names.language.level.specific.issues.and.migration.aids9=Java 9
 group.names.language.level.specific.issues.and.migration.aids5=Java 5
 group.names.language.level.specific.issues.and.migration.aids10=Java 10
 group.names.language.level.specific.issues.and.migration.aids11=Java 11
-group.names.language.level.specific.issues.and.migration.aids12=Java 12
+group.names.language.level.specific.issues.and.migration.aids13=Java 13
 group.names.javabeans.issues=JavaBeans issues
 group.names.inheritance.issues=Inheritance issues
 group.names.data.flow.issues=Data flow
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java
index 60abc021c2ea..e09097ec8996 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java
@@ -73,6 +73,7 @@ public class UninitializedReadCollector {
     if (statement instanceof PsiBreakStatement ||
         statement instanceof PsiContinueStatement ||
         statement instanceof PsiAssertStatement ||
+        statement instanceof PsiYieldStatement ||
         statement instanceof PsiEmptyStatement) {
       return false;
     }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterEmptyJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterEmptyJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterEmptyJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterEmptyJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterExpressionJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterExpressionJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterExpressionJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterExpressionJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterRulesJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterRulesJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterRulesJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/afterRulesJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeEmptyJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeEmptyJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeEmptyJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeEmptyJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeExpressionJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeExpressionJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeExpressionJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeExpressionJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeRulesJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeRulesJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeRulesJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/create_default/beforeRulesJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterExpressionJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterExpressionJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterExpressionJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterExpressionJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterMultipleLabelsJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterMultipleLabelsJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterMultipleLabelsJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterMultipleLabelsJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterRuleLabelsJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterRuleLabelsJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterRuleLabelsJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterRuleLabelsJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterRuleLabelsReorderedJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterRuleLabelsReorderedJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterRuleLabelsReorderedJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterRuleLabelsReorderedJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterWithoutBracesJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterWithoutBracesJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterWithoutBracesJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/afterWithoutBracesJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeExpressionJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeExpressionJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeExpressionJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeExpressionJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeMultipleLabelsJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeMultipleLabelsJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeMultipleLabelsJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeMultipleLabelsJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeRuleLabelsJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeRuleLabelsJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeRuleLabelsJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeRuleLabelsJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeRuleLabelsReorderedJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeRuleLabelsReorderedJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeRuleLabelsReorderedJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeRuleLabelsReorderedJava13Preview.java
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeWithoutBracesJava12Preview.java b/plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeWithoutBracesJava13Preview.java
similarity index 100%
rename from plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeWithoutBracesJava12Preview.java
rename to plugins/InspectionGadgets/test/com/siyeh/igfixes/controlflow/enumswitch/beforeWithoutBracesJava13Preview.java
diff --git a/plugins/InspectionGadgets/testsrc/com/resources/IOResourceInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/resources/IOResourceInspectionTest.java
index 4e86f3a71a4a..e7ed968c3399 100644
--- a/plugins/InspectionGadgets/testsrc/com/resources/IOResourceInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/resources/IOResourceInspectionTest.java
@@ -40,7 +40,7 @@ public class IOResourceInspectionTest extends LightJavaInspectionTestCase {
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   @Override
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/assignment/NestedAssignmentInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/assignment/NestedAssignmentInspectionTest.java
index ffb389ac91cd..9fe589cf714a 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/assignment/NestedAssignmentInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/assignment/NestedAssignmentInspectionTest.java
@@ -36,6 +36,6 @@ public class NestedAssignmentInspectionTest extends LightJavaInspectionTestCase
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionTest.groovy b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionTest.groovy
index 2b6843660ccd..daec1c7fc3a8 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionTest.groovy
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionTest.groovy
@@ -32,7 +32,7 @@ class IgnoreResultOfCallInspectionTest extends LightJavaInspectionTestCase {
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12
+    return JAVA_13
   }
 
   @Override
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspectionTest.java
index 67ddb44c5e70..d48673d72bc0 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspectionTest.java
@@ -41,6 +41,6 @@ public class ResultOfObjectAllocationIgnoredInspectionTest extends LightJavaInsp
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/EnumSwitchStatementWhichMissesCasesInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/EnumSwitchStatementWhichMissesCasesInspectionTest.java
index b73c06643834..39df4e3a7119 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/EnumSwitchStatementWhichMissesCasesInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/EnumSwitchStatementWhichMissesCasesInspectionTest.java
@@ -151,7 +151,7 @@ public class EnumSwitchStatementWhichMissesCasesInspectionTest extends LightJava
            "}");
   }
 
-  public void testJava12Preview() {
+  public void testJava13Preview() {
     doTest("enum E {A, B, C}\n" +
            "\n" +
            "class X {\n" +
@@ -179,7 +179,7 @@ public class EnumSwitchStatementWhichMissesCasesInspectionTest extends LightJava
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   @Nullable
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/NestedSwitchInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/NestedSwitchInspectionTest.java
index 952db164743c..eb41b9df690d 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/NestedSwitchInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/NestedSwitchInspectionTest.java
@@ -3,7 +3,6 @@ package com.siyeh.ig.controlflow;
 
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.testFramework.LightProjectDescriptor;
-import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
 import com.siyeh.ig.LightJavaInspectionTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -17,7 +16,7 @@ public class NestedSwitchInspectionTest extends LightJavaInspectionTestCase {
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return LightJavaCodeInsightFixtureTestCase.JAVA_12;
+    return JAVA_13;
   }
 
   @Nullable
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspectionTest.java
index 1e490cb13e58..93e3095d959c 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspectionTest.java
@@ -30,7 +30,7 @@ public class SwitchStatementWithTooFewBranchesInspectionTest extends LightJavaIn
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   @Nullable
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementWithTooManyBranchesInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementWithTooManyBranchesInspectionTest.java
index a11da591f398..f7d3770a0f50 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementWithTooManyBranchesInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementWithTooManyBranchesInspectionTest.java
@@ -62,7 +62,7 @@ public class SwitchStatementWithTooManyBranchesInspectionTest extends LightJavaI
                  "    }");
   }
 
-  public void testJava12Expression() {
+  public void testJava13Expression() {
     doMemberTest("    public int foo(int x) {\n" +
                  "         return /*'switch' has too many branches (11)*/switch/**/ (x) {\n" +
                  "            case 1 -> 0;\n" +
@@ -113,7 +113,7 @@ public class SwitchStatementWithTooManyBranchesInspectionTest extends LightJavaI
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   @Nullable
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspectionTest.java
index 447f1a2169c9..75bbad120c3a 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspectionTest.java
@@ -30,7 +30,7 @@ public class SwitchStatementsWithoutDefaultInspectionTest extends LightJavaInspe
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   @Nullable
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryBreakInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryBreakInspectionTest.java
index 642002999e9e..403b7a8446f9 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryBreakInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryBreakInspectionTest.java
@@ -33,7 +33,7 @@ public class UnnecessaryBreakInspectionTest extends LightJavaInspectionTestCase
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   @Nullable
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryContinueInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryContinueInspectionTest.java
index 920226312ce8..9128990aa87e 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryContinueInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryContinueInspectionTest.java
@@ -15,7 +15,7 @@ public class UnnecessaryContinueInspectionTest extends LightJavaCodeInsightFixtu
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   private void doTest() {
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryDefaultInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryDefaultInspectionTest.java
index 15878f6ea836..3d0ea4dd02ba 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryDefaultInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryDefaultInspectionTest.java
@@ -102,6 +102,6 @@ public class UnnecessaryDefaultInspectionTest extends LightJavaInspectionTestCas
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryReturnInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryReturnInspectionTest.java
index 355feedc4143..0ee5a1da3b94 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryReturnInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/controlflow/UnnecessaryReturnInspectionTest.java
@@ -15,7 +15,7 @@ public class UnnecessaryReturnInspectionTest extends LightJavaCodeInsightFixture
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   private void doTest() {
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/IfCanBeSwitchSwitchExpressionFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/IfCanBeSwitchSwitchExpressionFixTest.java
index 08b67d902f12..04dbd15f71c6 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/IfCanBeSwitchSwitchExpressionFixTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/IfCanBeSwitchSwitchExpressionFixTest.java
@@ -24,7 +24,7 @@ public class IfCanBeSwitchSwitchExpressionFixTest extends IGQuickFixesTestCase {
   @Override
   protected void tuneFixture(JavaModuleFixtureBuilder builder) throws Exception {
     super.tuneFixture(builder);
-    builder.setLanguageLevel(LanguageLevel.JDK_12_PREVIEW);
+    builder.setLanguageLevel(LanguageLevel.JDK_13_PREVIEW);
     builder.addJdk(IdeaTestUtil.getMockJdk18Path().getPath());
   }
 
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/jdk/AutoBoxingInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/jdk/AutoBoxingInspectionTest.java
index d08f8d3c005d..b12abf3d8338 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/jdk/AutoBoxingInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/jdk/AutoBoxingInspectionTest.java
@@ -22,6 +22,6 @@ public class AutoBoxingInspectionTest extends LightJavaInspectionTestCase {
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/UnnecessaryBoxingInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/UnnecessaryBoxingInspectionTest.java
index 9d1ff89ee7bb..3192d7634806 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/UnnecessaryBoxingInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/UnnecessaryBoxingInspectionTest.java
@@ -13,7 +13,7 @@ public class UnnecessaryBoxingInspectionTest extends LightJavaInspectionTestCase
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   public void testUnnecessaryBoxing() {
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnnecessaryParenthesesInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnnecessaryParenthesesInspectionTest.java
index fb8e3f0f73bc..ad3b15ffef77 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnnecessaryParenthesesInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnnecessaryParenthesesInspectionTest.java
@@ -18,7 +18,7 @@ public class UnnecessaryParenthesesInspectionTest extends LightJavaCodeInsightFi
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 
   public void testUnnecessaryParenthesesInspection() {
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnqualifiedStaticUsageInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnqualifiedStaticUsageInspectionTest.java
index a6a141e4d269..e74c95bd918b 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnqualifiedStaticUsageInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/UnqualifiedStaticUsageInspectionTest.java
@@ -25,6 +25,6 @@ public class UnqualifiedStaticUsageInspectionTest extends LightJavaInspectionTes
   @NotNull
   @Override
   protected LightProjectDescriptor getProjectDescriptor() {
-    return JAVA_12;
+    return JAVA_13;
   }
 }
\ No newline at end of file
diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
index 25f9776e0e26..1e08f6111273 100644
--- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
+++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/StructureImportingTest.java
@@ -859,19 +859,19 @@ public class StructureImportingTest extends MavenImportingTestCase {
                   "      <artifactId>maven-compiler-plugin</artifactId>\n" +
                   "      <version>3.8.0</version>\n" +
                   "      <configuration>\n" +
-                  "          <release>12</release>\n" +
+                  "          <release>13</release>\n" +
                   "          <compilerArgs>\n" +
                   "              <arg>--enable-preview</arg>\n" +
                   "          </compilerArgs>\n" +
-                  "          <source>12</source>\n" +
-                  "          <target>12</target>\n" +
+                  "          <source>13</source>\n" +
+                  "          <target>13</target>\n" +
                   "      </configuration>\n" +
                   "    </plugin>" +
                   "  </plugins>" +
                   "</build>");
 
     assertModules("project");
-    assertEquals(LanguageLevel.JDK_12_PREVIEW, getLanguageLevelForModule());
+    assertEquals(LanguageLevel.JDK_13_PREVIEW, getLanguageLevelForModule());
   }
 
   public void testInheritingLanguageLevelFromPluginManagementSection() {