KotlinBuilder: use proper API to update Java mappings

jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt

@@ -261,7 +261,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
 
         @Suppress("REIFIED_TYPE_UNSAFE_SUBSTITUTION")
         val generatedClasses = generatedFiles.filterIsInstance<GeneratedJvmClass<ModuleBuildTarget>>()
-        val additionalPassRequired = updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses, incrementalCaches)
+        updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses, incrementalCaches)
 
         if (!IncrementalCompilation.isEnabled()) {
             return OK
@@ -279,7 +279,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
         processChanges(filesToCompile.values().toSet(), allCompiledFiles, dataManager, incrementalCaches.values, changesInfo, fsOperations)
         incrementalCaches.values.forEach { it.cleanDirtyInlineFunctions() }
 
-        return if (additionalPassRequired) ADDITIONAL_PASS_REQUIRED else OK
+        return OK
     }
 
     private fun applyActionsOnCacheVersionChange(
@@ -476,10 +476,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             filesToCompile: MultiMap<ModuleBuildTarget, File>,
             generatedClasses: List<GeneratedJvmClass<ModuleBuildTarget>>,
             incrementalCaches: Map<ModuleBuildTarget, JpsIncrementalCacheImpl>
-    ): Boolean {
+    ) {
         val previousMappings = context.projectDescriptor.dataManager.mappings
-        val delta = previousMappings.createDelta()
+        val callback = JavaBuilderUtil.getDependenciesRegistrar(context)
-        val callback = delta.callback
+
         val targetDirtyFiles: Map<ModuleBuildTarget, Set<File>> = chunk.targets.keysToMap {
             val files = HashSet<File>()
             dirtyFilesHolder.getRemovedFiles(it).mapTo(files, ::File)
@@ -511,9 +511,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
         }
 
         val allCompiled = filesToCompile.values()
-        val compiledInThisRound = if (compilationErrors) listOf<File>() else allCompiled
+        val successfullyCompiled = if (compilationErrors) listOf<File>() else allCompiled
 
-        return JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound)
+        JavaBuilderUtil.registerFilesToCompile(context, allCompiled)
+        JavaBuilderUtil.registerSuccessfullyCompiled(context, successfullyCompiled)
     }
 
     private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, generatedFiles: List<GeneratedFile<ModuleBuildTarget>>) {

jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log

@@ -11,11 +11,9 @@ Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module
-  out/production/module/constant/ConstantKt.class
   out/production/module/usage/UsageKt.class
 End of files
 Compiling files:
-  src/constant.kt
   src/usage.kt
 End of files
 Exit code: OK

jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log

@@ -9,14 +9,7 @@ Compiling files:
 End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
-Cleaning output files:
+Exit code: NOTHING_DONE
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/test/Module1_constKt.class
-End of files
-Compiling files:
-  module1/src/module1_const.kt
-End of files
-Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module2/usage/Usage.class

jps-plugin/testData/incremental/pureKotlin/allConstants/build.log

@@ -22,12 +22,9 @@ End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
   out/production/module/test/Usage.class
 End of files
 Compiling files:
-  src/const.kt
   src/usage.kt
 End of files
 Exit code: OK

jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log

@@ -10,12 +10,9 @@ End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
   out/production/module/test/Usage.class
 End of files
 Compiling files:
-  src/const.kt
   src/usage.kt
 End of files
 Exit code: OK

jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log

@@ -0,0 +1,22 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+  out/production/module/test/Usage.class
+End of files
+Compiling files:
+  src/const.kt
+  src/usage.kt
+End of files
+Exit code: OK
+------------------------------------------

jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log

@@ -3,7 +3,7 @@
 Compiling files:
   src/class2.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/Klass.class

jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log

@@ -20,7 +20,7 @@ Compiling files:
   src/other.kt
   src/usage.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module

jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log

@@ -0,0 +1,22 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Test.class
+  out/production/module/test/Test__BKt.class
+End of files
+Compiling files:
+  src/b.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Test.class
+  out/production/module/test/Test__AKt.class
+End of files
+Compiling files:
+  src/a.kt
+End of files
+Exit code: OK
+------------------------------------------

jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log

@@ -9,11 +9,9 @@ End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
-  out/production/module/test/Object.class
   out/production/module/test/Usage.class
 End of files
 Compiling files:
-  src/const.kt
   src/usage.kt
 End of files
 Exit code: OK

jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log

@@ -0,0 +1,20 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/test/Object.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/test/Object.class
+  out/production/module/test/Usage.class
+End of files
+Compiling files:
+  src/const.kt
+  src/usage.kt
+End of files
+Exit code: OK
+------------------------------------------

jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log

@@ -10,12 +10,9 @@ End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
   out/production/module/test/Usage.class
 End of files
 Compiling files:
-  src/const.kt
   src/usage.kt
 End of files
 Exit code: OK

jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log

@@ -10,12 +10,9 @@ End of files
 Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
-  out/production/module/test/Trait$Companion.class
-  out/production/module/test/Trait.class
   out/production/module/test/Usage.class
 End of files
 Compiling files:
-  src/const.kt
   src/usage.kt
 End of files
 Exit code: OK

jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log

@@ -0,0 +1,22 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/test/Trait$Companion.class
+  out/production/module/test/Trait.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/test/Trait$Companion.class
+  out/production/module/test/Trait.class
+  out/production/module/test/Usage.class
+End of files
+Compiling files:
+  src/const.kt
+  src/usage.kt
+End of files
+Exit code: OK
+------------------------------------------

jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log

@@ -0,0 +1,23 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/TheClass.class
+End of files
+Compiling files:
+  src/TheClass.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/Usage.class
+  out/production/module/UsageInKotlinKt.class
+End of files
+Compiling files:
+  src/usageInKotlin.kt
+End of files
+Exit code: OK
+------------------------------------------
+Compiling files:
+  src/Usage.java
+End of files

jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log

@@ -11,7 +11,7 @@ Compiling files:
   src/Foo.kt
   src/usage.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log

@@ -7,7 +7,7 @@ End of files
 Compiling files:
   src/fun.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/JavaUsage.class

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log

@@ -7,7 +7,7 @@ End of files
 Compiling files:
   src/fun.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/Usage.class

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log

@@ -11,13 +11,8 @@ Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/module/Usage.class
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
 End of files
-Compiling files:
+Exit code: NOTHING_DONE
-  src/const.kt
-End of files
-Exit code: OK
 ------------------------------------------
 Compiling files:
   src/Usage.java

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log

@@ -0,0 +1,24 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/Usage.class
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------
+Compiling files:
+  src/Usage.java
+End of files

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log

@@ -7,7 +7,7 @@ End of files
 Compiling files:
   src/fun.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/WillBeUnresolved.class

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log

@@ -11,13 +11,8 @@ Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/module/Usage.class
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
 End of files
-Compiling files:
+Exit code: NOTHING_DONE
-  src/const.kt
-End of files
-Exit code: OK
 ------------------------------------------
 Compiling files:
   src/Usage.java

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log

@@ -0,0 +1,24 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/Usage.class
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------
+Compiling files:
+  src/Usage.java
+End of files

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log

@@ -6,7 +6,7 @@ End of files
 Compiling files:
   src/Super.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/Sub.class

jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log

@@ -7,7 +7,7 @@ End of files
 Compiling files:
   src/prop.kt
 End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
+Exit code: OK
 ------------------------------------------
 Cleaning output files:
   out/production/module/WillBeUnresolved.class