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

[Expect/Actual] Collect expectedBy modules correctly in case of HMPP

Browse Source
This commit is contained in:
Dmitry Savvinov
2019-06-03 09:33:01 +03:00
parent de2944ff43
commit 44cbdd142b
1 changed files with 2 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/moduleInfosFromIdeaModel.kt
+2 -1
View File
@@ -17,6 +17,7 @@ import com.intellij.openapi.roots.ProjectRootModificationTracker
import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.util.CachedValueProvider
import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.isCommon import org.jetbrains.kotlin.platform.isCommon
import org.jetbrains.kotlin.types.typeUtil.closure
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
fun getModuleInfosFromIdeaModel(project: Project, platform: TargetPlatform): List<IdeaModuleInfo> { fun getModuleInfosFromIdeaModel(project: Project, platform: TargetPlatform): List<IdeaModuleInfo> {
@@ -78,7 +79,7 @@ private fun mergePlatformModules(
listOf(module to module.expectedBy) listOf(module to module.expectedBy)
else emptyList() else emptyList()
}.map { (module, expectedBys) -> }.map { (module, expectedBys) ->
PlatformModuleInfo(module, expectedBys) PlatformModuleInfo(module, expectedBys.closure { it.expectedBy }.toList())
} }
val rest = allModules - platformModules.flatMap { it.containedModules } val rest = allModules - platformModules.flatMap { it.containedModules }