Support nested header/impl classes

compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt

@@ -40,7 +40,6 @@ public header interface Interface {
 }
 
 public header object Object {
-    private constructor Object()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.kt

@@ -0,0 +1,46 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+
+header class OuterClass {
+    header class NestedClass {
+        header class DeepNested {
+            header class Another
+        }
+    }
+
+    header inner class InnerClass
+
+    header companion object
+}
+
+header class OuterClassWithNamedCompanion {
+    header companion object Factory
+}
+
+header object OuterObject {
+    header object NestedObject
+}
+
+// MODULE: m2-jvm(m1-common)
+// FILE: jvm.kt
+
+impl class OuterClass {
+    impl class NestedClass {
+        impl class DeepNested {
+            impl class Another
+        }
+    }
+
+    impl inner class InnerClass
+
+    impl companion object
+}
+
+impl class OuterClassWithNamedCompanion {
+    impl companion object Factory
+}
+
+impl object OuterObject {
+    impl object NestedObject
+}

compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.txt

@@ -0,0 +1,142 @@
+// -- Module: <m1-common> --
+package
+
+public final header class OuterClass {
+    public constructor OuterClass()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public header companion object Companion {
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public final header inner class InnerClass {
+        public constructor InnerClass()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public final header class NestedClass {
+        public constructor NestedClass()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final header class DeepNested {
+            public constructor DeepNested()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+            public final header class Another {
+                public constructor Another()
+                public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+                public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+            }
+        }
+    }
+}
+
+public final header class OuterClassWithNamedCompanion {
+    public constructor OuterClassWithNamedCompanion()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public header companion object Factory {
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public header object OuterObject {
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public header object NestedObject {
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+
+// -- Module: <m2-jvm> --
+package
+
+public final impl class OuterClass {
+    public constructor OuterClass()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public impl companion object Companion {
+        private constructor Companion()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public final impl inner class InnerClass {
+        public constructor InnerClass()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public final impl class NestedClass {
+        public constructor NestedClass()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final impl class DeepNested {
+            public constructor DeepNested()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+            public final impl class Another {
+                public constructor Another()
+                public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+                public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+                public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+            }
+        }
+    }
+}
+
+public final impl class OuterClassWithNamedCompanion {
+    public constructor OuterClassWithNamedCompanion()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public impl companion object Factory {
+        private constructor Factory()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public impl object OuterObject {
+    private constructor OuterObject()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public impl object NestedObject {
+        private constructor NestedObject()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}

compiler/testData/multiplatform/implTypeAlias/generic/output.txt

@@ -5,7 +5,7 @@ Output:
 -- JVM --
 Exit code: OK
 Output:
-compiler/testData/multiplatform/implementClassWithTypeAlias/jvm.kt:3:13: warning: parameter 'a' is never used
+compiler/testData/multiplatform/implTypeAlias/generic/jvm.kt:3:13: warning: parameter 'a' is never used
     fun foo(a: A): List<A>? = null
             ^
 

compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/common.kt

@@ -0,0 +1,3 @@
+header class ByTypeAlias {
+    header interface Nested
+}

compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/jvm.kt

@@ -0,0 +1,5 @@
+class ByTypeAliasImpl {
+    interface Nested
+}
+
+impl typealias ByTypeAlias = ByTypeAliasImpl

compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/output.txt

@@ -0,0 +1,10 @@
+-- Common --
+Exit code: OK
+Output:
+
+-- JVM --
+Exit code: COMPILATION_ERROR
+Output:
+compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/common.kt:2:22: error: header declaration 'Nested' has no implementation in module
+    header interface Nested
+                     ^

compiler/testData/multiplatform/incompatibleNestedClasses/common.kt

@@ -0,0 +1,19 @@
+header class O1 {
+    header class N1
+    header interface N2
+    header object N3
+}
+
+header class O2 {
+    header class N2
+    header inner class I2
+}
+
+header class O3 {
+    header object Companion
+    header companion object Factory
+}
+
+header class O4 {
+    header companion object
+}

compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt

@@ -0,0 +1,19 @@
+impl class O1 {
+    impl interface N1
+    impl object N2
+    impl class N3
+}
+
+impl class O2 {
+    impl inner class N2
+    impl class I2
+}
+
+impl class O3 {
+    impl companion object {}
+    impl object Factory
+}
+
+impl class O4 {
+    impl object Companion
+}

compiler/testData/multiplatform/incompatibleNestedClasses/output.txt

@@ -0,0 +1,80 @@
+-- Common --
+Exit code: OK
+Output:
+
+-- JVM --
+Exit code: COMPILATION_ERROR
+Output:
+compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:2:18: error: header declaration 'N1' has no implementation in module
+The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation):
+    public impl interface N1
+
+    header class N1
+                 ^
+compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:3:22: error: header declaration 'N2' has no implementation in module
+The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation):
+    public impl object N2
+
+    header interface N2
+                     ^
+compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:4:12: error: header declaration 'N3' has no implementation in module
+The following declaration is incompatible because class kinds are different (class, interface, object, enum, annotation):
+    public final impl class N3
+
+    header object N3
+           ^
+compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:8:18: error: header declaration 'N2' has no implementation in module
+The following declaration is incompatible because modifiers are different (companion, inner):
+    public final impl inner class N2
+
+    header class N2
+                 ^
+compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:9:24: error: header declaration 'I2' has no implementation in module
+The following declaration is incompatible because modifiers are different (companion, inner):
+    public final impl class I2
+
+    header inner class I2
+                       ^
+compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:13:12: error: header declaration 'Companion' has no implementation in module
+The following declaration is incompatible because modifiers are different (companion, inner):
+    public impl companion object
+
+    header object Companion
+           ^
+compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:14:22: error: header declaration 'Factory' has no implementation in module
+The following declaration is incompatible because modifiers are different (companion, inner):
+    public impl object Factory
+
+    header companion object Factory
+                     ^
+compiler/testData/multiplatform/incompatibleNestedClasses/common.kt:18:22: error: header declaration 'Companion' has no implementation in module
+The following declaration is incompatible because modifiers are different (companion, inner):
+    public impl object Companion
+
+    header companion object
+                     ^
+compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:2:5: error: modifier 'impl' is only applicable to members that are initially declared in platform-independent code
+    impl interface N1
+    ^
+compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:3:5: error: modifier 'impl' is only applicable to members that are initially declared in platform-independent code
+    impl object N2
+    ^
+compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:4:5: error: modifier 'impl' is only applicable to members that are initially declared in platform-independent code
+    impl class N3
+    ^
+compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:8:5: error: modifier 'impl' is only applicable to members that are initially declared in platform-independent code
+    impl inner class N2
+    ^
+compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:9:5: error: modifier 'impl' is only applicable to members that are initially declared in platform-independent code
+    impl class I2
+    ^
+compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:13:5: error: modifier 'impl' is only applicable to members that are initially declared in platform-independent code
+    impl companion object {}
+    ^
+compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:14:5: error: modifier 'impl' is only applicable to members that are initially declared in platform-independent code
+    impl object Factory
+    ^
+compiler/testData/multiplatform/incompatibleNestedClasses/jvm.kt:18:5: error: modifier 'impl' is only applicable to members that are initially declared in platform-independent code
+    impl object Companion
+    ^
+