diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest.kt index 119c3abb3c2..c81add82ea4 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest.kt @@ -38,14 +38,14 @@ abstract class ClasspathChangesComputerTest : ClasspathSnapshotTestCommon() { abstract fun testMixedClassSnapshotGranularities() @Test - abstract fun testImpactAnalysis() + abstract fun testImpactComputation_SupertypesInheritors() } class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test override fun testAbiVersusNonAbiChanges() { - val changes = computeClasspathChanges(File(testDataDir, "testAbiVersusNonAbiChanges/src/kotlin"), tmpDir) + val changes = computeClasspathChanges(File(testDataDir, "KotlinOnly/testAbiVersusNonAbiChanges/src"), tmpDir) Changes( lookupSymbols = setOf( LookupSymbol(name = "publicPropertyChangedType", scope = "com.example.SomeClass"), @@ -58,7 +58,7 @@ class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test override fun testModifiedAddedRemovedElements() { - val changes = computeClasspathChanges(File(testDataDir, "testModifiedAddedRemovedElements/src/kotlin"), tmpDir) + val changes = computeClasspathChanges(File(testDataDir, "KotlinOnly/testModifiedAddedRemovedElements/src"), tmpDir) Changes( lookupSymbols = setOf( // ModifiedClassUnchangedMembers @@ -90,7 +90,7 @@ class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test override fun testModifiedAddedRemovedElements_ClassLevelSnapshot() { - val changes = computeClasspathChanges(File(testDataDir, "testModifiedAddedRemovedElements/src/kotlin"), tmpDir, CLASS_LEVEL) + val changes = computeClasspathChanges(File(testDataDir, "KotlinOnly/testModifiedAddedRemovedElements/src"), tmpDir, CLASS_LEVEL) Changes( lookupSymbols = setOf( LookupSymbol(name = "ModifiedClassUnchangedMembers", scope = "com.example"), @@ -109,8 +109,8 @@ class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test override fun testMixedClassSnapshotGranularities() { - val currentClasspathSnapshot = testMixedClassSnapshotGranularities_snapshotClasspath("kotlin", "current-classpath", tmpDir) - val previousClasspathSnapshot = testMixedClassSnapshotGranularities_snapshotClasspath("kotlin", "previous-classpath", tmpDir) + val currentClasspathSnapshot = testMixedClassSnapshotGranularities_snapshotClasspath("KotlinOnly", "current-classpath", tmpDir) + val previousClasspathSnapshot = testMixedClassSnapshotGranularities_snapshotClasspath("KotlinOnly", "previous-classpath", tmpDir) val changes = computeClasspathChanges(currentClasspathSnapshot, previousClasspathSnapshot) Changes( @@ -132,8 +132,8 @@ class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { } @Test - override fun testImpactAnalysis() { - val changes = computeClasspathChanges(File(testDataDir, "testImpactAnalysis_KotlinOnly/src"), tmpDir) + override fun testImpactComputation_SupertypesInheritors() { + val changes = computeClasspathChanges(File(testDataDir, "KotlinOnly/testImpactComputation_SupertypesInheritors/src"), tmpDir) Changes( lookupSymbols = setOf( LookupSymbol(name = "changedProperty", scope = "com.example.ChangedSuperClass"), @@ -156,7 +156,7 @@ class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test fun testTopLevelMembers() { - val changes = computeClasspathChanges(File(testDataDir, "testTopLevelMembers_KotlinOnly/src"), tmpDir) + val changes = computeClasspathChanges(File(testDataDir, "KotlinOnly/testTopLevelMembers/src"), tmpDir) Changes( lookupSymbols = setOf( LookupSymbol(name = "modifiedTopLevelProperty", scope = "com.example"), @@ -174,7 +174,7 @@ class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test fun testDifferentClassKinds() { - val changes = computeClasspathChanges(File(testDataDir, "testDifferentClassKinds_KotlinOnly/src"), tmpDir) + val changes = computeClasspathChanges(File(testDataDir, "KotlinOnly/testDifferentClassKinds/src"), tmpDir) Changes( lookupSymbols = setOf( // NormalClass @@ -214,7 +214,7 @@ class KotlinOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test fun testConstantsAndInlineFunctions() { - val changes = computeClasspathChanges(File(testDataDir, "testConstantsAndInlineFunctions_KotlinOnly/src"), tmpDir) + val changes = computeClasspathChanges(File(testDataDir, "KotlinOnly/testConstantsAndInlineFunctions/src"), tmpDir) Changes( lookupSymbols = setOf( LookupSymbol(name = "constantChangedType", scope = "com.example.SomeClass.CompanionObject"), @@ -238,7 +238,7 @@ class JavaOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test override fun testAbiVersusNonAbiChanges() { - val changes = computeClasspathChanges(File(testDataDir, "testAbiVersusNonAbiChanges/src/java"), tmpDir) + val changes = computeClasspathChanges(File(testDataDir, "JavaOnly/testAbiVersusNonAbiChanges/src"), tmpDir) Changes( lookupSymbols = setOf( LookupSymbol(name = "publicFieldChangedType", scope = "com.example.SomeClass"), @@ -251,7 +251,7 @@ class JavaOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test override fun testModifiedAddedRemovedElements() { - val changes = computeClasspathChanges(File(testDataDir, "testModifiedAddedRemovedElements/src/java"), tmpDir) + val changes = computeClasspathChanges(File(testDataDir, "JavaOnly/testModifiedAddedRemovedElements/src"), tmpDir) Changes( lookupSymbols = setOf( // ModifiedClassUnchangedMembers @@ -283,7 +283,7 @@ class JavaOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test override fun testModifiedAddedRemovedElements_ClassLevelSnapshot() { - val changes = computeClasspathChanges(File(testDataDir, "testModifiedAddedRemovedElements/src/java"), tmpDir, CLASS_LEVEL) + val changes = computeClasspathChanges(File(testDataDir, "JavaOnly/testModifiedAddedRemovedElements/src"), tmpDir, CLASS_LEVEL) Changes( lookupSymbols = setOf( LookupSymbol(name = "ModifiedClassUnchangedMembers", scope = "com.example"), @@ -302,8 +302,8 @@ class JavaOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { @Test override fun testMixedClassSnapshotGranularities() { - val currentClasspathSnapshot = testMixedClassSnapshotGranularities_snapshotClasspath("java", "current-classpath", tmpDir) - val previousClasspathSnapshot = testMixedClassSnapshotGranularities_snapshotClasspath("java", "previous-classpath", tmpDir) + val currentClasspathSnapshot = testMixedClassSnapshotGranularities_snapshotClasspath("JavaOnly", "current-classpath", tmpDir) + val previousClasspathSnapshot = testMixedClassSnapshotGranularities_snapshotClasspath("JavaOnly", "previous-classpath", tmpDir) val changes = computeClasspathChanges(currentClasspathSnapshot, previousClasspathSnapshot) Changes( @@ -325,8 +325,8 @@ class JavaOnlyClasspathChangesComputerTest : ClasspathChangesComputerTest() { } @Test - override fun testImpactAnalysis() { - val changes = computeClasspathChanges(File(testDataDir, "testImpactAnalysis_JavaOnly/src"), tmpDir) + override fun testImpactComputation_SupertypesInheritors() { + val changes = computeClasspathChanges(File(testDataDir, "JavaOnly/testImpactComputation_SupertypesInheritors/src"), tmpDir) Changes( lookupSymbols = setOf( LookupSymbol(name = "changedField", scope = "com.example.ChangedSuperClass"), @@ -354,9 +354,8 @@ class KotlinAndJavaClasspathChangesComputerTest : ClasspathSnapshotTestCommon() // - Java class converted to Kotlin class @Test - fun testImpactAnalysis() { - val changes = - computeClasspathChanges(File(testDataDir, "testImpactAnalysis_KotlinAndJava/src"), tmpDir) + fun testImpactComputation_SupertypesInheritors() { + val changes = computeClasspathChanges(File(testDataDir, "KotlinAndJava/testImpactComputation_SupertypesInheritors/src"), tmpDir) Changes( lookupSymbols = setOf( LookupSymbol(name = "changedProperty", scope = "com.example.ChangedKotlinSuperClass"), @@ -393,7 +392,7 @@ class KotlinAndJavaClasspathChangesComputerTest : ClasspathSnapshotTestCommon() private fun testMixedClassSnapshotGranularities_snapshotClasspath( language: String, classpathSourceDirName: String, tmpDir: TemporaryFolder ): ClasspathSnapshot { - val classes = compileAll(File("$testDataDir/testMixedClassSnapshotGranularities/src/$language/$classpathSourceDirName/0"), tmpDir) + val classes = compileAll(File("$testDataDir/$language/testMixedClassSnapshotGranularities/src/$classpathSourceDirName"), tmpDir) fun getGranularity(classFile: ClassFile): ClassSnapshotGranularity { val granularity = when (val className = classFile.asFile().nameWithoutExtension) { diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon.kt index 46584c3b3e6..59920509008 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotTestCommon.kt @@ -100,7 +100,7 @@ abstract class ClasspathSnapshotTestCommon { * Kotlin compiler to generate classes. However, kotlin-compiler.jar is currently not available in CI builds, so we need to * pre-compile the classes locally and put them in the test data to check in. */ - @Synchronized // To safe-guard shared variable preCompiledKotlinClassesDirs + @Synchronized // To safeguard shared variable preCompiledKotlinClassesDirs private fun preCompileKotlinFilesIfNecessary( srcDir: File, preCompiledKotlinClassesDir: File, @@ -195,7 +195,12 @@ internal fun snapshotClasspath( granularity: ClassSnapshotGranularity? = null ): ClasspathSnapshot { val classpath = mutableListOf() - val classpathEntrySnapshots = classpathSourceDir.listFiles()!!.sortedBy { it.name }.map { classpathEntrySourceDir -> + val classpathEntrySourceDirs = if (classpathSourceDir.listFiles()!!.size == 1) { + listOf(classpathSourceDir) + } else { + classpathSourceDir.listFiles()!!.sortedBy { it.name } + } + val classpathEntrySnapshots = classpathEntrySourceDirs.map { classpathEntrySourceDir -> val classFiles = compileAll(classpathEntrySourceDir, tmpDir, classpath) classpath.addAll(listOfNotNull(classFiles.firstOrNull()?.classRoot)) diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/src/java/current-classpath/0/com/example/SomeClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testAbiVersusNonAbiChanges/src/current-classpath/com/example/SomeClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/src/java/current-classpath/0/com/example/SomeClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testAbiVersusNonAbiChanges/src/current-classpath/com/example/SomeClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/src/java/previous-classpath/0/com/example/SomeClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testAbiVersusNonAbiChanges/src/previous-classpath/com/example/SomeClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/src/java/previous-classpath/0/com/example/SomeClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testAbiVersusNonAbiChanges/src/previous-classpath/com/example/SomeClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/current-classpath/0/com/example/ChangedSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/ChangedSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/current-classpath/0/com/example/ChangedSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/ChangedSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/current-classpath/0/com/example/SubClassOfChangedSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/SubClassOfChangedSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/current-classpath/0/com/example/SubClassOfChangedSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/SubClassOfChangedSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/current-classpath/0/com/example/SubSubClassOfChangedSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/SubSubClassOfChangedSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/current-classpath/0/com/example/SubSubClassOfChangedSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/SubSubClassOfChangedSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/current-classpath/0/com/example/UnimpactedClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/UnimpactedClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/current-classpath/0/com/example/UnimpactedClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/UnimpactedClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/previous-classpath/0/com/example/ChangedSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/ChangedSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/previous-classpath/0/com/example/ChangedSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/ChangedSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/previous-classpath/0/com/example/SubClassOfChangedSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/SubClassOfChangedSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/previous-classpath/0/com/example/SubClassOfChangedSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/SubClassOfChangedSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/previous-classpath/0/com/example/SubSubClassOfChangedSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/SubSubClassOfChangedSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/previous-classpath/0/com/example/SubSubClassOfChangedSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/SubSubClassOfChangedSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/previous-classpath/0/com/example/UnimpactedClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/UnimpactedClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_JavaOnly/src/previous-classpath/0/com/example/UnimpactedClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/UnimpactedClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/current-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/current-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/current-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/current-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/current-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/current-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/current-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/current-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/previous-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/previous-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/previous-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/previous-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/previous-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/previous-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/previous-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/java/previous-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/current-classpath/0/com/example/AddedClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/AddedClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/current-classpath/0/com/example/AddedClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/AddedClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/current-classpath/0/com/example/ModifiedClassChangedMembers.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/ModifiedClassChangedMembers.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/current-classpath/0/com/example/ModifiedClassChangedMembers.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/ModifiedClassChangedMembers.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/current-classpath/0/com/example/ModifiedClassUnchangedMembers.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/ModifiedClassUnchangedMembers.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/current-classpath/0/com/example/ModifiedClassUnchangedMembers.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/ModifiedClassUnchangedMembers.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/current-classpath/0/com/example/UnchangedClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/UnchangedClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/current-classpath/0/com/example/UnchangedClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/UnchangedClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/previous-classpath/0/com/example/ModifiedClassChangedMembers.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/ModifiedClassChangedMembers.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/previous-classpath/0/com/example/ModifiedClassChangedMembers.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/ModifiedClassChangedMembers.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/ModifiedClassUnchangedMembers.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/ModifiedClassUnchangedMembers.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/previous-classpath/0/com/example/RemovedClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/RemovedClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/previous-classpath/0/com/example/RemovedClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/RemovedClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/previous-classpath/0/com/example/UnchangedClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/UnchangedClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/java/previous-classpath/0/com/example/UnchangedClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/JavaOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/UnchangedClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/ChangedKotlinSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/ChangedKotlinSuperClass.class similarity index 93% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/ChangedKotlinSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/ChangedKotlinSuperClass.class index d210531b076..a6176090de4 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/ChangedKotlinSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/ChangedKotlinSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.class index 92752f75946..f799b765849 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.class index cf121630525..a751e5465b4 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/UnimpactedKotlinClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/UnimpactedKotlinClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/UnimpactedKotlinClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/UnimpactedKotlinClass.class index 347d5aefc73..495259ba314 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/UnimpactedKotlinClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/UnimpactedKotlinClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/ChangedKotlinSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/ChangedKotlinSuperClass.class similarity index 91% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/ChangedKotlinSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/ChangedKotlinSuperClass.class index a4292654b5f..20b3899b79a 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/ChangedKotlinSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/ChangedKotlinSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.class index 92752f75946..f799b765849 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.class index cf121630525..a751e5465b4 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/previous-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/UnimpactedKotlinClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/UnimpactedKotlinClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/UnimpactedKotlinClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/UnimpactedKotlinClass.class index 347d5aefc73..495259ba314 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/classes/current-classpath/0/com/example/UnimpactedKotlinClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/UnimpactedKotlinClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/ChangedJavaSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/ChangedJavaSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/ChangedJavaSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/ChangedJavaSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/ChangedKotlinSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/ChangedKotlinSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/ChangedKotlinSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/ChangedKotlinSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/JavaSubClassOfChangedJavaSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/JavaSubClassOfChangedJavaSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/JavaSubClassOfChangedJavaSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/JavaSubClassOfChangedJavaSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/JavaSubClassOfChangedKotlinSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/JavaSubClassOfChangedKotlinSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/JavaSubClassOfChangedKotlinSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/JavaSubClassOfChangedKotlinSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/UnimpactedJavaClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/UnimpactedJavaClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/UnimpactedJavaClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/UnimpactedJavaClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/UnimpactedKotlinClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/UnimpactedKotlinClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/current-classpath/0/com/example/UnimpactedKotlinClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/UnimpactedKotlinClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/ChangedJavaSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/ChangedJavaSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/ChangedJavaSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/ChangedJavaSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/ChangedKotlinSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/ChangedKotlinSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/ChangedKotlinSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/ChangedKotlinSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/JavaSubClassOfChangedJavaSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/JavaSubClassOfChangedJavaSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/JavaSubClassOfChangedJavaSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/JavaSubClassOfChangedJavaSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/JavaSubClassOfChangedKotlinSuperClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/JavaSubClassOfChangedKotlinSuperClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/JavaSubClassOfChangedKotlinSuperClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/JavaSubClassOfChangedKotlinSuperClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/KotlinSubClassOfChangedJavaSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/KotlinSubClassOfChangedJavaSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/KotlinSubClassOfChangedKotlinSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/KotlinSubClassOfChangedKotlinSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/UnimpactedJavaClass.java b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/UnimpactedJavaClass.java similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/UnimpactedJavaClass.java rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/UnimpactedJavaClass.java diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/UnimpactedKotlinClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/UnimpactedKotlinClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinAndJava/src/previous-classpath/0/com/example/UnimpactedKotlinClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinAndJava/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/UnimpactedKotlinClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/classes/kotlin/current-classpath/0/com/example/SomeClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/classes/current-classpath/com/example/SomeClass.class similarity index 97% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/classes/kotlin/current-classpath/0/com/example/SomeClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/classes/current-classpath/com/example/SomeClass.class index c700fd07975..261bae9c796 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/classes/kotlin/current-classpath/0/com/example/SomeClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/classes/current-classpath/com/example/SomeClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/classes/kotlin/previous-classpath/0/com/example/SomeClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/classes/previous-classpath/com/example/SomeClass.class similarity index 94% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/classes/kotlin/previous-classpath/0/com/example/SomeClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/classes/previous-classpath/com/example/SomeClass.class index db3f1723164..996f6ef0cd9 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/classes/kotlin/previous-classpath/0/com/example/SomeClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/classes/previous-classpath/com/example/SomeClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/src/kotlin/current-classpath/0/com/example/SomeClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/src/current-classpath/com/example/SomeClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/src/kotlin/current-classpath/0/com/example/SomeClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/src/current-classpath/com/example/SomeClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/src/kotlin/previous-classpath/0/com/example/SomeClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/src/previous-classpath/com/example/SomeClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testAbiVersusNonAbiChanges/src/kotlin/previous-classpath/0/com/example/SomeClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testAbiVersusNonAbiChanges/src/previous-classpath/com/example/SomeClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/current-classpath/0/com/example/SomeClass$CompanionObject.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/current-classpath/com/example/SomeClass$CompanionObject.class similarity index 93% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/current-classpath/0/com/example/SomeClass$CompanionObject.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/current-classpath/com/example/SomeClass$CompanionObject.class index dfd6d906592..7ff711ac0fb 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/current-classpath/0/com/example/SomeClass$CompanionObject.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/current-classpath/com/example/SomeClass$CompanionObject.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/current-classpath/0/com/example/SomeClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/current-classpath/com/example/SomeClass.class similarity index 97% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/current-classpath/0/com/example/SomeClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/current-classpath/com/example/SomeClass.class index 81da98ed4b5..b7d405bb17c 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/current-classpath/0/com/example/SomeClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/current-classpath/com/example/SomeClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/previous-classpath/0/com/example/SomeClass$CompanionObject.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/previous-classpath/com/example/SomeClass$CompanionObject.class similarity index 93% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/previous-classpath/0/com/example/SomeClass$CompanionObject.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/previous-classpath/com/example/SomeClass$CompanionObject.class index 5922beb2e1e..e81c9ce26cc 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/previous-classpath/0/com/example/SomeClass$CompanionObject.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/previous-classpath/com/example/SomeClass$CompanionObject.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/previous-classpath/0/com/example/SomeClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/previous-classpath/com/example/SomeClass.class similarity index 96% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/previous-classpath/0/com/example/SomeClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/previous-classpath/com/example/SomeClass.class index 59d8750a284..27c5ceb2556 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/classes/previous-classpath/0/com/example/SomeClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/classes/previous-classpath/com/example/SomeClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/src/current-classpath/0/com/example/SomeClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/src/current-classpath/com/example/SomeClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/src/current-classpath/0/com/example/SomeClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/src/current-classpath/com/example/SomeClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/src/previous-classpath/0/com/example/SomeClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/src/previous-classpath/com/example/SomeClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testConstantsAndInlineFunctions_KotlinOnly/src/previous-classpath/0/com/example/SomeClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testConstantsAndInlineFunctions/src/previous-classpath/com/example/SomeClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/FileFacadeKt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/FileFacadeKt.class similarity index 91% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/FileFacadeKt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/FileFacadeKt.class index dc23290d977..6b0aca77530 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/FileFacadeKt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/FileFacadeKt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass.class similarity index 90% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass.class index 1da67a8a1f4..252db67f2d0 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass__MultifileClass1Kt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass__MultifileClass1Kt.class similarity index 90% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass__MultifileClass1Kt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass__MultifileClass1Kt.class index 2be0b1d8c32..025bc19ef62 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass__MultifileClass1Kt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass__MultifileClass1Kt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass__MultifileClass2Kt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass__MultifileClass2Kt.class similarity index 90% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass__MultifileClass2Kt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass__MultifileClass2Kt.class index da749ca4a26..75a49343ad3 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/MultifileClass__MultifileClass2Kt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/MultifileClass__MultifileClass2Kt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass$CompanionObject.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass$CompanionObject.class similarity index 94% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass$CompanionObject.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass$CompanionObject.class index 38b325b278c..3b326387280 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass$CompanionObject.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass$CompanionObject.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass$NestedClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass$NestedClass.class similarity index 92% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass$NestedClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass$NestedClass.class index cca4f9c56fd..f8083e2cc37 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass$NestedClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass$NestedClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass.class similarity index 95% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass.class index 66e25fa418b..e3ef1902b5d 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/current-classpath/0/com/example/NormalClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/current-classpath/com/example/NormalClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass$CompanionObject.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass$CompanionObject.class similarity index 91% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass$CompanionObject.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass$CompanionObject.class index 3a0c26ee9e5..19f22efa6d5 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass$CompanionObject.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass$CompanionObject.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass$NestedClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass$NestedClass.class similarity index 90% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass$NestedClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass$NestedClass.class index 176eeee0727..fc0e412e494 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass$NestedClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass$NestedClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass.class similarity index 94% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass.class index 2371ba43a75..cd1e3341e0e 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/classes/previous-classpath/0/com/example/NormalClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/classes/previous-classpath/com/example/NormalClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/current-classpath/0/com/example/FileFacade.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/current-classpath/com/example/FileFacade.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/current-classpath/0/com/example/FileFacade.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/current-classpath/com/example/FileFacade.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/current-classpath/0/com/example/MultifileClass1.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/current-classpath/com/example/MultifileClass1.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/current-classpath/0/com/example/MultifileClass1.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/current-classpath/com/example/MultifileClass1.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/current-classpath/0/com/example/MultifileClass2.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/current-classpath/com/example/MultifileClass2.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/current-classpath/0/com/example/MultifileClass2.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/current-classpath/com/example/MultifileClass2.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/current-classpath/0/com/example/NormalClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/current-classpath/com/example/NormalClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/current-classpath/0/com/example/NormalClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/current-classpath/com/example/NormalClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/previous-classpath/0/com/example/FileFacade.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/previous-classpath/com/example/FileFacade.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/previous-classpath/0/com/example/FileFacade.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/previous-classpath/com/example/FileFacade.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/previous-classpath/0/com/example/MultifileClass1.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/previous-classpath/com/example/MultifileClass1.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/previous-classpath/0/com/example/MultifileClass1.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/previous-classpath/com/example/MultifileClass1.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/previous-classpath/0/com/example/MultifileClass2.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/previous-classpath/com/example/MultifileClass2.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/previous-classpath/0/com/example/MultifileClass2.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/previous-classpath/com/example/MultifileClass2.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/previous-classpath/0/com/example/NormalClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/previous-classpath/com/example/NormalClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testDifferentClassKinds_KotlinOnly/src/previous-classpath/0/com/example/NormalClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testDifferentClassKinds/src/previous-classpath/com/example/NormalClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/ChangedSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/ChangedSuperClass.class similarity index 92% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/ChangedSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/ChangedSuperClass.class index 0808ff2e8c0..5daffacb466 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/ChangedSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/ChangedSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/SubClassOfChangedSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/SubClassOfChangedSuperClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/SubClassOfChangedSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/SubClassOfChangedSuperClass.class index a48c1ec9929..a692148f3aa 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/SubClassOfChangedSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/SubClassOfChangedSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/SubSubClassOfChangedSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/SubSubClassOfChangedSuperClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/SubSubClassOfChangedSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/SubSubClassOfChangedSuperClass.class index c9346a8a074..7e2e9b0dafa 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/SubSubClassOfChangedSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/SubSubClassOfChangedSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/UnimpactedClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/UnimpactedClass.class similarity index 90% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/UnimpactedClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/UnimpactedClass.class index cabb97b00f3..ccbf7dbc574 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/UnimpactedClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/current-classpath/com/example/UnimpactedClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/ChangedSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/ChangedSuperClass.class similarity index 91% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/ChangedSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/ChangedSuperClass.class index 7b8134d0dbc..4fc32d58eda 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/ChangedSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/ChangedSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/SubClassOfChangedSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/SubClassOfChangedSuperClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/SubClassOfChangedSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/SubClassOfChangedSuperClass.class index a48c1ec9929..a692148f3aa 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/SubClassOfChangedSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/SubClassOfChangedSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/SubSubClassOfChangedSuperClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/SubSubClassOfChangedSuperClass.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/SubSubClassOfChangedSuperClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/SubSubClassOfChangedSuperClass.class index c9346a8a074..7e2e9b0dafa 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/previous-classpath/0/com/example/SubSubClassOfChangedSuperClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/SubSubClassOfChangedSuperClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/UnimpactedClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/UnimpactedClass.class similarity index 90% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/UnimpactedClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/UnimpactedClass.class index cabb97b00f3..ccbf7dbc574 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/classes/current-classpath/0/com/example/UnimpactedClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/classes/previous-classpath/com/example/UnimpactedClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/current-classpath/0/com/example/ChangedSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/ChangedSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/current-classpath/0/com/example/ChangedSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/ChangedSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/current-classpath/0/com/example/SubClassOfChangedSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/SubClassOfChangedSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/current-classpath/0/com/example/SubClassOfChangedSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/SubClassOfChangedSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/current-classpath/0/com/example/SubSubClassOfChangedSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/SubSubClassOfChangedSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/current-classpath/0/com/example/SubSubClassOfChangedSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/SubSubClassOfChangedSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/current-classpath/0/com/example/UnimpactedClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/UnimpactedClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/current-classpath/0/com/example/UnimpactedClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/current-classpath/com/example/UnimpactedClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/previous-classpath/0/com/example/ChangedSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/ChangedSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/previous-classpath/0/com/example/ChangedSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/ChangedSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/previous-classpath/0/com/example/SubClassOfChangedSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/SubClassOfChangedSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/previous-classpath/0/com/example/SubClassOfChangedSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/SubClassOfChangedSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/previous-classpath/0/com/example/SubSubClassOfChangedSuperClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/SubSubClassOfChangedSuperClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/previous-classpath/0/com/example/SubSubClassOfChangedSuperClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/SubSubClassOfChangedSuperClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/previous-classpath/0/com/example/UnimpactedClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/UnimpactedClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testImpactAnalysis_KotlinOnly/src/previous-classpath/0/com/example/UnimpactedClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testImpactComputation_SupertypesInheritors/src/previous-classpath/com/example/UnimpactedClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class similarity index 95% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class index f33bf80707c..5067b2e0cce 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class similarity index 96% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class index 6c7b1b794aa..539394067bf 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class similarity index 96% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class index 22aa9a9cf4b..c8604debfd4 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class similarity index 96% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class index d3acdc60e59..985ec16dee1 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/current-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class similarity index 95% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class index 59ddcc001b4..a3780cec16b 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class similarity index 96% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class index 1efac298639..c8f3cbdb18e 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class similarity index 96% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class index 2ce911e1c45..407e8cafe4e 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class similarity index 96% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class index b5b3544197f..f67bc8a33dd 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/classes/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/classes/previous-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/current-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/current-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/current-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/CoarseGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/previous-classpath/0/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/CoarseGrainedFirstBuild_FineGrainedSecondBuild_Class.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/FineGrainedFirstBuild_CoarseGrainedSecondBuild_Class.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testMixedClassSnapshotGranularities/src/kotlin/previous-classpath/0/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testMixedClassSnapshotGranularities/src/previous-classpath/com/example/FineGrainedFirstBuild_FineGrainedSecondBuild_Class.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/AddedClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/AddedClass.class similarity index 93% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/AddedClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/AddedClass.class index 0b676522379..dd0e502b234 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/AddedClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/AddedClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/ModifiedClassChangedMembers.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/ModifiedClassChangedMembers.class similarity index 97% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/ModifiedClassChangedMembers.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/ModifiedClassChangedMembers.class index a332f4c52f1..c1f717e6005 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/ModifiedClassChangedMembers.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/ModifiedClassChangedMembers.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/ModifiedClassUnchangedMembers.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/ModifiedClassUnchangedMembers.class similarity index 94% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/ModifiedClassUnchangedMembers.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/ModifiedClassUnchangedMembers.class index bd3628cc05d..043d3689b98 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/ModifiedClassUnchangedMembers.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/ModifiedClassUnchangedMembers.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/UnchangedClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/UnchangedClass.class similarity index 93% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/UnchangedClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/UnchangedClass.class index e4dfd42ae42..cf06424683c 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/current-classpath/0/com/example/UnchangedClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/current-classpath/com/example/UnchangedClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/ModifiedClassChangedMembers.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/ModifiedClassChangedMembers.class similarity index 94% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/ModifiedClassChangedMembers.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/ModifiedClassChangedMembers.class index 924afc6370f..81467015e52 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/ModifiedClassChangedMembers.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/ModifiedClassChangedMembers.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/ModifiedClassUnchangedMembers.class similarity index 91% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/ModifiedClassUnchangedMembers.class index ed6664c36ab..03eb86738a3 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/ModifiedClassUnchangedMembers.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/RemovedClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/RemovedClass.class similarity index 93% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/RemovedClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/RemovedClass.class index 3876738e5a8..8c818164933 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/RemovedClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/RemovedClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/UnchangedClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/UnchangedClass.class similarity index 93% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/UnchangedClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/UnchangedClass.class index e4dfd42ae42..cf06424683c 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/classes/kotlin/previous-classpath/0/com/example/UnchangedClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/classes/previous-classpath/com/example/UnchangedClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/current-classpath/0/com/example/AddedClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/AddedClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/current-classpath/0/com/example/AddedClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/AddedClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/current-classpath/0/com/example/ModifiedClassChangedMembers.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/ModifiedClassChangedMembers.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/current-classpath/0/com/example/ModifiedClassChangedMembers.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/ModifiedClassChangedMembers.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/current-classpath/0/com/example/ModifiedClassUnchangedMembers.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/ModifiedClassUnchangedMembers.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/current-classpath/0/com/example/ModifiedClassUnchangedMembers.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/ModifiedClassUnchangedMembers.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/current-classpath/0/com/example/UnchangedClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/UnchangedClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/current-classpath/0/com/example/UnchangedClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/current-classpath/com/example/UnchangedClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/previous-classpath/0/com/example/ModifiedClassChangedMembers.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/ModifiedClassChangedMembers.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/previous-classpath/0/com/example/ModifiedClassChangedMembers.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/ModifiedClassChangedMembers.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/ModifiedClassUnchangedMembers.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/previous-classpath/0/com/example/ModifiedClassUnchangedMembers.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/ModifiedClassUnchangedMembers.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/previous-classpath/0/com/example/RemovedClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/RemovedClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/previous-classpath/0/com/example/RemovedClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/RemovedClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/previous-classpath/0/com/example/UnchangedClass.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/UnchangedClass.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testModifiedAddedRemovedElements/src/kotlin/previous-classpath/0/com/example/UnchangedClass.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testModifiedAddedRemovedElements/src/previous-classpath/com/example/UnchangedClass.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/current-classpath/0/com/example/TopLevelMembers2Kt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/current-classpath/com/example/TopLevelMembers2Kt.class similarity index 87% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/current-classpath/0/com/example/TopLevelMembers2Kt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/current-classpath/com/example/TopLevelMembers2Kt.class index 792045bc22b..7f907b21c62 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/current-classpath/0/com/example/TopLevelMembers2Kt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/current-classpath/com/example/TopLevelMembers2Kt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/current-classpath/0/com/example/TopLevelMembersKt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/current-classpath/com/example/TopLevelMembersKt.class similarity index 96% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/current-classpath/0/com/example/TopLevelMembersKt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/current-classpath/com/example/TopLevelMembersKt.class index b8f01d0ac15..5e02b92586c 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/current-classpath/0/com/example/TopLevelMembersKt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/current-classpath/com/example/TopLevelMembersKt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/previous-classpath/0/com/example/TopLevelMembers2Kt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/previous-classpath/com/example/TopLevelMembers2Kt.class similarity index 89% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/previous-classpath/0/com/example/TopLevelMembers2Kt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/previous-classpath/com/example/TopLevelMembers2Kt.class index 6798971ec92..9c51eb0f19f 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/previous-classpath/0/com/example/TopLevelMembers2Kt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/previous-classpath/com/example/TopLevelMembers2Kt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/previous-classpath/0/com/example/TopLevelMembersKt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/previous-classpath/com/example/TopLevelMembersKt.class similarity index 95% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/previous-classpath/0/com/example/TopLevelMembersKt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/previous-classpath/com/example/TopLevelMembersKt.class index cbe28b8da1d..06f72c9b831 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/classes/previous-classpath/0/com/example/TopLevelMembersKt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/classes/previous-classpath/com/example/TopLevelMembersKt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/src/current-classpath/0/com/example/topLevelMembers.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/src/current-classpath/com/example/topLevelMembers.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/src/current-classpath/0/com/example/topLevelMembers.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/src/current-classpath/com/example/topLevelMembers.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/src/current-classpath/0/com/example/topLevelMembers2.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/src/current-classpath/com/example/topLevelMembers2.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/src/current-classpath/0/com/example/topLevelMembers2.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/src/current-classpath/com/example/topLevelMembers2.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/src/previous-classpath/0/com/example/topLevelMembers.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/src/previous-classpath/com/example/topLevelMembers.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/src/previous-classpath/0/com/example/topLevelMembers.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/src/previous-classpath/com/example/topLevelMembers.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/src/previous-classpath/0/com/example/topLevelMembers2.kt b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/src/previous-classpath/com/example/topLevelMembers2.kt similarity index 100% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/testTopLevelMembers_KotlinOnly/src/previous-classpath/0/com/example/topLevelMembers2.kt rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathChangesComputerTest/KotlinOnly/testTopLevelMembers/src/previous-classpath/com/example/topLevelMembers2.kt diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/FileFacadeKt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/FileFacadeKt.class similarity index 93% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/FileFacadeKt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/FileFacadeKt.class index 1d3b87a06ba..52bea1d275a 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/FileFacadeKt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/FileFacadeKt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass.class similarity index 92% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass.class index 9ddcd308682..edfd7a47b1b 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass__MultifileClass1Kt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass__MultifileClass1Kt.class similarity index 92% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass__MultifileClass1Kt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass__MultifileClass1Kt.class index b2c3fa2b48d..5b1675e5235 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass__MultifileClass1Kt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass__MultifileClass1Kt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass__MultifileClass2Kt.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass__MultifileClass2Kt.class similarity index 92% rename from compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass__MultifileClass2Kt.class rename to compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass__MultifileClass2Kt.class index 21e19508ea6..a9874615587 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/com/example/MultifileClass__MultifileClass2Kt.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testPackageFacadeClasses/classes/com/example/MultifileClass__MultifileClass2Kt.class differ diff --git a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testSimpleClass/classes/com/example/SimpleClass.class b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testSimpleClass/classes/com/example/SimpleClass.class index f1e53aca794..f1b53669896 100644 Binary files a/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testSimpleClass/classes/com/example/SimpleClass.class and b/compiler/incremental-compilation-impl/testData/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotterTest/kotlin/testSimpleClass/classes/com/example/SimpleClass.class differ