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

multiplatformUtil: implement Module.toDescriptor()

Browse Source
This commit is contained in:
Dmitry Gridin
2019-08-08 16:23:53 +03:00
parent 755f7e8739
commit 8e9952e203
1 changed files with 3 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
+3 -1
View File
@@ -65,7 +65,7 @@ val Module.implementedModules: List<Module>
if (isNewMPPModule) { if (isNewMPPModule) {
rootManager.dependencies.filter { rootManager.dependencies.filter {
// TODO: remove additional android check // TODO: remove additional android check
it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId && (isAndroidModule() || it.isTestModule == isTestModule) it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId && (isAndroidModule() || it.isTestModule == isTestModule)
} }
} else { } else {
val modelsProvider = IdeModelsProviderImpl(project) val modelsProvider = IdeModelsProviderImpl(project)
@@ -112,6 +112,8 @@ val ModuleDescriptor.implementedDescriptors: List<ModuleDescriptor>
return moduleSourceInfo.expectedBy.mapNotNull { it.toDescriptor() } return moduleSourceInfo.expectedBy.mapNotNull { it.toDescriptor() }
} }
fun Module.toDescriptor() = (productionSourceInfo() ?: testSourceInfo())?.toDescriptor()
fun ModuleSourceInfo.toDescriptor() = KotlinCacheService.getInstance(module.project) fun ModuleSourceInfo.toDescriptor() = KotlinCacheService.getInstance(module.project)
.getResolutionFacadeByModuleInfo(this, platform)?.moduleDescriptor .getResolutionFacadeByModuleInfo(this, platform)?.moduleDescriptor