From 3f1c413ee9ec75f871e88734e85290c0e16d9a26 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 27 Jun 2017 14:26:19 +0300 Subject: [PATCH] Code cleanup: several inspections applied Original commit: 840847e47cac994bb967dab419db772de3e9fa8d --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index ea124e32e72..32328819334 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -507,7 +507,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val outputFile = outputItem.outputFile val target = sourceFiles.firstOrNull()?.let { sourceToTarget[it] } ?: - chunk.targets.filter { it.outputDir?.let { outputFile.startsWith(it) } ?: false }.singleOrNull() ?: + chunk.targets.singleOrNull { it.outputDir?.let { outputFile.startsWith(it) } ?: false } ?: representativeTarget if (outputFile.name.endsWith(".class")) { @@ -642,7 +642,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { environment.messageCollector.report( STRONG_WARNING, "Circular dependencies are not supported. The following JS modules depend on each other: " - + chunk.modules.map { it.name }.joinToString(", ") + ". " + + chunk.modules.joinToString(", ") { it.name } + ". " + "Kotlin is not compiled for these modules" ) return null @@ -700,7 +700,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { environment.messageCollector.report( STRONG_WARNING, "Circular dependencies are only partially supported. The following modules depend on each other: " - + chunk.modules.map { it.name }.joinToString(", ") + ". " + + chunk.modules.joinToString(", ") { it.name } + ". " + "Kotlin will compile them, but some strange effect may happen" ) }