JPS MPP tests: Don't do anything for common modules, enable js ic, fix test data

jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt

@@ -84,7 +84,8 @@ abstract class AbstractIncrementalJpsTest(
     protected lateinit var projectDescriptor: ProjectDescriptor
     // is used to compare lookup dumps in a human readable way (lookup symbols are hashed in an actual lookup storage)
     protected lateinit var lookupsDuringTest: MutableSet<LookupSymbol>
-    private var isICEnabledBackup: Boolean = false
+    private var isJvmICEnabledBackup: Boolean = false
+    private var isJsICEnabledBackup: Boolean = false
 
     protected var mapWorkingToOriginalFile: MutableMap<File, File> = hashMapOf()
 
@@ -121,9 +122,13 @@ abstract class AbstractIncrementalJpsTest(
 
     override fun setUp() {
         super.setUp()
+
         lookupsDuringTest = hashSetOf()
-        isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
+        isJvmICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
+        isJsICEnabledBackup = IncrementalCompilation.isEnabledForJs()
+
         IncrementalCompilation.setIsEnabledForJvm(true)
+        IncrementalCompilation.setIsEnabledForJs(true)
 
         if (DEBUG_LOGGING_ENABLED) {
             enableDebugLogging()
@@ -132,11 +137,16 @@ abstract class AbstractIncrementalJpsTest(
 
     override fun tearDown() {
         restoreSystemProperties()
+
         (AbstractIncrementalJpsTest::myProject).javaField!![this] = null
         (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null
         (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null
+
         lookupsDuringTest.clear()
-        IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
+
+        IncrementalCompilation.setIsEnabledForJvm(isJvmICEnabledBackup)
+        IncrementalCompilation.setIsEnabledForJs(isJsICEnabledBackup)
+
         super.tearDown()
     }
 
@@ -423,9 +433,7 @@ abstract class AbstractIncrementalJpsTest(
     protected open fun performAdditionalModifications(modifications: List<Modification>) {
     }
 
-    protected open fun generateModuleSources(modulesTxt: ModulesTxt) {
+    protected open fun generateModuleSources(modulesTxt: ModulesTxt) = Unit
-
-    }
 
     // null means one module
     private fun configureModules(): ModulesTxt? {
@@ -498,7 +506,7 @@ abstract class AbstractIncrementalJpsTest(
         modulesTxt.modules.forEach { module ->
             val sourceDirName = "${module.name}/src"
             val sourceDestinationDir = File(workDir, sourceDirName)
-            val sourcesMapping = copyTestSources(testDataDir, sourceDestinationDir, module.sourceFilePrefix)
+            val sourcesMapping = copyTestSources(testDataSrc, sourceDestinationDir, module.sourceFilePrefix)
             mapWorkingToOriginalFile.putAll(sourcesMapping)
 
             preProcessSources(sourceDestinationDir)

jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractMultiplatformJpsTest.kt

@@ -32,5 +32,5 @@ abstract class AbstractMultiplatformJpsTest : AbstractIncrementalJpsTest() {
     }
 
     override val ModulesTxt.Module.sourceFilePrefix: String
-        get() = indexedName
+        get() = "${indexedName}_"
 }

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

@@ -184,7 +184,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
         val kotlinChunk = kotlinContext.getChunk(chunk) ?: return
         kotlinContext.checkChunkCacheVersion(kotlinChunk)
 
-        if (!kotlinContext.rebuildingAllKotlin) {
+        if (!kotlinContext.rebuildingAllKotlin && kotlinChunk.isEnabled) {
             markAdditionalFilesForInitialRound(kotlinChunk, chunk, kotlinContext)
         }
 
@@ -327,10 +327,17 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             return NOTHING_DONE
         }
 
+        val kotlinChunk = chunk.toKotlinChunk(context)!!
+
+        if (!kotlinChunk.isEnabled) {
+            return NOTHING_DONE
+        }
+
         val kotlinContext = context.kotlin
         val projectDescriptor = context.projectDescriptor
         val dataManager = projectDescriptor.dataManager
         val targets = chunk.targets
+
         val isChunkRebuilding = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context)
                 || targets.any { kotlinContext.rebuildAfterCacheVersionChanged[it] == true }
 
@@ -361,7 +368,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             return ABORT
         }
 
-        val kotlinChunk = chunk.toKotlinChunk(context)!!
         val project = projectDescriptor.project
         val lookupTracker = getLookupTracker(project, representativeTarget)
         val exceptActualTracer = ExpectActualTrackerImpl()
@@ -376,12 +382,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             messageCollector
         ) ?: return ABORT
 
-        val commonArguments = kotlinChunk.compilerArguments.apply {
-            reportOutputFiles = true
-            version = true // Always report the version to help diagnosing user issues if they submit the compiler output
-            if (languageVersion == null) languageVersion = VersionView.RELEASED_VERSION.versionString
-        }
-
         if (LOG.isDebugEnabled) {
             LOG.debug("Compiling files: ${kotlinDirtyFilesHolder.allDirtyFiles}")
         }
@@ -391,7 +391,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             kotlinChunk,
             chunk,
             representativeTarget,
-            commonArguments,
+            kotlinChunk.compilerArguments,
             context,
             kotlinDirtyFilesHolder,
             fsOperations,

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

@@ -46,15 +46,26 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta
         }
     }
 
-    val compilerArguments = representativeTarget.jpsModuleBuildTarget.module.kotlinCompilerArguments
+    private val defaultLanguageVersion = VersionView.RELEASED_VERSION
+
+    val compilerArguments = representativeTarget.jpsModuleBuildTarget.module.kotlinCompilerArguments.also {
+        it.reportOutputFiles = true
+
+        // Always report the version to help diagnosing user issues if they submit the compiler output
+        it.version = true
+
+        if (it.languageVersion == null) it.languageVersion = defaultLanguageVersion.versionString
+    }
 
     val langVersion =
-        compilerArguments.languageVersion?.let { LanguageVersion.fromVersionString(it) } ?: VersionView.RELEASED_VERSION
+        compilerArguments.languageVersion?.let { LanguageVersion.fromVersionString(it) }
+            ?: defaultLanguageVersion // use default language version when version string is invalid (todo: report warning?)
 
     val apiVersion =
-        compilerArguments.apiVersion?.let { ApiVersion.parse(it) } ?: ApiVersion.createByLanguageVersion(
+        compilerArguments.apiVersion?.let { ApiVersion.parse(it) }
-            langVersion
+            ?: ApiVersion.createByLanguageVersion(langVersion) // todo: report version parse error?
-        )
+
+    val isEnabled: Boolean = representativeTarget.isEnabled(compilerArguments)
 
     fun shouldRebuild(): Boolean {
         val buildMetaInfo = representativeTarget.buildMetaInfoFactory.create(compilerArguments)

jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinCommonModuleBuildTarget.kt

@@ -27,6 +27,11 @@ private const val COMMON_BUILD_META_INFO_FILE_NAME = "common-build-meta-info.txt
 class KotlinCommonModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleBuildTarget: ModuleBuildTarget) :
     KotlinModuleBuildTarget<CommonBuildMetaInfo>(kotlinContext, jpsModuleBuildTarget) {
 
+    override fun isEnabled(chunkCompilerArguments: CommonCompilerArguments): Boolean {
+        val k2MetadataArguments = module.k2MetadataCompilerArguments
+        return k2MetadataArguments.enabledInJps || (chunkCompilerArguments as? K2MetadataCompilerArguments)?.enabledInJps == true
+    }
+
     override val isIncrementalCompilationEnabled: Boolean
         get() = false
 
@@ -47,18 +52,15 @@ class KotlinCommonModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModu
     ): Boolean {
         reportAndSkipCircular(chunk, environment)
 
-        val k2MetadataArguments = module.k2MetadataCompilerArguments
+        JpsKotlinCompilerRunner().runK2MetadataCompiler(
-        if (k2MetadataArguments.enabledInJps || (commonArguments as? K2MetadataCompilerArguments)?.enabledInJps == true) {
+            commonArguments,
-            JpsKotlinCompilerRunner().runK2MetadataCompiler(
+            module.k2MetadataCompilerArguments,
-                commonArguments,
+            module.kotlinCompilerSettings,
-                k2MetadataArguments,
+            environment,
-                module.kotlinCompilerSettings,
+            destination,
-                environment,
+            dependenciesOutputDirs + libraryFiles,
-                destination,
+            sourceFiles // incremental K2MetadataCompiler not supported yet
-                dependenciesOutputDirs + libraryFiles,
+        )
-                sourceFiles // incremental K2MetadataCompiler not supported yet
-            )
-        }
 
         return true
     }

jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt

@@ -64,6 +64,8 @@ abstract class KotlinModuleBuildTarget<BuildMetaInfoType : BuildMetaInfo> intern
 
     abstract val isIncrementalCompilationEnabled: Boolean
 
+    open fun isEnabled(chunkCompilerArguments: CommonCompilerArguments): Boolean = true
+
     @Suppress("LeakingThis")
     val localCacheVersionManager = localCacheVersionManager(
         kotlinContext.dataPaths.getTargetDataRoot(jpsModuleBuildTarget),

jps-plugin/testData/incremental/multiplatform/multiModule/simple/editingCExpectActual/build.log

@@ -1,6 +1,8 @@
 ================ Step #1 create new service in c =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Compiling files:
   c/src/serviceCNewHeader.kt
@@ -8,11 +10,13 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'pJs' production] Expected function 'c_platformDependentCNew' has no actual declaration in module
+[pJs] Expected function 'c_platformDependentCNew' has no actual declaration in module
 
 ================ Step #2 create new service in pJvm =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Compiling files:
   c/src/serviceCNewHeader.kt
@@ -20,11 +24,13 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'pJs' production] Expected function 'c_platformDependentCNew' has no actual declaration in module
+[pJs] Expected function 'c_platformDependentCNew' has no actual declaration in module
 
 ================ Step #3 create new service in pJs =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Compiling files:
   c/src/serviceCNewHeader.kt
@@ -50,16 +56,14 @@ Compiling files:
   c/src/serviceCNewHeader.kt
   pJvm/src/servicePJvmNewImpl.kt
 End of files
-Marked as dirty by Kotlin:
+Exit code: OK
-  c/src/serviceCNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
 ------------------------------------------
 
 ================ Step #4 change new service in c =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Cleaning output files:
   out/production/pJs/pJs.js
@@ -70,24 +74,7 @@ Compiling files:
   c/src/serviceCNewHeader.kt
   pJs/src/servicePJsNewImpl.kt
 End of files
-Marked as dirty by Kotlin:
+Exit code: OK
-  pJs/src/servicePJsNewImpl.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/pJs/pJs.js
-  out/production/pJs/pJs.meta.js
-  out/production/pJs/pJs/root-package.kjsm
-End of files
-Compiling files:
-  c/src/serviceCNewHeader.kt
-  pJs/src/servicePJsNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  c/src/serviceCNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
 ------------------------------------------
 Building pJvm
 Cleaning output files:
@@ -98,36 +85,28 @@ Compiling files:
   c/src/serviceCNewHeader.kt
   pJvm/src/servicePJvmNewImpl.kt
 End of files
-Marked as dirty by Kotlin:
+Exit code: OK
-  pJvm/src/servicePJvmNewImpl.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Compiling files:
-  c/src/serviceCNewHeader.kt
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  c/src/serviceCNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
 ------------------------------------------
 
 ================ Step #5 change new service in pJvm: java =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building pJvm
 Cleaning output files:
+  out/production/pJvm/META-INF/pJvm.kotlin_module
   out/production/pJvm/PJvmNewJavaClass.class
+  out/production/pJvm/ServiceCNewHeaderKt.class
 End of files
-Exit code: NOTHING_DONE
+Compiling files:
+  c/src/serviceCNewHeader.kt
+  pJvm/src/servicePJvmNewImpl.kt
+End of files
+Exit code: OK
 ------------------------------------------
 Compiling files:
   pJvm/src/PJvmNewJavaClass.java
@@ -136,6 +115,8 @@ End of files
 ================ Step #6 change new service in pJvm: kotlin =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -148,16 +129,14 @@ Compiling files:
   c/src/serviceCNewHeader.kt
   pJvm/src/servicePJvmNewImpl.kt
 End of files
-Marked as dirty by Kotlin:
+Exit code: OK
-  c/src/serviceCNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
 ------------------------------------------
 
 ================ Step #7 change new service in pJs =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Cleaning output files:
   out/production/pJs/pJs.js
@@ -168,11 +147,7 @@ Compiling files:
   c/src/serviceCNewHeader.kt
   pJs/src/servicePJsNewImpl.kt
 End of files
-Marked as dirty by Kotlin:
+Exit code: OK
-  c/src/serviceCNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
 ------------------------------------------
 Building pJvm
 Exit code: NOTHING_DONE
@@ -181,6 +156,8 @@ Exit code: NOTHING_DONE
 ================ Step #8 delete new service in pJvm =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -192,16 +169,16 @@ Building pJvm
 Compiling files:
   c/src/serviceCNewHeader.kt
 End of files
-Marked as dirty by Kotlin:
-  c/src/serviceCNewHeader.kt
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'pJvm' production] Expected function 'c_platformDependentCNew' has no actual declaration in module
+[pJvm] Expected function 'c_platformDependentCNew' has no actual declaration in module
 
 ================ Step #9 delete new service in pJs =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Cleaning output files:
   out/production/pJs/pJs.js
   out/production/pJs/pJs.meta.js
@@ -211,16 +188,16 @@ Building pJs
 Compiling files:
   c/src/serviceCNewHeader.kt
 End of files
-Marked as dirty by Kotlin:
-  c/src/serviceCNewHeader.kt
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'pJs' production] Expected function 'c_platformDependentCNew' has no actual declaration in module
+[pJs] Expected function 'c_platformDependentCNew' has no actual declaration in module
 
 ================ Step #10 delete new service in c =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Compiling files:
 End of files

jps-plugin/testData/incremental/multiplatform/multiModule/simple/editingCKotlin/build.log

@@ -1,6 +1,8 @@
 ================ Step #1 create new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Compiling files:
   c/src/serviceCNewHeader.kt
@@ -17,6 +19,8 @@ Exit code: OK
 ================ Step #2 edit new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Cleaning output files:
   out/production/pJs/pJs.js
@@ -42,6 +46,8 @@ Exit code: OK
 ================ Step #3 delete new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Cleaning output files:
   out/production/pJs/pJs.js
   out/production/pJs/pJs.meta.js

jps-plugin/testData/incremental/multiplatform/multiModule/simple/editingPJsKotlin/build.log

@@ -1,6 +1,8 @@
 ================ Step #1 create new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Compiling files:
   pJs/src/servicePJsNewImpl.kt
@@ -14,6 +16,8 @@ Exit code: NOTHING_DONE
 ================ Step #2 edit new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Cleaning output files:
   out/production/pJs/pJs.js
@@ -32,6 +36,8 @@ Exit code: NOTHING_DONE
 ================ Step #3 delete new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Cleaning output files:
   out/production/pJs/pJs.js
   out/production/pJs/pJs.meta.js

jps-plugin/testData/incremental/multiplatform/multiModule/simple/editingPJvmJava/build.log

@@ -1,6 +1,8 @@
 ================ Step #1 create new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -26,6 +28,8 @@ Exit code: OK
 ================ Step #2 edit new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -42,6 +46,8 @@ End of files
 ================ Step #3 delete new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/simple/editingPJvmKotlin/build.log

@@ -1,6 +1,8 @@
 ================ Step #1 create new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -14,6 +16,8 @@ Exit code: OK
 ================ Step #2 edit new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -31,6 +35,8 @@ Exit code: OK
 ================ Step #3 delete new service =================
 
 Building c
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/simpleJsJvmProjectWithTests/editingCTestsExpectActual/build.log

@@ -1,6 +1,8 @@
 ================ Step #1 create new service in cTests =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -8,6 +10,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Compiling files:
   cTests/src/serviceCTestsNewHeader.kt
@@ -15,11 +19,13 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'pJsTests' production] Expected function 'cTests_platformDependentCTestsNew' has no actual declaration in module
+[pJsTests] Expected function 'cTests_platformDependentCTestsNew' has no actual declaration in module
 
 ================ Step #2 create new service in pJvmTests =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -27,6 +33,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Compiling files:
   cTests/src/serviceCTestsNewHeader.kt
@@ -34,11 +42,13 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'pJsTests' production] Expected function 'cTests_platformDependentCTestsNew' has no actual declaration in module
+[pJsTests] Expected function 'cTests_platformDependentCTestsNew' has no actual declaration in module
 
 ================ Step #3 create new service in pJsTests =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -46,6 +56,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Compiling files:
   cTests/src/serviceCTestsNewHeader.kt
@@ -71,16 +83,14 @@ Compiling files:
   cTests/src/serviceCTestsNewHeader.kt
   pJvmTests/src/servicePJvmTestsNewImpl.kt
 End of files
-Marked as dirty by Kotlin:
+Exit code: OK
-  cTests/src/serviceCTestsNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
 ------------------------------------------
 
 ================ Step #4 change new service in cTests =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -88,6 +98,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Cleaning output files:
   out/production/pJsTests/pJsTests.js
@@ -98,6 +110,8 @@ Compiling files:
   cTests/src/serviceCTestsNewHeader.kt
   pJsTests/src/servicePJsTestsNewImpl.kt
 End of files
+Exit code: OK
+------------------------------------------
 Marked as dirty by Kotlin:
   pJsTests/src/servicePJsTestsNewImpl.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
@@ -148,6 +162,8 @@ Exit code: NOTHING_DONE
 ================ Step #5 change new service in pJvmTests: java =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -155,6 +171,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -171,6 +189,8 @@ End of files
 ================ Step #6 change new service in pJvmTests: kotlin =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -178,6 +198,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -200,6 +222,8 @@ Exit code: NOTHING_DONE
 ================ Step #7 change new service in pJsTests =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -207,6 +231,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Cleaning output files:
   out/production/pJsTests/pJsTests.js
@@ -217,6 +243,8 @@ Compiling files:
   cTests/src/serviceCTestsNewHeader.kt
   pJsTests/src/servicePJsTestsNewImpl.kt
 End of files
+Exit code: OK
+------------------------------------------
 Marked as dirty by Kotlin:
   cTests/src/serviceCTestsNewHeader.kt
 Exit code: ADDITIONAL_PASS_REQUIRED
@@ -230,6 +258,8 @@ Exit code: NOTHING_DONE
 ================ Step #8 delete new service in pJvmTests =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -237,6 +267,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -258,6 +290,8 @@ COMPILATION FAILED
 ================ Step #9 delete new service in pJsTests =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -265,6 +299,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Cleaning output files:
   out/production/pJsTests/pJsTests.js
   out/production/pJsTests/pJsTests.meta.js
@@ -284,6 +320,8 @@ COMPILATION FAILED
 ================ Step #10 delete new service in cTests =================
 
 Building cMain
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsMain
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -291,6 +329,8 @@ Building pJvmMain
 Exit code: NOTHING_DONE
 ------------------------------------------
 Building cTests
+Exit code: NOTHING_DONE
+------------------------------------------
 Building pJsTests
 Compiling files:
 End of files

jps-plugin/testData/incremental/multiplatform/multiModule/simpleNewMpp/editingCKotlin/build.log

@@ -0,0 +1,63 @@
+================ Step #1 create new service =================
+
+Building c
+Building pJs
+Compiling files:
+  c/src/serviceCNewHeader.kt
+End of files
+Exit code: OK
+------------------------------------------
+Building pJvm
+Compiling files:
+  c/src/serviceCNewHeader.kt
+End of files
+Exit code: OK
+------------------------------------------
+
+================ Step #2 edit new service =================
+
+Building c
+Building pJs
+Cleaning output files:
+  out/production/pJs/pJs.js
+  out/production/pJs/pJs.meta.js
+  out/production/pJs/pJs/root-package.kjsm
+End of files
+Compiling files:
+  c/src/serviceCNewHeader.kt
+End of files
+Exit code: OK
+------------------------------------------
+Building pJvm
+Cleaning output files:
+  out/production/pJvm/META-INF/pJvm.kotlin_module
+  out/production/pJvm/ServiceCNewHeaderKt.class
+End of files
+Compiling files:
+  c/src/serviceCNewHeader.kt
+End of files
+Exit code: OK
+------------------------------------------
+
+================ Step #3 delete new service =================
+
+Building c
+Cleaning output files:
+  out/production/pJs/pJs.js
+  out/production/pJs/pJs.meta.js
+  out/production/pJs/pJs/root-package.kjsm
+End of files
+Building pJs
+Compiling files:
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/pJvm/META-INF/pJvm.kotlin_module
+  out/production/pJvm/ServiceCNewHeaderKt.class
+End of files
+Building pJvm
+Compiling files:
+End of files
+Exit code: OK
+------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/simpleNewMpp/editingPJsKotlin/build.log

@@ -0,0 +1,47 @@
+================ Step #1 create new service =================
+
+Building c
+Building pJs
+Compiling files:
+  pJs/src/servicePJsNewImpl.kt
+End of files
+Exit code: OK
+------------------------------------------
+Building pJvm
+Exit code: NOTHING_DONE
+------------------------------------------
+
+================ Step #2 edit new service =================
+
+Building c
+Building pJs
+Cleaning output files:
+  out/production/pJs/pJs.js
+  out/production/pJs/pJs.meta.js
+  out/production/pJs/pJs/root-package.kjsm
+End of files
+Compiling files:
+  pJs/src/servicePJsNewImpl.kt
+End of files
+Exit code: OK
+------------------------------------------
+Building pJvm
+Exit code: NOTHING_DONE
+------------------------------------------
+
+================ Step #3 delete new service =================
+
+Building c
+Cleaning output files:
+  out/production/pJs/pJs.js
+  out/production/pJs/pJs.meta.js
+  out/production/pJs/pJs/root-package.kjsm
+End of files
+Building pJs
+Compiling files:
+End of files
+Exit code: OK
+------------------------------------------
+Building pJvm
+Exit code: NOTHING_DONE
+------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/simpleNewMpp/editingPJvmJava/build.log

@@ -0,0 +1,59 @@
+================ Step #1 create new service =================
+
+Building c
+Building pJs
+Exit code: NOTHING_DONE
+------------------------------------------
+Building pJvm
+Compiling files:
+  pJvm/src/servicePJvmNewImpl.kt
+End of files
+Exit code: OK
+------------------------------------------
+Compiling files:
+  pJvm/src/PJvmNewJavaClass.java
+End of files
+Cleaning output files:
+  out/production/pJvm/META-INF/pJvm.kotlin_module
+  out/production/pJvm/ServicePJvmNewImplKt.class
+End of files
+Compiling files:
+  pJvm/src/servicePJvmNewImpl.kt
+End of files
+Exit code: OK
+------------------------------------------
+
+================ Step #2 edit new service =================
+
+Building c
+Building pJs
+Exit code: NOTHING_DONE
+------------------------------------------
+Building pJvm
+Cleaning output files:
+  out/production/pJvm/PJvmNewJavaClass.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  pJvm/src/PJvmNewJavaClass.java
+End of files
+
+================ Step #3 delete new service =================
+
+Building c
+Building pJs
+Exit code: NOTHING_DONE
+------------------------------------------
+Cleaning output files:
+  out/production/pJvm/PJvmNewJavaClass.class
+End of files
+Cleaning output files:
+  out/production/pJvm/META-INF/pJvm.kotlin_module
+  out/production/pJvm/ServicePJvmNewImplKt.class
+End of files
+Building pJvm
+Compiling files:
+End of files
+Exit code: OK
+------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/simpleNewMpp/editingPJvmKotlin/build.log

@@ -0,0 +1,45 @@
+================ Step #1 create new service =================
+
+Building c
+Building pJs
+Exit code: NOTHING_DONE
+------------------------------------------
+Building pJvm
+Compiling files:
+  pJvm/src/servicePJvmNewImpl.kt
+End of files
+Exit code: OK
+------------------------------------------
+
+================ Step #2 edit new service =================
+
+Building c
+Building pJs
+Exit code: NOTHING_DONE
+------------------------------------------
+Building pJvm
+Cleaning output files:
+  out/production/pJvm/META-INF/pJvm.kotlin_module
+  out/production/pJvm/ServicePJvmNewImplKt.class
+End of files
+Compiling files:
+  pJvm/src/servicePJvmNewImpl.kt
+End of files
+Exit code: OK
+------------------------------------------
+
+================ Step #3 delete new service =================
+
+Building c
+Building pJs
+Exit code: NOTHING_DONE
+------------------------------------------
+Cleaning output files:
+  out/production/pJvm/META-INF/pJvm.kotlin_module
+  out/production/pJvm/ServicePJvmNewImplKt.class
+End of files
+Building pJvm
+Compiling files:
+End of files
+Exit code: OK
+------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingACommonExpectActual/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service in aCommon =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -14,14 +22,22 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'aJsServer' production] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
+[aJsServer] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
 
 ================ Step #2 create new service in aJvmClient =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -32,14 +48,22 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'aJsServer' production] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
+[aJsServer] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
 
 ================ Step #3 create new service in aJvmServer =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -50,14 +74,22 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'aJsServer' production] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
+[aJsServer] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
 
 ================ Step #4 create new service in aJsClient =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -68,14 +100,22 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'aJsServer' production] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
+[aJsServer] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
 
 ================ Step #5 create new service in aJsServer =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -166,9 +206,17 @@ Exit code: NOTHING_DONE
 ================ Step #6 change new service in aCommon =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -309,9 +357,17 @@ Exit code: NOTHING_DONE
 ================ Step #7 change new service in aJvmClient: java =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -358,9 +414,17 @@ Exit code: NOTHING_DONE
 ================ Step #8 change new service in aJvmClient: kotlin =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -413,9 +477,17 @@ Exit code: NOTHING_DONE
 ================ Step #9 change new service in aJvmServer: java =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -462,9 +534,17 @@ Exit code: NOTHING_DONE
 ================ Step #10 change new service in aJvmServer: kotlin =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingAJsClientKotlin/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -47,9 +55,17 @@ Exit code: NOTHING_DONE
 ================ Step #2 edit new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -98,9 +114,17 @@ Exit code: NOTHING_DONE
 ================ Step #3 delete new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingAJvmClientJava/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -59,9 +67,17 @@ Exit code: NOTHING_DONE
 ================ Step #2 edit new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -108,9 +124,17 @@ Exit code: NOTHING_DONE
 ================ Step #3 delete new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingAJvmClientKotlin/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -47,9 +55,17 @@ Exit code: NOTHING_DONE
 ================ Step #2 edit new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -97,9 +113,17 @@ Exit code: NOTHING_DONE
 ================ Step #3 delete new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingBCommonExpectActual/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service in bCommon =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -23,14 +31,22 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'bJs' production] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
+[bJs] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
 
 ================ Step #2 create new service in bJvm =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -50,14 +66,22 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'bJs' production] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
+[bJs] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
 
 ================ Step #3 create new service in bJs =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -110,12 +134,10 @@ Compiling files:
   bCommon/src/serviceBCommonNewHeader.kt
   bJvm/src/serviceBJvmNewImpl.kt
 End of files
+Exit code: OK
+------------------------------------------
 Marked as dirty by Kotlin:
   bCommon/src/serviceBCommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
 Building rJvm
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -123,9 +145,17 @@ Exit code: NOTHING_DONE
 ================ Step #4 change new service in bCommon =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -148,9 +178,7 @@ Compiling files:
   bCommon/src/serviceBCommonNewHeader.kt
   bJs/src/serviceBJsNewImpl.kt
 End of files
-Marked as dirty by Kotlin:
+Exit code: OK
-  bJs/src/serviceBJsNewImpl.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
 ------------------------------------------
 Cleaning output files:
   out/production/bJs/bJs.js
@@ -216,9 +244,17 @@ Exit code: NOTHING_DONE
 ================ Step #5 change new service in bJvm: java =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -265,9 +301,17 @@ Exit code: NOTHING_DONE
 ================ Step #6 change new service in bJvm: kotlin =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -307,12 +351,10 @@ Compiling files:
   bCommon/src/serviceBCommonNewHeader.kt
   bJvm/src/serviceBJvmNewImpl.kt
 End of files
+Exit code: OK
+------------------------------------------
 Marked as dirty by Kotlin:
   bCommon/src/serviceBCommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
 Building rJvm
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -320,9 +362,17 @@ Exit code: NOTHING_DONE
 ================ Step #7 change new service in bJs =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -345,12 +395,10 @@ Compiling files:
   bCommon/src/serviceBCommonNewHeader.kt
   bJs/src/serviceBJsNewImpl.kt
 End of files
+Exit code: OK
+------------------------------------------
 Marked as dirty by Kotlin:
   bCommon/src/serviceBCommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
 Building rJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -376,9 +424,17 @@ Exit code: NOTHING_DONE
 ================ Step #8 delete new service in bJvm =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -417,19 +473,25 @@ Building bJvm
 Compiling files:
   bCommon/src/serviceBCommonNewHeader.kt
 End of files
-Marked as dirty by Kotlin:
-  bCommon/src/serviceBCommonNewHeader.kt
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'bJvm' production] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
+[bJvm] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
 
 ================ Step #9 delete new service in bJs =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -451,19 +513,25 @@ Building bJs
 Compiling files:
   bCommon/src/serviceBCommonNewHeader.kt
 End of files
-Marked as dirty by Kotlin:
-  bCommon/src/serviceBCommonNewHeader.kt
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-[Module 'bJs' production] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
+[bJs] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
 
 ================ Step #10 delete new service in bCommon =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingRJsKotlin/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -47,9 +55,17 @@ Exit code: NOTHING_DONE
 ================ Step #2 edit new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -98,9 +114,17 @@ Exit code: NOTHING_DONE
 ================ Step #3 delete new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingRJvmKotlin/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -47,9 +55,17 @@ Exit code: OK
 ================ Step #2 edit new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -97,9 +113,17 @@ Exit code: OK
 ================ Step #3 delete new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingRaJsKotlin/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Compiling files:
   raJs/src/serviceRaJsNewImpl.kt
@@ -47,9 +55,17 @@ Exit code: NOTHING_DONE
 ================ Step #2 edit new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Cleaning output files:
   out/production/raJs/raJs.js
@@ -98,9 +114,17 @@ Exit code: NOTHING_DONE
 ================ Step #3 delete new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Cleaning output files:
   out/production/raJs/raJs.js
   out/production/raJs/raJs.meta.js

jps-plugin/testData/incremental/multiplatform/multiModule/ultimate/editingRaJvmKotlin/build.log

@@ -1,9 +1,17 @@
 ================ Step #1 create new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -47,9 +55,17 @@ Exit code: NOTHING_DONE
 ================ Step #2 edit new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------
@@ -97,9 +113,17 @@ Exit code: NOTHING_DONE
 ================ Step #3 delete new service =================
 
 Building aCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building bCommon
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonServer
+Exit code: NOTHING_DONE
+------------------------------------------
 Building aCommonClient
+Exit code: NOTHING_DONE
+------------------------------------------
 Building raJs
 Exit code: NOTHING_DONE
 ------------------------------------------