From c311a66e5e837693335ce9bd4893ab79724e6951 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 20 Dec 2019 03:21:41 +0300 Subject: [PATCH] Fix 191 & as35 compilation --- .../IdeaBuildSystemAvailabilityWizardService.kt | 10 +++++++--- .../wizard/ui/components/DropDownComponent.kt | 3 +-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaBuildSystemAvailabilityWizardService.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaBuildSystemAvailabilityWizardService.kt index 2971cd4564d..3bf7592ad68 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaBuildSystemAvailabilityWizardService.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaBuildSystemAvailabilityWizardService.kt @@ -5,15 +5,19 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.service -import com.intellij.ide.plugins.PluginManagerCore +import com.intellij.ide.plugins.PluginManager +import com.intellij.openapi.extensions.PluginId import org.jetbrains.kotlin.tools.projectWizard.core.service.BuildSystemAvailabilityWizardService import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.isGradle class IdeaBuildSystemAvailabilityWizardService : BuildSystemAvailabilityWizardService, IdeaWizardService { override fun isAvailable(buildSystemType: BuildSystemType): Boolean = when { - buildSystemType.isGradle -> !PluginManagerCore.isDisabled("org.jetbrains.plugins.gradle") - buildSystemType == BuildSystemType.Maven -> !PluginManagerCore.isDisabled("org.jetbrains.idea.maven") + buildSystemType.isGradle -> isPluginEnabled("org.jetbrains.plugins.gradle") + buildSystemType == BuildSystemType.Maven -> isPluginEnabled("org.jetbrains.idea.maven") else -> true } + + private fun isPluginEnabled(id: String) = + PluginManager.getPlugin(PluginId.getId(id))?.isEnabled == true } \ No newline at end of file diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/components/DropDownComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/components/DropDownComponent.kt index 06e9a55806d..3d5ef3cb328 100644 --- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/components/DropDownComponent.kt +++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/components/DropDownComponent.kt @@ -3,7 +3,6 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.components import com.intellij.openapi.ui.ComboBox import com.intellij.ui.ColoredListCellRenderer import com.intellij.ui.SimpleTextAttributes -import com.intellij.ui.layout.selectedValueIs import org.jetbrains.kotlin.tools.projectWizard.core.entity.SettingValidator import org.jetbrains.kotlin.tools.projectWizard.core.entity.ValidationResult import org.jetbrains.kotlin.tools.projectWizard.core.ValuesReadingContext @@ -58,7 +57,7 @@ class DropDownComponent( value.greyText?.let { append(" $it", SimpleTextAttributes.GRAYED_ATTRIBUTES) } - if (!this@apply.selectedValueIs(value).invoke()) { + if (this@apply.selectedItem != value) { validator.validate(valuesReadingContext, value) .safeAs() ?.messages