Add incremental compilation tests with changes of companion object

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/");

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt

@@ -0,0 +1,3 @@
+class A {
+    companion object AA : B()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt

@@ -0,0 +1,3 @@
+open class B {
+    val x: String = ""
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1

@@ -0,0 +1,3 @@
+open class B {
+    val x: String? = null
+}

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

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt

@@ -0,0 +1,3 @@
+fun A.AA.ext() {
+    x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2

@@ -0,0 +1,3 @@
+fun A.AA.ext() {
+    x?.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt

@@ -0,0 +1,3 @@
+fun explicitRef() {
+    A.AA.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2

@@ -0,0 +1,3 @@
+fun explicitRef() {
+    A.AA.x?.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt

@@ -0,0 +1,3 @@
+fun implicitRef() {
+    A.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2

@@ -0,0 +1,3 @@
+fun implicitRef() {
+    A.x?.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt

@@ -0,0 +1,5 @@
+import A.AA.x
+
+fun importedMember() {
+    x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2

@@ -0,0 +1,5 @@
+import A.AA.x
+
+fun importedMember() {
+    x?.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt

@@ -0,0 +1,5 @@
+class A {
+    companion object AA {
+        val x: String = ""
+    }
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1

@@ -0,0 +1,5 @@
+class A {
+    companion object AA {
+        val x: String? = ""
+    }
+}

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

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt

@@ -0,0 +1,3 @@
+fun A.AA.ext() {
+    x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2

@@ -0,0 +1,3 @@
+fun A.AA.ext() {
+    x?.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt

@@ -0,0 +1,3 @@
+fun explicitRef() {
+    A.AA.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2

@@ -0,0 +1,3 @@
+fun explicitRef() {
+    A.AA.x?.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt

@@ -0,0 +1,3 @@
+fun implicitRef() {
+    A.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2

@@ -0,0 +1,3 @@
+fun implicitRef() {
+    A.x?.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt

@@ -0,0 +1,5 @@
+import A.AA.x
+
+fun importedMember() {
+    x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2

@@ -0,0 +1,5 @@
+import A.AA.x
+
+fun importedMember() {
+    x?.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt

@@ -0,0 +1,5 @@
+class A {
+    companion object {
+        val x: String = ""
+    }
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1

@@ -0,0 +1,5 @@
+class A {
+    companion object AA {
+        val x: String = ""
+    }
+}

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

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt

@@ -0,0 +1,3 @@
+fun A.Companion.ext() {
+    x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2

@@ -0,0 +1,3 @@
+fun A.AA.ext() {
+    x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt

@@ -0,0 +1,3 @@
+fun explicitRef() {
+    A.Companion.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2

@@ -0,0 +1,3 @@
+fun explicitRef() {
+    A.AA.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt

@@ -0,0 +1,3 @@
+fun implicitRef() {
+    A.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt

@@ -0,0 +1,5 @@
+class A {
+    companion object AA {
+        val x: String = ""
+    }
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1

@@ -0,0 +1,5 @@
+class A {
+    object AA {
+        val x: String = ""
+    }
+}

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

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt

@@ -0,0 +1,3 @@
+fun A.AA.ext() {
+    x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt

@@ -0,0 +1,3 @@
+fun explicitRef() {
+    A.AA.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt

@@ -0,0 +1,3 @@
+fun implicitRef() {
+    A.x.hashCode()
+}

jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2

@@ -0,0 +1,3 @@
+fun implicitRef() {
+    A.AA.x.hashCode()
+}