[CHERRY PICKED FROM IJ] KotlinChunk.Companion#calculateTargetDependencies - don't forget to add dependency from "tests" to "production"

I recently simplified `calculateTargetDependencies` 9f0fa45e441bc6764fe13d2055d6eaece54f5d7c but I
accidentaly changed the logic. This commit returns accidentaly removed logic

GitOrigin-RevId: bde45bc14ad82fcef976b5cce9c6a601ce129230
Original commit: https://github.com/JetBrains/intellij-community/commit/2e845a1122917238049421fd8a99af0da58ecc12
This commit is contained in:
Nikita Bobko
2021-11-05 17:15:42 +01:00
parent 4d732dea10
commit ace99c5d4f
@@ -80,7 +80,7 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta
val compileClasspathKind = JpsJavaClasspathKind.compile(srcTarget.isTests)
val jpsJavaExtensionService = JpsJavaExtensionService.getInstance()
return srcTarget.module.dependenciesList.dependencies.asSequence()
val dependencies = srcTarget.module.dependenciesList.dependencies.asSequence()
.filterIsInstance<JpsModuleDependency>()
.mapNotNull { dep ->
val extension = jpsJavaExtensionService.getDependencyExtension(dep)
@@ -90,7 +90,16 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta
?.let { byJpsModuleBuildTarget[ModuleBuildTarget(it, srcTarget.isTests)] }
?.let { KotlinModuleBuildTarget.Dependency(srcTarget, it, extension.isExported) }
}
.toList()
.toMutableList()
if (srcTarget.isTests) {
val srcProductionTarget = byJpsModuleBuildTarget[ModuleBuildTarget(srcTarget.module, isTests = false)]
if (srcProductionTarget != null) {
dependencies.add(KotlinModuleBuildTarget.Dependency(srcTarget, srcProductionTarget, exported = true))
}
}
return dependencies
}
}