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

[CHERRY PICKED FROM IJ] [cleanup] Simplify KotlinTargetsIndexBuilder#calculateTargetDependencies implementation

Browse Source 
GitOrigin-RevId: 9f0fa45e441bc6764fe13d2055d6eaece54f5d7c
Original commit: https://github.com/JetBrains/intellij-community/commit/c6e794bc6e17bf198b1b0a59ff102e87278f7ca5
This commit is contained in:
Nikita Bobko
2021-11-01 16:57:31 +01:00
parent b252897a01
commit 8583808231
1 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinTargetsIndex.kt
+16 -40
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.targets
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.jps.model.java.JpsJavaClasspathKind
import org.jetbrains.jps.model.java.JpsJavaExtensionService
import org.jetbrains.jps.model.module.JpsModuleDependency
import org.jetbrains.kotlin.jps.build.KotlinBuilder
import org.jetbrains.kotlin.jps.build.KotlinChunk
import org.jetbrains.kotlin.jps.build.KotlinCompileContext
@@ -15,7 +16,9 @@ import org.jetbrains.kotlin.jps.build.ModuleBuildTarget
import org.jetbrains.kotlin.jps.model.platform
import org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider
import org.jetbrains.kotlin.platform.idePlatformKind
import org.jetbrains.kotlin.platform.impl.*
import org.jetbrains.kotlin.platform.impl.isCommon
import org.jetbrains.kotlin.platform.impl.isJavaScript
import org.jetbrains.kotlin.platform.impl.isJvm
import kotlin.system.measureTimeMillis
class KotlinTargetsIndex(
@@ -84,47 +87,20 @@ internal class KotlinTargetsIndexBuilder internal constructor(
}
private fun calculateTargetDependencies(srcTarget: KotlinModuleBuildTarget<*>): List<KotlinModuleBuildTarget.Dependency> {
val dependencies = mutableListOf<KotlinModuleBuildTarget.Dependency>()
val classpathKind = JpsJavaClasspathKind.compile(srcTarget.isTests)
val compileClasspathKind = JpsJavaClasspathKind.compile(srcTarget.isTests)
// TODO(1.2.80): Ask for JPS API
// Unfortunately JPS has no API for accessing "exported" flag while enumerating module dependencies,
// but has API for getting all and exported only dependent modules.
// So, lets first get set of all dependent targets, then remove exported only.
val dependentTargets = mutableSetOf<KotlinModuleBuildTarget<*>>()
JpsJavaExtensionService.dependencies(srcTarget.module)
.includedIn(classpathKind)
.processModules { destModule ->
val destKotlinTarget = byJpsModuleBuildTarget[ModuleBuildTarget(destModule, srcTarget.isTests)]
if (destKotlinTarget != null) {
dependentTargets.add(destKotlinTarget)
}
val jpsJavaExtensionService = JpsJavaExtensionService.getInstance()
return srcTarget.module.dependenciesList.dependencies.asSequence()
.filterIsInstance<JpsModuleDependency>()
.mapNotNull { dep ->
val extension = jpsJavaExtensionService.getDependencyExtension(dep)
?.takeIf { it.scope.isIncludedIn(compileClasspathKind) }
?: return@mapNotNull null
dep.module
?.let { byJpsModuleBuildTarget[ModuleBuildTarget(it, srcTarget.isTests)] }
?.let { KotlinModuleBuildTarget.Dependency(srcTarget, it, extension.isExported) }
}
JpsJavaExtensionService.dependencies(srcTarget.module)
.includedIn(classpathKind)
.exportedOnly()
.processModules { module ->
val destKotlinTarget = byJpsModuleBuildTarget[ModuleBuildTarget(module, srcTarget.isTests)]
if (destKotlinTarget != null) {
dependentTargets.remove(destKotlinTarget)
dependencies.add(KotlinModuleBuildTarget.Dependency(srcTarget, destKotlinTarget, true))
}
}
dependentTargets.forEach { destTarget ->
dependencies.add(KotlinModuleBuildTarget.Dependency(srcTarget, destTarget, false))
}
if (srcTarget.isTests) {
val srcProductionTarget = byJpsModuleBuildTarget[ModuleBuildTarget(srcTarget.module, false)]
if (srcProductionTarget != null) {
dependencies.add(KotlinModuleBuildTarget.Dependency(srcTarget, srcProductionTarget, true))
}
}
return dependencies
.toList()
}
private fun ensureLoaded(target: ModuleBuildTarget): KotlinModuleBuildTarget<*> {