From 22c77ffbb20cf9e309a7b820d0958650ba3fc735 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 18 Sep 2018 16:39:25 +0300 Subject: [PATCH] MPP: Do not populate content roots in the absence of ExternalProject #KT-26900 Fixed --- .../kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt index 1ae02c5cc31..3242a03f721 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt @@ -301,6 +301,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() { resolverCtx: ProjectResolverContext ) { val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java) ?: return + if (resolverCtx.getExtraProject(gradleModule, ExternalProject::class.java) == null) return processSourceSets(gradleModule, mppModel, ideModule, resolverCtx) { dataNode, sourceSet -> if (dataNode == null || sourceSet.platform == KotlinPlatform.ANDROID) return@processSourceSets createContentRootData(sourceSet.sourceDirs, sourceSet.sourceType, dataNode)