From 63f58b4a4a87a46b7713aa76e2f7883b0ce0344b Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 19 Apr 2019 12:06:48 +0700 Subject: [PATCH] Add applicability condition to KotlinNativeGradleConfigurator --- .../gradle/KotlinNativeGradleConfigurator.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinNativeGradleConfigurator.kt b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinNativeGradleConfigurator.kt index 327e9172985..a64d5bea7ec 100644 --- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinNativeGradleConfigurator.kt +++ b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinNativeGradleConfigurator.kt @@ -11,21 +11,20 @@ import org.jetbrains.kotlin.idea.configuration.KotlinWithGradleConfigurator import org.jetbrains.kotlin.idea.configuration.ModuleSourceRootGroup import org.jetbrains.kotlin.resolve.konan.platform.KonanPlatform - open class KotlinNativeGradleConfigurator : KotlinWithGradleConfigurator() { - override fun getKotlinPluginExpression(forKotlinDsl: Boolean): String { - return "" - } + override fun getKotlinPluginExpression(forKotlinDsl: Boolean): String = "" override fun getStatus(moduleSourceRootGroup: ModuleSourceRootGroup): ConfigureKotlinStatus { - if (moduleSourceRootGroup.sourceRootModules.any(::hasKotlinNativeRuntimeInScope)) { + if (!isApplicable(moduleSourceRootGroup.baseModule)) + return ConfigureKotlinStatus.NON_APPLICABLE + + if (moduleSourceRootGroup.sourceRootModules.any(::hasKotlinNativeRuntimeInScope)) return ConfigureKotlinStatus.CONFIGURED - } + return ConfigureKotlinStatus.NON_APPLICABLE } - override val kotlinPluginName: String - get() = "" + override val kotlinPluginName: String get() = "" override val name: String get() = NAME