From 71812441298ed265936b52cf73bb665291ccbc63 Mon Sep 17 00:00:00 2001 From: "Aleksei.Cherepanov" Date: Wed, 27 Oct 2021 16:08:31 +0300 Subject: [PATCH] [CHERRY PICKED FROM IJ] Fix test IncrementalJvmJpsTestGenerated$WithJava$Other.testMultifileClassFileAdded Fix test data and also remove useless marking of multifiles in KotlinBuilder after 2ee7f2b "incremental annotation processing environment" as it makes the same thing and all results are ignored GitOrigin-RevId: 379eb3f350539cb1ee27098eecb28931df73b626 Original commit: https://github.com/JetBrains/intellij-community/commit/ee2865c35c2dadc3651518b2760b5176835b251c --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 15 ++------------- .../build.log | 4 +--- .../other/multifileClassFileChanged/build.log | 4 +--- .../multifilePackagePartMethodAdded/build.log | 4 +--- .../other/multifilePartsWithProperties/build.log | 4 +--- 5 files changed, 6 insertions(+), 25 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 8d5f51f2750..ee26bf8d919 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -540,20 +540,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val targetDirtyFiles = dirtyFilesHolder.byTarget[jpsTarget] if (cache != null && targetDirtyFiles != null) { - val dirtyFiles = targetDirtyFiles.dirty.keys + targetDirtyFiles.removed - val complementaryFiles = cache.getComplementaryFilesRecursive(dirtyFiles) + val complementaryFiles = cache.getComplementaryFilesRecursive(targetDirtyFiles.dirty.keys + targetDirtyFiles.removed) - // Get all parts of @JvmMultifileClass file for simultaneous rebuild - var dirtyMultifileClassFiles: Collection = emptyList() - if (cache is IncrementalJvmCache) { - dirtyMultifileClassFiles = cache.classesBySources(dirtyFiles) - .filter { cache.isMultifileFacade(it) } - .flatMap { cache.getAllPartsOfMultifileFacade(it).orEmpty() } - .flatMap { cache.sourcesByInternalName(it) } - .distinct() - .filter { !dirtyFiles.contains(it) } - } - fsOperations.markFilesForCurrentRound(jpsTarget, complementaryFiles + dirtyMultifileClassFiles) + fsOperations.markFilesForCurrentRound(jpsTarget, complementaryFiles) cache.markDirty(targetDirtyFiles.dirty.keys + targetDirtyFiles.removed) } diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log index 0a37a7011af..5ab0e5a89b3 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log @@ -3,10 +3,8 @@ 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 -Cleaning output files: out/production/module/test/Test__AKt.class + out/production/module/test/Test__BKt.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log index b9ec7f67acd..ff973ffb2dc 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log @@ -3,10 +3,8 @@ 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 -Cleaning output files: out/production/module/test/Test__AKt.class + out/production/module/test/Test__BKt.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log index d2f88033cbb..8326f0654d7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log @@ -3,10 +3,8 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/Utils.class - out/production/module/Utils__PartBKt.class -End of files -Cleaning output files: out/production/module/Utils__PartAKt.class + out/production/module/Utils__PartBKt.class out/production/module/Utils__PartCKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log index 2894c2c0a84..f20d8533f5f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log @@ -3,10 +3,8 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/Utils.class - out/production/module/Utils__PartBKt.class -End of files -Cleaning output files: out/production/module/Utils__PartAKt.class + out/production/module/Utils__PartBKt.class End of files Compiling files: src/partA.kt