From 1eb1735ac9c3986ddd0af3e1c1b640be239f3505 Mon Sep 17 00:00:00 2001 From: baratynskiy Date: Tue, 16 May 2017 16:10:36 +0300 Subject: [PATCH] Return from `compile()` function immediately if javaFiles collection is empty --- .../src/org/jetbrains/kotlin/javac/JavacWrapper.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt index f75024ac601..6112c664324 100644 --- a/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt +++ b/compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt @@ -143,7 +143,7 @@ class JavacWrapper(javaFiles: Collection, } .associateBy(TreeBasedPackage::fqName) - private val kotlinClassifiersCache = KotlinClassifiersCache(kotlinFiles, this) + private val kotlinClassifiersCache = KotlinClassifiersCache(if (javaFiles.isNotEmpty()) kotlinFiles else emptyList(), this) private val treePathResolverCache = TreePathResolverCache(this) private val symbolBasedClassesCache = hashMapOf() private val symbolBasedPackagesCache = hashMapOf() @@ -151,9 +151,13 @@ class JavacWrapper(javaFiles: Collection, fun compile(outDir: File? = null): Boolean = with(javac) { if (errorCount() > 0) return false + val javaFilesNumber = fileObjects.length() + if (javaFilesNumber == 0) return true + fileManager.setClassPathForCompilation(outDir) messageCollector?.report(CompilerMessageSeverity.INFO, - "Compiling Java sources") + "Compiling $javaFilesNumber Java source files" + + " to [${fileManager.getLocation(StandardLocation.CLASS_OUTPUT)?.firstOrNull()?.path}]") compile(fileObjects) errorCount() == 0 }