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

Code cleanup: several inspections applied

Browse Source 
Original commit: 840847e47c
This commit is contained in:
Mikhail Glukhikh
2017-06-27 14:26:19 +03:00
committed by Mikhail Glukhikh
parent 186b002a01
commit 3f1c413ee9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+3 -3
View File
@@ -507,7 +507,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
val outputFile = outputItem.outputFile val outputFile = outputItem.outputFile
val target = val target =
sourceFiles.firstOrNull()?.let { sourceToTarget[it] } ?: 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 representativeTarget
if (outputFile.name.endsWith(".class")) { if (outputFile.name.endsWith(".class")) {
@@ -642,7 +642,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
environment.messageCollector.report( environment.messageCollector.report(
STRONG_WARNING, STRONG_WARNING,
"Circular dependencies are not supported. The following JS modules depend on each other: " "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" + "Kotlin is not compiled for these modules"
) )
return null return null
@@ -700,7 +700,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
environment.messageCollector.report( environment.messageCollector.report(
STRONG_WARNING, STRONG_WARNING,
"Circular dependencies are only partially supported. The following modules depend on each other: " "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" + "Kotlin will compile them, but some strange effect may happen"
) )
} }