diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt b/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt index de1592f9e98..1c6a8e62bba 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.cli.common.ExitCode import java.io.File interface ICReporter { - fun report(message: ()->String) + fun report(message: () -> String) // used in Gradle plugin @Suppress("unused") diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt index dfa187249b7..48e85042644 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt @@ -63,7 +63,9 @@ abstract class IncrementalCompilerRunner< assert(isICEnabled()) { "Incremental compilation is not enabled" } var caches = createCacheManager(args) - fun rebuild(): ExitCode { + fun rebuild(reason: () -> String): ExitCode { + reporter.report(reason) + caches.clean() dirtySourcesSinceLastTimeFile.delete() destinationDir(args).deleteRecursively() @@ -83,8 +85,7 @@ abstract class IncrementalCompilerRunner< compileIncrementally(args, caches, allKotlinSources, compilationMode, messageCollector) } is CompilationMode.Rebuild -> { - reporter.report { "Non-incremental compilation will be performed: ${compilationMode.reason}" } - rebuild() + rebuild { "Non-incremental compilation will be performed: ${compilationMode.reason}" } } } @@ -94,8 +95,7 @@ abstract class IncrementalCompilerRunner< } catch (e: Exception) { // todo: warn? - reporter.report { "Possible cache corruption. Rebuilding. $e" } - rebuild() + rebuild { "Possible cache corruption. Rebuilding. $e" } } } @@ -127,7 +127,7 @@ abstract class IncrementalCompilerRunner< protected sealed class CompilationMode { class Incremental(val dirtyFiles: Set) : CompilationMode() - class Rebuild(getReason: ()->String = { "" }) : CompilationMode() { + class Rebuild(getReason: () -> String = { "" }) : CompilationMode() { val reason: String by lazy(getReason) } } diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index 8db06e822cc..b7a6d616447 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -67,7 +67,7 @@ fun makeIncrementally( } object EmptyICReporter : ICReporter { - override fun report(message: ()->String) { + override fun report(message: () -> String) { } } diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt index 3372e0c7473..d138a400b6b 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt @@ -29,7 +29,7 @@ class TestICReporter : ICReporter { var exitCode: ExitCode = ExitCode.OK private set - override fun report(message: ()->String) { + override fun report(message: () -> String) { } override fun reportCompileIteration(sourceFiles: Collection, exitCode: ExitCode) { diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e8a34aa3a40..ce03d27e1f9 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -789,7 +789,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } private class JpsICReporter : ICReporter { - override fun report(message: ()->String) { + override fun report(message: () -> String) { if (KotlinBuilder.LOG.isDebugEnabled) { KotlinBuilder.LOG.debug(message()) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleICReporter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleICReporter.kt index f6b4ee4bbd7..6b1ca6b109d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleICReporter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleICReporter.kt @@ -24,7 +24,7 @@ import java.io.File internal class GradleICReporter(private val projectRootFile: File) : ICReporter { private val log = Logging.getLogger(GradleICReporter::class.java) - override fun report(message: ()->String) { + override fun report(message: () -> String) { log.kotlinDebug(message) }