From a7c432ebe868b3bc2e121bdd511a78fb554d897b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Dec 2015 15:05:34 +0300 Subject: [PATCH] Add incremental compilation tests with changes of companion object --- ...perimentalIncrementalJpsTestGenerated.java | 24 ++++++++++++ .../A.kt | 3 ++ .../B.kt | 3 ++ .../B.kt.new.1 | 3 ++ .../build.log | 36 ++++++++++++++++++ .../companionExtension.kt | 3 ++ .../companionExtension.kt.new.2 | 3 ++ .../companionReferenceExplicit.kt | 3 ++ .../companionReferenceExplicit.kt.new.2 | 3 ++ .../companionReferenceImplicit.kt | 3 ++ .../companionReferenceImplicit.kt.new.2 | 3 ++ .../importedMember.kt | 5 +++ .../importedMember.kt.new.2 | 5 +++ .../companionObjectMemberChanged/A.kt | 5 +++ .../companionObjectMemberChanged/A.kt.new.1 | 5 +++ .../companionObjectMemberChanged/build.log | 38 +++++++++++++++++++ .../companionExtension.kt | 3 ++ .../companionExtension.kt.new.2 | 3 ++ .../companionReferenceExplicit.kt | 3 ++ .../companionReferenceExplicit.kt.new.2 | 3 ++ .../companionReferenceImplicit.kt | 3 ++ .../companionReferenceImplicit.kt.new.2 | 3 ++ .../importedMember.kt | 5 +++ .../importedMember.kt.new.2 | 5 +++ .../companionObjectNameChanged/A.kt | 5 +++ .../companionObjectNameChanged/A.kt.new.1 | 5 +++ .../companionObjectNameChanged/build.log | 33 ++++++++++++++++ .../companionExtension.kt | 3 ++ .../companionExtension.kt.new.2 | 3 ++ .../companionReferenceExplicit.kt | 3 ++ .../companionReferenceExplicit.kt.new.2 | 3 ++ .../companionReferenceImplicit.kt | 3 ++ .../companionObjectToSimpleObject/A.kt | 5 +++ .../companionObjectToSimpleObject/A.kt.new.1 | 5 +++ .../companionObjectToSimpleObject/build.log | 32 ++++++++++++++++ .../companionExtension.kt | 3 ++ .../companionReferenceExplicit.kt | 3 ++ .../companionReferenceImplicit.kt | 3 ++ .../companionReferenceImplicit.kt.new.2 | 3 ++ 39 files changed, 285 insertions(+) create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt create mode 100644 jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 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 67fde1a276f..617ba2511c9 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1075,6 +1075,30 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("companionObjectInheritedMemberChanged") + public void testCompanionObjectInheritedMemberChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/"); + doTest(fileName); + } + + @TestMetadata("companionObjectMemberChanged") + public void testCompanionObjectMemberChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/"); + doTest(fileName); + } + + @TestMetadata("companionObjectNameChanged") + public void testCompanionObjectNameChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/"); + doTest(fileName); + } + + @TestMetadata("companionObjectToSimpleObject") + public void testCompanionObjectToSimpleObject() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/"); + doTest(fileName); + } + @TestMetadata("constructorVisibilityChanged") public void testConstructorVisibilityChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/"); diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt new file mode 100644 index 00000000000..953bf9cccce --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt @@ -0,0 +1,3 @@ +class A { + companion object AA : B() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt new file mode 100644 index 00000000000..907bdf34387 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt @@ -0,0 +1,3 @@ +open class B { + val x: String = "" +} diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 new file mode 100644 index 00000000000..d31e5521fd0 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 @@ -0,0 +1,3 @@ +open class B { + val x: String? = null +} diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log new file mode 100644 index 00000000000..f83d4d254bb --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log @@ -0,0 +1,36 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/CompanionExtensionKt.class +out/production/module/CompanionReferenceExplicitKt.class +out/production/module/CompanionReferenceImplicitKt.class +out/production/module/ImportedMemberKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +src/importedMember.kt +End of files +COMPILATION FAILED +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +src/importedMember.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt new file mode 100644 index 00000000000..983f6be3eec --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 new file mode 100644 index 00000000000..9f737301219 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x?.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt new file mode 100644 index 00000000000..1a0c196d40c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 new file mode 100644 index 00000000000..c9e3e203569 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x?.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt new file mode 100644 index 00000000000..b811959ef21 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 new file mode 100644 index 00000000000..8745fbe624c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x?.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt new file mode 100644 index 00000000000..fa4633524d1 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt @@ -0,0 +1,5 @@ +import A.AA.x + +fun importedMember() { + x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 new file mode 100644 index 00000000000..bf230a27d1b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 @@ -0,0 +1,5 @@ +import A.AA.x + +fun importedMember() { + x?.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt new file mode 100644 index 00000000000..9023a3c731d --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt @@ -0,0 +1,5 @@ +class A { + companion object AA { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 new file mode 100644 index 00000000000..0976411519f --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +class A { + companion object AA { + val x: String? = "" + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log new file mode 100644 index 00000000000..7c6f3bca8d8 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log @@ -0,0 +1,38 @@ +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/CompanionExtensionKt.class +out/production/module/CompanionReferenceExplicitKt.class +out/production/module/CompanionReferenceImplicitKt.class +out/production/module/ImportedMemberKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +src/importedMember.kt +End of files +COMPILATION FAILED +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? + + +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +src/importedMember.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt new file mode 100644 index 00000000000..983f6be3eec --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 new file mode 100644 index 00000000000..9f737301219 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x?.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt new file mode 100644 index 00000000000..1a0c196d40c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 new file mode 100644 index 00000000000..c9e3e203569 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x?.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt new file mode 100644 index 00000000000..b811959ef21 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 new file mode 100644 index 00000000000..8745fbe624c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x?.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt new file mode 100644 index 00000000000..fa4633524d1 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt @@ -0,0 +1,5 @@ +import A.AA.x + +fun importedMember() { + x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 new file mode 100644 index 00000000000..bf230a27d1b --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 @@ -0,0 +1,5 @@ +import A.AA.x + +fun importedMember() { + x?.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt new file mode 100644 index 00000000000..bfaf514dd9a --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt @@ -0,0 +1,5 @@ +class A { + companion object { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 new file mode 100644 index 00000000000..9023a3c731d --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +class A { + companion object AA { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log new file mode 100644 index 00000000000..1787756a360 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log @@ -0,0 +1,33 @@ +Cleaning output files: +out/production/module/A$Companion.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/CompanionExtensionKt.class +out/production/module/CompanionReferenceExplicitKt.class +out/production/module/CompanionReferenceImplicitKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +End of files +COMPILATION FAILED +Unresolved reference: Companion +Unresolved reference: Companion + + +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt new file mode 100644 index 00000000000..5968cacacaa --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt @@ -0,0 +1,3 @@ +fun A.Companion.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 new file mode 100644 index 00000000000..983f6be3eec --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt new file mode 100644 index 00000000000..e5a86cc31a2 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt @@ -0,0 +1,3 @@ +fun explicitRef() { + A.Companion.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 new file mode 100644 index 00000000000..1a0c196d40c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt new file mode 100644 index 00000000000..b811959ef21 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt new file mode 100644 index 00000000000..9023a3c731d --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt @@ -0,0 +1,5 @@ +class A { + companion object AA { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 new file mode 100644 index 00000000000..bbcc3b8bd24 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 @@ -0,0 +1,5 @@ +class A { + object AA { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log new file mode 100644 index 00000000000..2d1c1668c52 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log @@ -0,0 +1,32 @@ +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/CompanionExtensionKt.class +out/production/module/CompanionReferenceExplicitKt.class +out/production/module/CompanionReferenceImplicitKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +End of files +COMPILATION FAILED +Unresolved reference: x + + +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt new file mode 100644 index 00000000000..983f6be3eec --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt new file mode 100644 index 00000000000..1a0c196d40c --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt new file mode 100644 index 00000000000..b811959ef21 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x.hashCode() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 new file mode 100644 index 00000000000..af0f9bee8f3 --- /dev/null +++ b/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun implicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file