diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java index fd9e4ba8477..7a15b798e89 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunnerTestGenerated.java @@ -879,6 +879,11 @@ public class IncrementalFirJvmCompilerRunnerTestGenerated extends AbstractIncrem public void testVarianceChanged() throws Exception { runTest("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); } + + @TestMetadata("withIntermediateBodiesChanged") + public void testWithIntermediateBodiesChanged() throws Exception { + runTest("jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/"); + } } @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java index ac89cc3418e..cbfd422eb59 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java @@ -878,6 +878,11 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa public void testVarianceChanged() throws Exception { runTest("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); } + + @TestMetadata("withIntermediateBodiesChanged") + public void testWithIntermediateBodiesChanged() throws Exception { + runTest("jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/"); + } } @TestMetadata("jps-plugin/testData/incremental/js") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java index 246a0e4f8a0..11f14919542 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated.java @@ -878,6 +878,11 @@ public class IncrementalJsCompilerRunnerWithMetadataOnlyTestGenerated extends Ab public void testVarianceChanged() throws Exception { runTest("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); } + + @TestMetadata("withIntermediateBodiesChanged") + public void testWithIntermediateBodiesChanged() throws Exception { + runTest("jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/"); + } } @TestMetadata("jps-plugin/testData/incremental/js") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java index 71d5cc9f087..ccdd61182cd 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerRunnerTestGenerated.java @@ -853,6 +853,11 @@ public class IncrementalJsKlibCompilerRunnerTestGenerated extends AbstractIncrem public void testVarianceChanged() throws Exception { runTest("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); } + + @TestMetadata("withIntermediateBodiesChanged") + public void testWithIntermediateBodiesChanged() throws Exception { + runTest("jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/"); + } } @TestMetadata("jps-plugin/testData/incremental/js") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java index 984b85ba31d..cc2d3e76e7c 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java @@ -853,6 +853,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte public void testVarianceChanged() throws Exception { runTest("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); } + + @TestMetadata("withIntermediateBodiesChanged") + public void testWithIntermediateBodiesChanged() throws Exception { + runTest("jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/"); + } } @TestMetadata("jps-plugin/testData/incremental/js") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java index 24ee80bc1d0..f38c9b9d859 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java @@ -879,6 +879,11 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement public void testVarianceChanged() throws Exception { runTest("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); } + + @TestMetadata("withIntermediateBodiesChanged") + public void testWithIntermediateBodiesChanged() throws Exception { + runTest("jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/"); + } } @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite") diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java index 020a7d23898..293e2e7b5aa 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmOldBackendCompilerRunnerTestGenerated.java @@ -879,6 +879,11 @@ public class IncrementalJvmOldBackendCompilerRunnerTestGenerated extends Abstrac public void testVarianceChanged() throws Exception { runTest("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); } + + @TestMetadata("withIntermediateBodiesChanged") + public void testWithIntermediateBodiesChanged() throws Exception { + runTest("jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/"); + } } @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite") diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/DirectInter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/DirectInter.kt new file mode 100644 index 00000000000..90cac49c5f5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/DirectInter.kt @@ -0,0 +1,3 @@ +package foo + +open class DirectInter : DirectBase() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/ReverseInter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/ReverseInter.kt new file mode 100644 index 00000000000..cc05d2e41fb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/ReverseInter.kt @@ -0,0 +1,3 @@ +package foo + +open class ReverseInter : ReverseBase() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/build.log new file mode 100644 index 00000000000..5ca66e7128b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/build.log @@ -0,0 +1,18 @@ +================ Step #1 ================= + +Cleaning output files: +End of files +Compiling files: + src/direct.kt +End of files +Exit code: OK + +================ Step #2 ================= + +Cleaning output files: +End of files +Compiling files: + src/reverse.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt new file mode 100644 index 00000000000..356c5c1368d --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt @@ -0,0 +1,7 @@ +package foo + +open class DirectBase { + open val x get() = 0 +} + +class DirectChild : DirectInter() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt.new.1 new file mode 100644 index 00000000000..2d3def08796 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/direct.kt.new.1 @@ -0,0 +1,11 @@ +package foo + +// order is important, see KT-49750 + +open class DirectBase { + open val x get() = 1 +} + +class DirectChild : DirectInter() { + override val x get() = 3 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt new file mode 100644 index 00000000000..e0ed5506af1 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt @@ -0,0 +1,7 @@ +package foo + +class ReverseChild : ReverseInter() + +open class ReverseBase { + open val x get() = 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt.new.2 new file mode 100644 index 00000000000..fd4152a07f9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/withIntermediateBodiesChanged/reverse.kt.new.2 @@ -0,0 +1,11 @@ +package foo + +// order is important, see KT-49750 + +class ReverseChild : ReverseInter() { + override val x get() = 5 +} + +open class ReverseBase { + open val x get() = 2 +}