diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index dd046acf288..efa690b46ac 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -914,6 +914,7 @@ fun main(args: Array) { model("incremental/pureKotlin", extension = null, excludeParentDirs = true) model("incremental/withJava", extension = null, excludeParentDirs = true) model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true) + model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true) } testClass() { 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 ccaf4667333..53e2b965f60 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1030,4 +1030,140 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta } } + + @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ClassHierarchyAffected extends AbstractExperimentalIncrementalJpsTest { + public void testAllFilesPresentInClassHierarchyAffected() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("annotationListChanged") + public void testAnnotationListChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/"); + doTest(fileName); + } + + @TestMetadata("bridgeGenerated") + public void testBridgeGenerated() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/"); + doTest(fileName); + } + + @TestMetadata("classBecameFinal") + public void testClassBecameFinal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/"); + doTest(fileName); + } + + @TestMetadata("classBecameInterface") + public void testClassBecameInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/"); + doTest(fileName); + } + + @TestMetadata("classBecamePrivate") + public void testClassBecamePrivate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/"); + doTest(fileName); + } + + @TestMetadata("constructorVisibilityChanged") + public void testConstructorVisibilityChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/"); + doTest(fileName); + } + + @TestMetadata("flagsAndMemberInDifferentClassesChanged") + public void testFlagsAndMemberInDifferentClassesChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/"); + doTest(fileName); + } + + @TestMetadata("jvmNameChanged") + public void testJvmNameChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/"); + doTest(fileName); + } + + @TestMetadata("methodAdded") + public void testMethodAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/"); + doTest(fileName); + } + + @TestMetadata("methodAnnotationAdded") + public void testMethodAnnotationAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/"); + doTest(fileName); + } + + @TestMetadata("methodNullabilityChanged") + public void testMethodNullabilityChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/"); + doTest(fileName); + } + + @TestMetadata("methodParameterWithDefaultValueAdded") + public void testMethodParameterWithDefaultValueAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/"); + doTest(fileName); + } + + @TestMetadata("methodRemoved") + public void testMethodRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/"); + doTest(fileName); + } + + @TestMetadata("multiModuleCircular") + public void testMultiModuleCircular() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/"); + doTest(fileName); + } + + @TestMetadata("multiModuleExported") + public void testMultiModuleExported() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/"); + doTest(fileName); + } + + @TestMetadata("multiModuleSimple") + public void testMultiModuleSimple() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/"); + doTest(fileName); + } + + @TestMetadata("propertyNullabilityChanged") + public void testPropertyNullabilityChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/"); + doTest(fileName); + } + + @TestMetadata("starProjectionUpperBoundChanged") + public void testStarProjectionUpperBoundChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/"); + doTest(fileName); + } + + @TestMetadata("supertypesListChanged") + public void testSupertypesListChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/"); + doTest(fileName); + } + + @TestMetadata("typeParameterListChanged") + public void testTypeParameterListChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/"); + doTest(fileName); + } + + @TestMetadata("varianceChanged") + public void testVarianceChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); + doTest(fileName); + } + + } } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 7959a7025df..66ec7f7d1b2 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() { diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 new file mode 100644 index 00000000000..9c7d9dc40fa --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 @@ -0,0 +1,8 @@ +package foo + +annotation class Ann + +@Ann +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 new file mode 100644 index 00000000000..b349e8e377a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 @@ -0,0 +1,7 @@ +package foo + +annotation class Ann + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log new file mode 100644 index 00000000000..6661481845f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log @@ -0,0 +1,65 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +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/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files + + +Cleaning output files: +out/production/module/foo/A.class +out/production/module/foo/Ann.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +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/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt new file mode 100644 index 00000000000..02bb019e8a2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f(x: T) {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt new file mode 100644 index 00000000000..a466bbf9c19 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new new file mode 100644 index 00000000000..04773fe5c7a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new @@ -0,0 +1,5 @@ +package foo + +class AChild : A() { + override fun f(x: Int) {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log new file mode 100644 index 00000000000..48f4127779c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/foo/AChild.class +End of files +Compiling files: +src/AChild.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt new file mode 100644 index 00000000000..32b132335bf --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f(0) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 new file mode 100644 index 00000000000..49a0e61be12 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log new file mode 100644 index 00000000000..25fd00fe12e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log @@ -0,0 +1,55 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +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: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files +COMPILATION FAILED +This type is final, so it cannot be inherited from + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +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/classBecameFinal/classLiteral.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 new file mode 100644 index 00000000000..67301a99f6b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +interface A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log new file mode 100644 index 00000000000..7fef745d9de --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log @@ -0,0 +1,60 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +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: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files +COMPILATION FAILED +This class does not have a constructor +Unresolved reference: A +Unresolved reference: A +Unresolved reference: A +Unresolved reference: A + + +Cleaning output files: +out/production/module/foo/A$DefaultImpls.class +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +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/classBecameInterface/classLiteral.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 new file mode 100644 index 00000000000..dace6cffce4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +private open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ 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 new file mode 100644 index 00000000000..0cd42f84f75 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -0,0 +1,67 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +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/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files +COMPILATION FAILED +Cannot access 'A': it is 'private' in file +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' +Generic effective visibility 'public' should be the same or less permissive than its type parameter bound 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 parameter 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' +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file +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' +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 new file mode 100644 index 00000000000..bc98fc87051 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A private constructor () \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log new file mode 100644 index 00000000000..7bd1b019759 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log @@ -0,0 +1,28 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class +out/production/module/foo/CreateAKt.class +End of files +Compiling files: +src/AChild.kt +src/createA.kt +End of files +COMPILATION FAILED +Cannot access '': it is 'private' in 'A' +Cannot access '': it is 'private' in 'A' + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/createA.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt new file mode 100644 index 00000000000..bb948def8b9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt @@ -0,0 +1,5 @@ +package foo + +fun createA() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt new file mode 100644 index 00000000000..8166e17bf2e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun createAChild() { + AChild() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 new file mode 100644 index 00000000000..95cd862ae9c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A : AParent() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 new file mode 100644 index 00000000000..43ad3744b5d --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class AParent \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt new file mode 100644 index 00000000000..ae6bae15cbf --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt @@ -0,0 +1,5 @@ +package foo + +class B { + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 new file mode 100644 index 00000000000..c6d25347c65 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +class B { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log new file mode 100644 index 00000000000..0fab1b73d54 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log @@ -0,0 +1,20 @@ +Cleaning output files: +out/production/module/foo/A.class +out/production/module/foo/B.class +End of files +Compiling files: +src/A.kt +src/AParent.kt +src/B.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/UseBKt.class +out/production/module/foo/AChild.class +End of files +Compiling files: +src/AChild.kt +src/importA.kt +src/importAChild.kt +src/useB.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt new file mode 100644 index 00000000000..aef89fb3058 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt new file mode 100644 index 00000000000..e8361dacb48 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt @@ -0,0 +1,7 @@ +package bar + +import foo.B + +fun useB() { + B().f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt new file mode 100644 index 00000000000..33a577d56a3 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt @@ -0,0 +1,6 @@ +package foo + +open class A { + @JvmName("g") + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new new file mode 100644 index 00000000000..5c9fa2560e0 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new @@ -0,0 +1,6 @@ +package foo + +open class A { + @JvmName("h") + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log new file mode 100644 index 00000000000..ba820f85000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/AChild.kt +src/useAChild.kt +End of files diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new new file mode 100644 index 00000000000..6a5b7815115 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log new file mode 100644 index 00000000000..270e4f5daa5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt new file mode 100644 index 00000000000..0905e579ffc --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt @@ -0,0 +1,3 @@ +package foo + +fun AChild.f() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt new file mode 100644 index 00000000000..6a5b7815115 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new new file mode 100644 index 00000000000..7a264385242 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new @@ -0,0 +1,8 @@ +package foo + +annotation class Ann + +open class A { + @Ann + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log new file mode 100644 index 00000000000..270e4f5daa5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt new file mode 100644 index 00000000000..8be756fcb12 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f(x: Any?) {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 new file mode 100644 index 00000000000..1d9db70d68e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f(x: Any) {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 new file mode 100644 index 00000000000..8be756fcb12 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f(x: Any?) {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log new file mode 100644 index 00000000000..a6e893da45d --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log @@ -0,0 +1,24 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files +COMPILATION FAILED +Null can not be a value of a non-null type kotlin.Any + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt new file mode 100644 index 00000000000..ae703b51dcb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f(null) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt new file mode 100644 index 00000000000..6a5b7815115 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new new file mode 100644 index 00000000000..12f731963ee --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f(x: Int = 0) {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log new file mode 100644 index 00000000000..b450c2880fc --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/AChild.kt +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt new file mode 100644 index 00000000000..6a5b7815115 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log new file mode 100644 index 00000000000..2dc893eb74c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/utils.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/AChild.kt +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new new file mode 100644 index 00000000000..0905e579ffc --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new @@ -0,0 +1,3 @@ +package foo + +fun AChild.f() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log new file mode 100644 index 00000000000..9272eb1ea31 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -0,0 +1,49 @@ +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module1/foo/D.class +out/production/module2/foo/B.class +out/production/module3/foo/C.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files +Compiling files: +module3/src/module3_C.kt +End of files +Compiling files: +module1/src/module1_D.kt +End of files +COMPILATION FAILED +This type is final, so it cannot be inherited from + + +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files +Compiling files: +module3/src/module3_C.kt +End of files +Compiling files: +module1/src/module1_A.kt +module1/src/module1_D.kt +End of files +Cleaning output files: +out/production/module4/foo/E.class +End of files +Compiling files: +module4/src/module4_E.kt +End of files +Cleaning output files: +out/production/module5/foo/F.class +End of files +Compiling files: +module5/src/module5_F.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt new file mode 100644 index 00000000000..4135ff7c289 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt @@ -0,0 +1,5 @@ +module1->module3 +module2->module1[exported] +module3->module2[exported] +module4->module2 +module5->module3 \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 new file mode 100644 index 00000000000..16d999e4a49 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt new file mode 100644 index 00000000000..221afec4644 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt @@ -0,0 +1,3 @@ +package foo + +class D : C() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt new file mode 100644 index 00000000000..cf9f6d41c33 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt @@ -0,0 +1,3 @@ +package foo + +open class B : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt new file mode 100644 index 00000000000..cf93d3da790 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt @@ -0,0 +1,3 @@ +package foo + +open class C : B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt new file mode 100644 index 00000000000..3e9a3199d85 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt @@ -0,0 +1,3 @@ +package foo + +open class E : B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt new file mode 100644 index 00000000000..e32d45f0ea6 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt @@ -0,0 +1,3 @@ +package foo + +open class F : C() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log new file mode 100644 index 00000000000..cdaee454b33 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -0,0 +1,36 @@ +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/foo/AChild.class +End of files +Compiling files: +module2/src/module2_AChild.kt +End of files +COMPILATION FAILED +Cannot access 'A': it is 'private' in file +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' + + +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Compiling files: +module2/src/module2_AChild.kt +End of files +Cleaning output files: +out/production/module3/foo/AGrandChild.class +End of files +Compiling files: +module3/src/module3_AGrandChild.kt +module3/src/module3_importAGrandChild.kt +End of files +Compiling files: +module4/src/module4_importAGrandChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt new file mode 100644 index 00000000000..c202ba91e3f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt @@ -0,0 +1,4 @@ +module1-> +module2->module1[exported] +module3->module2 +module4->module3 \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 new file mode 100644 index 00000000000..dace6cffce4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +private open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log new file mode 100644 index 00000000000..1e03d4107d3 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -0,0 +1,32 @@ +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/foo/AChild.class +End of files +Compiling files: +module2/src/module2_AChild.kt +module2/src/module2_importA.kt +End of files +COMPILATION FAILED +Cannot access 'A': it is 'private' in file +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' +Cannot access 'A': it is 'private' in file + + +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Compiling files: +module2/src/module2_AChild.kt +module2/src/module2_importA.kt +End of files +Compiling files: +module3/src/module3_importAChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt new file mode 100644 index 00000000000..07917d6cffb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3->module2 \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 new file mode 100644 index 00000000000..dace6cffce4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +private open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt new file mode 100644 index 00000000000..aef89fb3058 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt new file mode 100644 index 00000000000..83aff659f75 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + val x: Any = object {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 new file mode 100644 index 00000000000..a7ed7853d1b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A { + val x: Any? = null +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 new file mode 100644 index 00000000000..83aff659f75 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + val x: Any = object {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log new file mode 100644 index 00000000000..e91a715b155 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log @@ -0,0 +1,25 @@ +Cleaning output files: +out/production/module/foo/A$x$1.class +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt new file mode 100644 index 00000000000..d654c8a23a2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + val o: Any = a.x +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt new file mode 100644 index 00000000000..9470d404129 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt @@ -0,0 +1 @@ +class A(x: T) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 new file mode 100644 index 00000000000..49eef2dab8c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 @@ -0,0 +1 @@ +class A(x: T) diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt new file mode 100644 index 00000000000..5f5db292873 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt @@ -0,0 +1,3 @@ +abstract class AStarDeclaration { + abstract val a: A<*> +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt new file mode 100644 index 00000000000..292ad03ac71 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt @@ -0,0 +1,3 @@ +open class B { + fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt new file mode 100644 index 00000000000..258300503e1 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt @@ -0,0 +1,3 @@ +class CallGetAStar { + val a = getAStar() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log new file mode 100644 index 00000000000..d6cbadde7c4 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/AStarDeclaration.class +out/production/module/CallGetAStar.class +out/production/module/GetAStarKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/AStarDeclaration.kt +src/CallGetAStar.kt +src/getAStar.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt new file mode 100644 index 00000000000..9ad7870fce3 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt @@ -0,0 +1 @@ +fun getAStar(): A<*> = A(B()) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 new file mode 100644 index 00000000000..4bd0a1f0e86 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A : AParent() { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 new file mode 100644 index 00000000000..43ad3744b5d --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class AParent \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ 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 new file mode 100644 index 00000000000..04492816e9b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log @@ -0,0 +1,67 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AParent.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +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/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +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: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +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/supertypesListChanged/classLiteral.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 new file mode 100644 index 00000000000..9e6f6eb3a49 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log new file mode 100644 index 00000000000..8f18e60ad0a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log @@ -0,0 +1,64 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +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: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files +COMPILATION FAILED +Type argument expected +Type argument expected +Type argument expected +Type inference failed: Not enough information to infer parameter T in constructor A() +Please specify it explicitly. +Type inference failed: Not enough information to infer parameter T in constructor A() +Please specify it explicitly. +Type inference failed: Not enough information to infer parameter T in constructor A() +Please specify it explicitly. +Type argument expected + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +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/typeParameterListChanged/classLiteral.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt new file mode 100644 index 00000000000..d1126ea0670 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt @@ -0,0 +1 @@ +class A(x: T) diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 new file mode 100644 index 00000000000..2029e4e0fca --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 @@ -0,0 +1 @@ +class A(x: T) diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt new file mode 100644 index 00000000000..1fae5b2eac0 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt @@ -0,0 +1 @@ +open class B \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt new file mode 100644 index 00000000000..a87fb91287a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt @@ -0,0 +1 @@ +class C : B() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt new file mode 100644 index 00000000000..6bd33000495 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt @@ -0,0 +1,8 @@ +class D(x: T) { + companion object { + val b = D(B()) + val c = D(C()) + } + + var a = A(x) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log new file mode 100644 index 00000000000..01a4c3b1191 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log @@ -0,0 +1,51 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +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/useD.kt +End of files +COMPILATION FAILED +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 +src/D.kt +src/useA.kt +src/useD.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt new file mode 100644 index 00000000000..a2c8197452b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt @@ -0,0 +1,5 @@ +fun useA() { + var b: A = A(B()) + var c: A = A(C()) + c = b +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 new file mode 100644 index 00000000000..c132cb6b9ed --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 @@ -0,0 +1,5 @@ +fun useA() { + var b: A = A(B()) + var c: A = A(C()) + b = c +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt new file mode 100644 index 00000000000..074bef1752a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt @@ -0,0 +1,3 @@ +fun useD() { + D.c.a = D.b.a +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 new file mode 100644 index 00000000000..a95a229da86 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 @@ -0,0 +1,3 @@ +fun useD() { + D.b.a = D.c.a +} diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt b/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt index 62d125bf7f4..36458852656 100644 --- a/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt +++ b/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt @@ -8,8 +8,7 @@ Module 'module' production experimental-format-version.txt format-version.txt inline-functions.tab - inlined-to.tab package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module' tests \ No newline at end of file