From 5d91ccf7d28424527eedffc93d2340fd93d79d1c Mon Sep 17 00:00:00 2001 From: Frederik Haselmeier Date: Thu, 7 Nov 2024 18:06:05 +0100 Subject: [PATCH] [kotlin] Fixed broken logic in KotlinCompilerConfigurableTab ^KTIJ-32062 fixed (cherry picked from commit 9d2cba33c68ca2a65dfa1c95f1424e54ea5b72ce) IJ-CR-148869 GitOrigin-RevId: 27a1472284f589cd29eebfca433e7f9c5f4560c5 --- .../configuration/KotlinCompilerConfigurableTab.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/kotlin/base/compiler-configuration-ui/src/org/jetbrains/kotlin/idea/base/compilerPreferences/configuration/KotlinCompilerConfigurableTab.java b/plugins/kotlin/base/compiler-configuration-ui/src/org/jetbrains/kotlin/idea/base/compilerPreferences/configuration/KotlinCompilerConfigurableTab.java index d3508c057f5a..bafe19e89e22 100644 --- a/plugins/kotlin/base/compiler-configuration-ui/src/org/jetbrains/kotlin/idea/base/compilerPreferences/configuration/KotlinCompilerConfigurableTab.java +++ b/plugins/kotlin/base/compiler-configuration-ui/src/org/jetbrains/kotlin/idea/base/compilerPreferences/configuration/KotlinCompilerConfigurableTab.java @@ -532,16 +532,13 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { return latestStable; } - IdeKotlinVersion version = KotlinJpsPluginSettings.getBundledVersion(); - KotlinVersion bundledKotlinVersion = version.getKotlinVersion(); - int bundledMajorVersion = bundledKotlinVersion.getMajor(); - int bundledMinorVersion = bundledKotlinVersion.getMinor(); + LanguageVersion bundledLanguageVersion = KotlinJpsPluginSettings.getBundledVersion().getLanguageVersion(); latestStable = VersionView.LatestStable.INSTANCE; // workaround to avoid cases when Kotlin plugin bundles the latest compiler with effectively NOT STABLE version. // Actually, the latest stable version is bundled in jps for (LanguageVersion languageVersion : LanguageVersion.getEntries()) { - if (languageVersion.getMajor() <= bundledMajorVersion && languageVersion.getMinor() <= bundledMinorVersion) { + if (languageVersion.compareTo(bundledLanguageVersion) <= 0) { latestStable = VersionView.Companion.deserialize(languageVersion.getVersionString(), false); } else { break;