From effa29af2508f19704a3a3ca2de66b5e34c455fe Mon Sep 17 00:00:00 2001 From: "Victoria.Petrakovich" Date: Thu, 26 Jun 2025 16:16:13 +0000 Subject: [PATCH] [kotlin] For facets, try to get Kotlin compiler version from `KotlinJpsPluginSettings` to restrict max LV and AV ^KTIJ-33046 Fixed Merge-request: IJ-MR-166999 Merged-by: Victoria Petrakovich GitOrigin-RevId: e92255bd8a3baee79c90541d108f8b15dd2ac07b --- .../KotlinCompilerConfigurableTab.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 ee0e019ffe0d..7898d42eb5c5 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 @@ -363,9 +363,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { } apiVersionComboBox.setModel(new MutableCollectionComboBoxModel<>(permittedAPIVersions)); - if (isJpsCompilerVisible()) { - languageVersionComboBox.setModel(new MutableCollectionComboBoxModel<>(permittedAPIVersions)); - } + languageVersionComboBox.setModel(new MutableCollectionComboBoxModel<>(permittedAPIVersions)); VersionView selectedItem = VersionComparatorUtil.compare(selectedAPIVersion.getVersionString(), upperBound.getVersionString()) <= 0 @@ -636,7 +634,14 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable { JpsVersionItem selectedItem = (JpsVersionItem) kotlinJpsPluginVersionComboBox.getSelectedItem(); IdeKotlinVersion version = selectedItem != null ? selectedItem.getVersion() : null; LanguageVersion languageVersion = version != null ? LanguageVersion.fromFullVersionString(version.toString()) : null; - return languageVersion != null ? new VersionView.Specific(languageVersion) : getLatestStableVersion(); + VersionView versionView; + if (languageVersion != null) { + versionView = new VersionView.Specific(languageVersion); + } else { + String compilerVersionFromSettings = KotlinJpsPluginSettings.getInstance(project).getSettings().getVersion(); + versionView = VersionView.Companion.deserialize(compilerVersionFromSettings, /*isAutoAdvance =*/ false); + } + return versionView; } private @NotNull String getSelectedKotlinJpsPluginVersion() {