From c9a93eb1b5239c7a1fd64a53336ea02a559364e1 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Wed, 1 Sep 2021 13:44:51 +0300 Subject: [PATCH] Get rid of hard referencing to LanguageLevel entries It should make easier to use different intellij-core versions Some of them doesn't have JDK_15_PREVIEW while the other don't have JDK_17, while we're ok with both of them since they support records and sealed interfaces --- .../jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt index b14569fb5fc..bf1c37218da 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt @@ -10,5 +10,8 @@ import com.intellij.openapi.roots.LanguageLevelProjectExtension import com.intellij.pom.java.LanguageLevel fun Project.setupHighestLanguageLevel() { - LanguageLevelProjectExtension.getInstance(this).languageLevel = LanguageLevel.JDK_15_PREVIEW + LanguageLevelProjectExtension.getInstance(this).languageLevel = + LanguageLevel.values().firstOrNull { it.name == "JDK_17" } + ?: LanguageLevel.values().firstOrNull { it.name == "JDK_15_PREVIEW" } + ?: LanguageLevel.JDK_X }