diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt index d8693d2a120..949b97f7885 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt @@ -276,10 +276,15 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { } } for (sourceSet in sourceSets) { - val compilations = sourceSetToCompilations[sourceSet] ?: continue - sourceSet.platform = compilations.map { it.platform }.distinct().singleOrNull() ?: KotlinPlatform.COMMON - sourceSet.isTestModule = compilations.all { it.isTestModule } - sourceSet.isAndroid = compilations.all { it.isAndroid } + val compilations = sourceSetToCompilations[sourceSet] + if (compilations != null) { + sourceSet.platform = compilations.map { it.platform }.distinct().singleOrNull() ?: KotlinPlatform.COMMON + sourceSet.isTestModule = compilations.all { it.isTestModule } + sourceSet.isAndroid = compilations.all { it.isAndroid } + } else { + // TODO: change me after design about it + sourceSet.isTestModule = "Test" in sourceSet.name + } } } diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181 b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181 index 2cf47ce3799..2f2e88efbda 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181 +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt.181 @@ -276,10 +276,15 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { } } for (sourceSet in sourceSets) { - val compilations = sourceSetToCompilations[sourceSet] ?: continue - sourceSet.platform = compilations.map { it.platform }.distinct().singleOrNull() ?: KotlinPlatform.COMMON - sourceSet.isTestModule = compilations.all { it.isTestModule } - sourceSet.isAndroid = compilations.all { it.isAndroid } + val compilations = sourceSetToCompilations[sourceSet] + if (compilations != null) { + sourceSet.platform = compilations.map { it.platform }.distinct().singleOrNull() ?: KotlinPlatform.COMMON + sourceSet.isTestModule = compilations.all { it.isTestModule } + sourceSet.isAndroid = compilations.all { it.isAndroid } + } else { + // TODO: change me after design about it + sourceSet.isTestModule = "Test" in sourceSet.name + } } }