azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPP: don't return Main modules from implementedModules for Test modules

Browse Source 
#KT-28529 Fixed
#KT-30799 Fixed
This commit is contained in:
Dmitry Gridin
2019-07-15 18:10:54 +03:00
parent 60421c441e
commit b1e371a2dd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
+4 -1
View File
@@ -39,6 +39,9 @@ val Module.sourceType: SourceType?
val Module.isMPPModule: Boolean val Module.isMPPModule: Boolean
get() = facetSettings?.isMPPModule ?: false get() = facetSettings?.isMPPModule ?: false
val Module.isTestModule: Boolean
get() = facetSettings?.isTestModule ?: false
val KotlinFacetSettings.isMPPModule: Boolean val KotlinFacetSettings.isMPPModule: Boolean
get() = targetPlatform.isCommon() || implementedModuleNames.isNotEmpty() || kind.isNewMPP get() = targetPlatform.isCommon() || implementedModuleNames.isNotEmpty() || kind.isNewMPP
@@ -65,7 +68,7 @@ val Module.implementedModules: List<Module>
CachedValueProvider.Result( CachedValueProvider.Result(
if (isNewMPPModule) { if (isNewMPPModule) {
rootManager.dependencies.filter { rootManager.dependencies.filter {
it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId && it.isTestModule == isTestModule
} }
} else { } else {
val modelsProvider = IdeModelsProviderImpl(project) val modelsProvider = IdeModelsProviderImpl(project)