MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Do not limit language versions when compiler is not accessible

Browse Source 
#KTIJ-29106 Fixed

GitOrigin-RevId: 953706482daecdbbf2f424fd38bc7d4097235b88
This commit is contained in:
Vladimir Dolzhenko
2024-03-14 17:01:46 +00:00
committed by intellij-monorepo-bot
parent 914d16b526
commit de3d8ffd79
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/base/compiler-configuration-ui/src/org/jetbrains/kotlin/idea/base/compilerPreferences/configuration/KotlinCompilerConfigurableTab.java
+15 -5
View File
@@ -152,8 +152,10 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
warningLabel.setIcon(AllIcons.General.WarningDialog);
additionalArgsOptionsField.attachLabel(additionalArgsLabel);
kotlinJpsPluginVersionComboBox.addActionListener(
e -> onLanguageLevelChanged(getSelectedKotlinJpsPluginVersionView()));
if (isJpsCompilerVisible()) {
kotlinJpsPluginVersionComboBox.addActionListener(
e -> onLanguageLevelChanged(getSelectedKotlinJpsPluginVersionView()));
}
fillVersions();
@@ -373,14 +375,18 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
}
apiVersionComboBox.setModel(new MutableCollectionComboBoxModel<>(permittedAPIVersions));
languageVersionComboBox.setModel(new MutableCollectionComboBoxModel<>(permittedAPIVersions));
if (isJpsCompilerVisible()) {
languageVersionComboBox.setModel(new MutableCollectionComboBoxModel<>(permittedAPIVersions));
}
VersionView selectedItem =
VersionComparatorUtil.compare(selectedAPIVersion.getVersionString(), upperBound.getVersionString()) <= 0
? selectedAPIView
: upperBoundView;
apiVersionComboBox.setSelectedItem(selectedItem);
languageVersionComboBox.setSelectedItem(selectedItem);
if (isJpsCompilerVisible()) {
languageVersionComboBox.setSelectedItem(selectedItem);
}
}
private void fillJvmVersionList() {
@@ -432,8 +438,12 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable {
});
}
private boolean isJpsCompilerVisible() {
return isProjectSettings && jpsPluginSettings != null;
}
private void fillVersions() {
if (isProjectSettings && jpsPluginSettings != null) {
if (isJpsCompilerVisible()) {
defaultJpsVersionItem = JpsVersionItem.createFromRawVersion(
KotlinJpsPluginSettingsKt.getVersionWithFallback(jpsPluginSettings)
);