From f32ff42ba33556d339a6738ddee7e49754d99a04 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 21 Jan 2016 18:34:38 +0300 Subject: [PATCH] Recompile implicit type usages when class signature is changed --- ...perimentalIncrementalJpsTestGenerated.java | 24 +++++++++++ .../annotationListChanged/build.log | 4 ++ .../classBecamePrivate/build.log | 4 ++ .../enumEntryAdded/build.log | 3 ++ .../classHierarchyAffected/implcitUpcast/A.kt | 1 + .../classHierarchyAffected/implcitUpcast/B.kt | 1 + .../implcitUpcast/B.kt.new.1 | 1 + .../implcitUpcast/B.kt.new.2 | 1 + .../classHierarchyAffected/implcitUpcast/C.kt | 1 + .../classHierarchyAffected/implcitUpcast/D.kt | 1 + .../implcitUpcast/build.log | 37 ++++++++++++++++ .../implcitUpcast/callUseAWithA.kt | 3 ++ .../implcitUpcast/callUseAWithB.kt | 3 ++ .../implcitUpcast/callUseAWithC.kt | 3 ++ .../implcitUpcast/callUseAWithD.kt | 3 ++ .../implcitUpcast/getA.kt | 1 + .../implcitUpcast/getB.kt | 1 + .../implcitUpcast/getC.kt | 1 + .../implcitUpcast/getD.kt | 1 + .../implcitUpcast/useA.kt | 1 + .../inferredTypeArgumentChanged/A.kt | 1 + .../inferredTypeArgumentChanged/B.kt | 1 + .../inferredTypeArgumentChanged/B.kt.new.1 | 1 + .../inferredTypeArgumentChanged/B.kt.new.2 | 1 + .../inferredTypeArgumentChanged/C.kt | 1 + .../inferredTypeArgumentChanged/D.kt | 1 + .../inferredTypeArgumentChanged/build.log | 43 +++++++++++++++++++ .../inferredTypeArgumentChanged/getListOfA.kt | 1 + .../inferredTypeArgumentChanged/getListOfB.kt | 1 + .../inferredTypeArgumentChanged/getListOfC.kt | 1 + .../inferredTypeArgumentChanged/getListOfD.kt | 1 + .../inferredTypeArgumentChanged/useListOfA.kt | 1 + .../useListOfAWithListOfA.kt | 3 ++ .../useListOfAWithListOfB.kt | 3 ++ .../useListOfAWithListOfC.kt | 3 ++ .../useListOfAWithListOfD.kt | 3 ++ .../inferredTypeChanged/A.kt | 1 + .../inferredTypeChanged/B.kt | 1 + .../inferredTypeChanged/B.kt.new | 1 + .../inferredTypeChanged/C.kt | 1 + .../inferredTypeChanged/D.kt | 1 + .../inferredTypeChanged/build.log | 23 ++++++++++ .../inferredTypeChanged/getA.kt | 1 + .../inferredTypeChanged/getAorD.kt | 1 + .../inferredTypeChanged/getB.kt | 1 + .../inferredTypeChanged/getBorC.kt | 1 + .../inferredTypeChanged/getBorD.kt | 1 + .../inferredTypeChanged/getC.kt | 1 + .../inferredTypeChanged/getCorD.kt | 1 + .../inferredTypeChanged/getD.kt | 1 + .../lambdaParameterAffected/A.kt | 1 + .../lambdaParameterAffected/B.kt | 1 + .../lambdaParameterAffected/B.kt.new.1 | 1 + .../lambdaParameterAffected/B.kt.new.2 | 1 + .../lambdaParameterAffected/build.log | 36 ++++++++++++++++ .../lambdaParameterAffected/consumeA.kt | 1 + .../consumeBExtLambda.kt | 3 ++ .../lambdaParameterAffected/consumeBLambda.kt | 3 ++ .../useConsumeBExtLambda.kt | 3 ++ .../useConsumeBLambda.kt | 3 ++ .../supertypesListChanged/build.log | 2 + .../varianceChanged/build.log | 25 ++--------- .../{useD.kt.new.3 => useD.kt.new.2} | 0 63 files changed, 255 insertions(+), 22 deletions(-) create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt rename jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/{useD.kt.new.3 => useD.kt.new.2} (100%) diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index fc8fa859040..21cb93aca87 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1135,12 +1135,36 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("implcitUpcast") + public void testImplcitUpcast() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/"); + doTest(fileName); + } + + @TestMetadata("inferredTypeArgumentChanged") + public void testInferredTypeArgumentChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/"); + doTest(fileName); + } + + @TestMetadata("inferredTypeChanged") + public void testInferredTypeChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/"); + doTest(fileName); + } + @TestMetadata("jvmNameChanged") public void testJvmNameChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/"); doTest(fileName); } + @TestMetadata("lambdaParameterAffected") + public void testLambdaParameterAffected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/"); + doTest(fileName); + } + @TestMetadata("methodAdded") public void testMethodAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/"); diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log index 6661481845f..fa8b4a82368 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log @@ -14,6 +14,7 @@ out/production/module/foo/ATypeParameter.class out/production/module/foo/ClassLiteralKt.class out/production/module/foo/FunctionParameterKt.class out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class out/production/module/foo/ReturnTypeKt.class End of files Compiling files: @@ -28,6 +29,7 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files @@ -48,6 +50,7 @@ out/production/module/foo/ATypeParameter.class out/production/module/foo/ClassLiteralKt.class out/production/module/foo/FunctionParameterKt.class out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class out/production/module/foo/ReturnTypeKt.class End of files Compiling files: @@ -62,4 +65,5 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log index 0cd42f84f75..e6ef1c22e73 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -14,6 +14,7 @@ out/production/module/foo/ATypeParameter.class out/production/module/foo/ClassLiteralKt.class out/production/module/foo/FunctionParameterKt.class out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class out/production/module/foo/ReturnTypeKt.class End of files Compiling files: @@ -28,6 +29,7 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files COMPILATION FAILED Cannot access 'A': it is 'private' in file @@ -46,6 +48,7 @@ Cannot access 'A': it is 'private' in file Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file +Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' Cleaning output files: @@ -64,4 +67,5 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log index ee16e42ee70..99ebd362fb5 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -7,11 +7,13 @@ End of files Cleaning output files: out/production/module/GetRandomEnumEntryKt.class out/production/module/META-INF/module.kotlin_module +out/production/module/UseEnumImplicitlyKt.class out/production/module/UseKt.class End of files Compiling files: src/getRandomEnumEntry.kt src/use.kt +src/useEnumImplicitly.kt End of files COMPILATION FAILED when expression must be exhaustive, add necessary 'C' branch or 'else' branch instead @@ -24,4 +26,5 @@ Compiling files: src/Enum.kt src/getRandomEnumEntry.kt src/use.kt +src/useEnumImplicitly.kt End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt new file mode 100644 index 00000000000..7f0bdfbb9ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt @@ -0,0 +1 @@ +open class A diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt @@ -0,0 +1 @@ +open class B : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 new file mode 100644 index 00000000000..711103786bc --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 @@ -0,0 +1 @@ +open class B diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 @@ -0,0 +1 @@ +open class B : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt new file mode 100644 index 00000000000..bca481db106 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt @@ -0,0 +1 @@ +class C : B() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt new file mode 100644 index 00000000000..b1da90d456f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt @@ -0,0 +1 @@ +class D : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log new file mode 100644 index 00000000000..d70203b60b6 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log @@ -0,0 +1,37 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/C.class +out/production/module/CallUseAWithBKt.class +out/production/module/CallUseAWithCKt.class +out/production/module/GetBKt.class +out/production/module/GetCKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/C.kt +src/callUseAWithB.kt +src/callUseAWithC.kt +src/getB.kt +src/getC.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is B but A was expected +Type mismatch: inferred type is C but A was expected + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/C.kt +src/callUseAWithB.kt +src/callUseAWithC.kt +src/getB.kt +src/getC.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt new file mode 100644 index 00000000000..edf2d0ba1c2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt @@ -0,0 +1,3 @@ +fun callUseAWithA() { + useA(getA()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt new file mode 100644 index 00000000000..f7aff927a73 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt @@ -0,0 +1,3 @@ +fun callUseAWithB() { + useA(getB()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt new file mode 100644 index 00000000000..f824fe53847 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt @@ -0,0 +1,3 @@ +fun callUseAWithC() { + useA(getC()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt new file mode 100644 index 00000000000..20b43d486a6 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt @@ -0,0 +1,3 @@ +fun callUseAWithD() { + useA(getD()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt new file mode 100644 index 00000000000..bd04874b85b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt @@ -0,0 +1 @@ +fun getA() = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt new file mode 100644 index 00000000000..ff08b7154a6 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt @@ -0,0 +1 @@ +fun getB() = B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt new file mode 100644 index 00000000000..a7f96aa5970 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt @@ -0,0 +1 @@ +fun getC() = C() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt new file mode 100644 index 00000000000..caec5c8b01a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt @@ -0,0 +1 @@ +fun getD() = D() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt new file mode 100644 index 00000000000..900c1a151f3 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt @@ -0,0 +1 @@ +fun useA(a: A) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt new file mode 100644 index 00000000000..7f0bdfbb9ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt @@ -0,0 +1 @@ +open class A diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt @@ -0,0 +1 @@ +open class B : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 new file mode 100644 index 00000000000..711103786bc --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 @@ -0,0 +1 @@ +open class B diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 @@ -0,0 +1 @@ +open class B : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt new file mode 100644 index 00000000000..bca481db106 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt @@ -0,0 +1 @@ +class C : B() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt new file mode 100644 index 00000000000..b1da90d456f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt @@ -0,0 +1 @@ +class D : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log new file mode 100644 index 00000000000..59bc08e72d3 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log @@ -0,0 +1,43 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/C.class +out/production/module/GetListOfAKt.class +out/production/module/GetListOfBKt.class +out/production/module/GetListOfCKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseListOfAKt.class +out/production/module/UseListOfAWithListOfBKt.class +out/production/module/UseListOfAWithListOfCKt.class +End of files +Compiling files: +src/C.kt +src/getListOfA.kt +src/getListOfB.kt +src/getListOfC.kt +src/useListOfA.kt +src/useListOfAWithListOfB.kt +src/useListOfAWithListOfC.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected +Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/C.kt +src/getListOfA.kt +src/getListOfB.kt +src/getListOfC.kt +src/useListOfA.kt +src/useListOfAWithListOfB.kt +src/useListOfAWithListOfC.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt new file mode 100644 index 00000000000..80b37b19150 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt @@ -0,0 +1 @@ +fun getListOfA() = listOf(A()) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt new file mode 100644 index 00000000000..081f011bac6 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt @@ -0,0 +1 @@ +fun getListOfB() = listOf(B()) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt new file mode 100644 index 00000000000..c18a23d6f9a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt @@ -0,0 +1 @@ +fun getListOfC() = listOf(C()) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt new file mode 100644 index 00000000000..1c038c61e77 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt @@ -0,0 +1 @@ +fun getListOfD() = listOf(D()) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt new file mode 100644 index 00000000000..51fd8ad94cc --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt @@ -0,0 +1 @@ +fun useListOfA(aas: List) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt new file mode 100644 index 00000000000..3d4d3ce467d --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt @@ -0,0 +1,3 @@ +fun useListOfAWithListOfA() { + useListOfA(getListOfA()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt new file mode 100644 index 00000000000..ef90c64a1ca --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt @@ -0,0 +1,3 @@ +fun useListOfAWithListOfB() { + useListOfA(getListOfB()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt new file mode 100644 index 00000000000..ba71aa7f30c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt @@ -0,0 +1,3 @@ +fun useListOfAWithListOfC() { + useListOfA(getListOfC()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt new file mode 100644 index 00000000000..1301fee38e4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt @@ -0,0 +1,3 @@ +fun useListOfAWithListOfD() { + useListOfA(getListOfD()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt new file mode 100644 index 00000000000..7f0bdfbb9ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt @@ -0,0 +1 @@ +open class A diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt @@ -0,0 +1 @@ +open class B : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new new file mode 100644 index 00000000000..711103786bc --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new @@ -0,0 +1 @@ +open class B diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt new file mode 100644 index 00000000000..bca481db106 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt @@ -0,0 +1 @@ +class C : B() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt new file mode 100644 index 00000000000..b1da90d456f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt @@ -0,0 +1 @@ +class D : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log new file mode 100644 index 00000000000..fc7b9a6b3b0 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/C.class +out/production/module/GetBKt.class +out/production/module/GetBorCKt.class +out/production/module/GetBorDKt.class +out/production/module/GetCKt.class +out/production/module/GetCorDKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/C.kt +src/getB.kt +src/getBorC.kt +src/getBorD.kt +src/getC.kt +src/getCorD.kt +End of files diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt new file mode 100644 index 00000000000..bd04874b85b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt @@ -0,0 +1 @@ +fun getA() = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt new file mode 100644 index 00000000000..8c69a257410 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt @@ -0,0 +1 @@ +fun getAorD() = if (Math.random() > 0.5) getA() else getD() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt new file mode 100644 index 00000000000..ff08b7154a6 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt @@ -0,0 +1 @@ +fun getB() = B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt new file mode 100644 index 00000000000..9bd769387ff --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt @@ -0,0 +1 @@ +fun getBorC() = if (Math.random() > 0.5) getB() else getC() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt new file mode 100644 index 00000000000..153477aaff3 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt @@ -0,0 +1 @@ +fun getBorD() = if (Math.random() > 0.5) getB() else getD() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt new file mode 100644 index 00000000000..a7f96aa5970 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt @@ -0,0 +1 @@ +fun getC() = C() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt new file mode 100644 index 00000000000..90dcb344fbf --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt @@ -0,0 +1 @@ +fun getCorD() = if (Math.random() > 0.5) getC() else getD() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt new file mode 100644 index 00000000000..caec5c8b01a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt @@ -0,0 +1 @@ +fun getD() = D() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt new file mode 100644 index 00000000000..7f0bdfbb9ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt @@ -0,0 +1 @@ +open class A diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt new file mode 100644 index 00000000000..0b8e079aef7 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt @@ -0,0 +1 @@ +class B : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 new file mode 100644 index 00000000000..179f0d27584 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 @@ -0,0 +1 @@ +class B diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 new file mode 100644 index 00000000000..0b8e079aef7 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 @@ -0,0 +1 @@ +class B : A() diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log new file mode 100644 index 00000000000..37a3baf1fcf --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log @@ -0,0 +1,36 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/ConsumeBExtLambdaKt.class +out/production/module/ConsumeBLambdaKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseConsumeBExtLambdaKt$useConsumeBExtLambda$1.class +out/production/module/UseConsumeBExtLambdaKt.class +out/production/module/UseConsumeBLambdaKt$useConsumeBLambda$1.class +out/production/module/UseConsumeBLambdaKt.class +End of files +Compiling files: +src/consumeBExtLambda.kt +src/consumeBLambda.kt +src/useConsumeBExtLambda.kt +src/useConsumeBLambda.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is B but A was expected +Type mismatch: inferred type is B but A was expected + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/consumeBExtLambda.kt +src/consumeBLambda.kt +src/useConsumeBExtLambda.kt +src/useConsumeBLambda.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt new file mode 100644 index 00000000000..e9590d4077b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt @@ -0,0 +1 @@ +fun consumeA(a: A) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt new file mode 100644 index 00000000000..029336ea08c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt @@ -0,0 +1,3 @@ +fun consumeBExtLambda(fn: B.()->Unit) { + B().fn() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt new file mode 100644 index 00000000000..ae66c833918 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt @@ -0,0 +1,3 @@ +fun consumeBLambda(fn: (B)->Unit) { + fn(B()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt new file mode 100644 index 00000000000..78c0903eb1b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt @@ -0,0 +1,3 @@ +fun useConsumeBExtLambda() { + consumeBExtLambda() { consumeA(this) } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt new file mode 100644 index 00000000000..72631e4c285 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt @@ -0,0 +1,3 @@ +fun useConsumeBLambda() { + consumeBLambda() { consumeA(it) } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log index 04492816e9b..2dced77d7d7 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log @@ -15,6 +15,7 @@ out/production/module/foo/ATypeParameter.class out/production/module/foo/ClassLiteralKt.class out/production/module/foo/FunctionParameterKt.class out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class out/production/module/foo/ReturnTypeKt.class End of files Compiling files: @@ -29,6 +30,7 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log index 01a4c3b1191..95c56aeb94f 100644 --- a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log @@ -9,39 +9,20 @@ out/production/module/D$Companion.class out/production/module/D.class out/production/module/META-INF/module.kotlin_module out/production/module/UseAKt.class -End of files -Compiling files: -src/D.kt -src/useA.kt -End of files -COMPILATION FAILED -Type mismatch: inferred type is A but A was expected - - -Cleaning output files: -out/production/module/A.class -End of files -Compiling files: -src/A.kt -src/D.kt -src/useA.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module out/production/module/UseDKt.class End of files Compiling files: +src/D.kt +src/useA.kt src/useD.kt End of files COMPILATION FAILED Type mismatch: inferred type is A but A was expected +Type mismatch: inferred type is A but A was expected Cleaning output files: out/production/module/A.class -out/production/module/D$Companion.class -out/production/module/D.class -out/production/module/UseAKt.class End of files Compiling files: src/A.kt diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2 similarity index 100% rename from jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 rename to jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2