diff --git a/build-common/src/org/jetbrains/kotlin/incremental/CompilationTransaction.kt b/build-common/src/org/jetbrains/kotlin/incremental/CompilationTransaction.kt index 98387108e0e..46b80222ae0 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/CompilationTransaction.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/CompilationTransaction.kt @@ -82,9 +82,9 @@ inline fun CompilationTransaction.runWithin( } /** - * A dummy implementation of compilation transaction + * A non-recoverable implementation of compilation transaction. Changes reverting on failure should be performed externally if needed. */ -class DummyCompilationTransaction : CompilationTransaction { +class NonRecoverableCompilationTransaction : CompilationTransaction { override fun registerAddedOrChangedFile(outputFile: Path) { // do nothing } diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCompilationContext.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCompilationContext.kt index d297a264f3b..ed8b9d16955 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCompilationContext.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCompilationContext.kt @@ -16,7 +16,7 @@ private fun createDefaultPathConverter(rootProjectDir: File?) = IncrementalFileT class IncrementalCompilationContext( val pathConverter: FileToPathConverter, val storeFullFqNamesInLookupCache: Boolean = false, - val transaction: CompilationTransaction = DummyCompilationTransaction(), + val transaction: CompilationTransaction = NonRecoverableCompilationTransaction(), val reporter: ICReporter = DoNothingICReporter, /** * Controls whether changes in lookup cache should be tracked. Required for the classpath snapshots based IC approach @@ -32,7 +32,7 @@ class IncrementalCompilationContext( constructor( rootProjectDir: File?, storeFullFqNamesInLookupCache: Boolean = false, - transaction: CompilationTransaction = DummyCompilationTransaction(), + transaction: CompilationTransaction = NonRecoverableCompilationTransaction(), reporter: ICReporter = DoNothingICReporter, trackChangesInLookupCache: Boolean = false, keepIncrementalCompilationCachesInMemory: Boolean = false, diff --git a/build-common/test/org/jetbrains/kotlin/incremental/CompilationTransactionTest.kt b/build-common/test/org/jetbrains/kotlin/incremental/CompilationTransactionTest.kt index 547410111a9..89948cc7c96 100644 --- a/build-common/test/org/jetbrains/kotlin/incremental/CompilationTransactionTest.kt +++ b/build-common/test/org/jetbrains/kotlin/incremental/CompilationTransactionTest.kt @@ -33,8 +33,8 @@ abstract class BaseCompilationTransactionTest { } } -class DummyCompilationTransactionTest : BaseCompilationTransactionTest() { - override fun createTransaction() = DummyCompilationTransaction() +class NonRecoverableCompilationTransactionTest : BaseCompilationTransactionTest() { + override fun createTransaction() = NonRecoverableCompilationTransaction() @Test fun testModifyingExistingFileOnSuccess() { 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 8a96f1ca4e5..50eeb3294a9 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 @@ -268,7 +268,7 @@ abstract class IncrementalCompilerRunner< reporter.debug { "Cleaning ${outputDirsToClean.size} output directories" } cleanOrCreateDirectories(outputDirsToClean) } - val icContext = createIncrementalCompilationContext(projectDir, DummyCompilationTransaction()) + val icContext = createIncrementalCompilationContext(projectDir, NonRecoverableCompilationTransaction()) return createCacheManager(icContext, args).use { caches -> if (trackChangedFiles) { caches.inputsCache.sourceSnapshotMap.compareAndUpdate(allSourceFiles) @@ -405,7 +405,7 @@ abstract class IncrementalCompilerRunner< private fun createTransaction() = if (preciseCompilationResultsBackup) { RecoverableCompilationTransaction(reporter, Files.createTempDirectory("kotlin-backups")) } else { - DummyCompilationTransaction() + NonRecoverableCompilationTransaction() } protected open fun performWorkBeforeCompilation(compilationMode: CompilationMode, args: Args) {} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt index 873ded033d2..0b66c4d917d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt @@ -13,9 +13,7 @@ import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage import org.jetbrains.kotlin.build.joinToReadableString -import org.jetbrains.kotlin.build.report.DoNothingICReporter import org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME -import org.jetbrains.kotlin.incremental.DummyCompilationTransaction import org.jetbrains.kotlin.incremental.IncrementalCompilationContext import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.storage.FileToPathConverter