Fix language features in tests for gradual migration to 1.3 (part 2)

In 1.3, due to changes in language, testdata for some tests can be
different from 1.2

We want to simlultaneously test both versions, so instead of fixing
language version in such tests, we split them into two: one with fixed
1.2, another with fixed 1.3

compiler/testData/diagnostics/tests/backingField/FieldReassignment_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -RestrictionOfValReassignmentViaBackingField
+
 val my: Int = 1
     get() {
         <!VAL_REASSIGNMENT_VIA_BACKING_FIELD!>field<!>++

compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.kt

@@ -0,0 +1,50 @@
+// !LANGUAGE: +NestedClassesInEnumEntryShouldBeInner
+
+package a
+
+
+enum class C {
+    E1, E2, E3 {
+        <!NESTED_CLASS_NOT_ALLOWED!>object O_O<!>
+
+        fun b() {
+            O_O
+        }
+
+        <!NESTED_CLASS_NOT_ALLOWED!>class G<!>
+    },
+
+    E4 {
+        fun c() {
+            this.B()
+
+            C.A()
+            A()
+            //TODO: should be resolved with error
+            this.<!UNRESOLVED_REFERENCE!>A<!>()
+        }
+    };
+
+    class A
+    inner class B
+    object O {
+        object InO
+    }
+}
+
+fun f() {
+    C.E1.<!UNRESOLVED_REFERENCE!>A<!>
+    C.E1.<!UNRESOLVED_REFERENCE!>A<!>()
+    C.E2.B()
+
+    C.E2.<!UNRESOLVED_REFERENCE!>O<!>
+    C.E3.<!UNRESOLVED_REFERENCE!>O<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>InO<!>
+
+    C.O
+    C.O.InO
+    C.A()
+    C.<!RESOLUTION_TO_CLASSIFIER!>B<!>()
+
+    C.E3.<!UNRESOLVED_REFERENCE!>O_O<!>
+    C.E3.<!UNRESOLVED_REFERENCE!>G<!>()
+}

compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -NestedClassesInEnumEntryShouldBeInner
+
 package a
 
 

compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.txt

@@ -0,0 +1,58 @@
+package
+
+package a {
+    public fun f(): kotlin.Unit
+
+    public final enum class C : kotlin.Enum<a.C> {
+        enum entry E1
+
+        enum entry E2
+
+        enum entry E3
+
+        enum entry E4
+
+        private constructor C()
+        public final override /*1*/ /*fake_override*/ val name: kotlin.String
+        public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+        protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: a.C): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
+        public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<a.C!>!
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final class A {
+            public constructor A()
+            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 inner class B {
+            public constructor B()
+            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 object O {
+            private constructor O()
+            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 object InO {
+                private constructor InO()
+                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
+            }
+        }
+
+        // Static members
+        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): a.C
+        public final /*synthesized*/ fun values(): kotlin.Array<a.C>
+    }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter_after.kt

@@ -0,0 +1,23 @@
+// !LANGUAGE: +RestrictionOfValReassignmentViaBackingField
+
+package a
+
+import java.util.HashSet
+
+val a: MutableSet<String>? = null
+    get() {
+        if (a == null) {
+            <!VAL_REASSIGNMENT_VIA_BACKING_FIELD_ERROR!>field<!> = HashSet()
+        }
+        return a
+    }
+
+class R {
+    val b: String? = null
+        get() {
+            if (b == null) {
+                <!VAL_REASSIGNMENT_VIA_BACKING_FIELD_ERROR!>field<!> = "b"
+            }
+            return b
+        }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -RestrictionOfValReassignmentViaBackingField
+
 package a
 
 import java.util.HashSet
@@ -19,4 +21,3 @@ class R {
             return b
         }
 }
-

compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter_before.txt

@@ -0,0 +1,13 @@
+package
+
+package a {
+    public val a: kotlin.collections.MutableSet<kotlin.String>? = null
+
+    public final class R {
+        public constructor R()
+        public final val b: kotlin.String? = null
+        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/controlFlowAnalysis/initializationInLocalViaExplicitThis_after.kt

@@ -0,0 +1,18 @@
+// !LANGUAGE: +ReadDeserializedContracts +UseCallsInPlaceEffect
+// See KT-17479
+
+class Test {
+    val str: String
+    init {
+        run {
+            this@Test.str = "A"
+        }
+
+        run {
+            // Not sure do we need diagnostic also here
+            <!VAL_REASSIGNMENT!>this@Test.str<!> = "B"
+        }
+
+        str = "C"
+    }
+}

compiler/testData/diagnostics/tests/controlFlowAnalysis/initializationInLocalViaExplicitThis_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -ReadDeserializedContracts -UseCallsInPlaceEffect
 // See KT-17479
 
 class Test {

compiler/testData/diagnostics/tests/controlFlowAnalysis/initializationInLocalViaExplicitThis_before.txt

@@ -0,0 +1,9 @@
+package
+
+public final class Test {
+    public constructor Test()
+    public final val str: kotlin.String
+    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/cyclicHierarchy/withCompanion/everythingInOneScope_after.kt

@@ -0,0 +1,15 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// see https://youtrack.jetbrains.com/issue/KT-21515
+
+open class Container {
+    open class <!CYCLIC_SCOPES_WITH_COMPANION!>Base<!> {
+        open fun m() {}
+    }
+
+    // note that Base() supertype will be resolved in scope that was created on recursion
+    abstract class <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : Base()
+
+    companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract() {
+        override fun m() {}
+    }
+}

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.txt

@@ -0,0 +1,32 @@
+package
+
+public open class Container {
+    public constructor Container()
+    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 open class Base {
+        public constructor Base()
+        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 fun m(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public companion object Companion : Container.DerivedAbstract {
+        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*/ fun m(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public abstract class DerivedAbstract : Container.Base {
+        public constructor DerivedAbstract()
+        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 m(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // see https://youtrack.jetbrains.com/issue/KT-21515
 
 open class Container {

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.kt

@@ -0,0 +1,15 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// see https://youtrack.jetbrains.com/issue/KT-21515
+
+abstract class <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : C.Base() {
+    open class Data
+}
+
+public class C {
+
+    open class <!CYCLIC_SCOPES_WITH_COMPANION!>Base<!> ()
+
+    class Foo : <!UNRESOLVED_REFERENCE!>Data<!>()
+
+    companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract()
+}

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.txt

@@ -0,0 +1,43 @@
+package
+
+public final class C {
+    public constructor C()
+    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 open class Base {
+        public constructor Base()
+        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 companion object Companion : DerivedAbstract {
+        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 class Foo {
+        public constructor Foo()
+        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 abstract class DerivedAbstract : C.Base {
+    public constructor DerivedAbstract()
+    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 open class Data {
+        public constructor Data()
+        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/cyclicHierarchy/withCompanion/noMembers_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // see https://youtrack.jetbrains.com/issue/KT-21515
 
 abstract class <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : C.Base() {

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.kt

@@ -0,0 +1,18 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// see https://youtrack.jetbrains.com/issue/KT-21515
+
+open class Container {
+    // Note that here we also have errors and diagnostics, even though there are actually no loops.
+    // (this is case because we can't know if there are any loops without resolving, but resolving
+    // itself provokes loops)
+
+    interface <!CYCLIC_SCOPES_WITH_COMPANION!>Base<!> {
+        open fun m() {}
+    }
+
+    interface <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : Base
+
+    companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract {
+        override fun m() {}
+    }
+}

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.txt

@@ -0,0 +1,30 @@
+package
+
+public open class Container {
+    public constructor Container()
+    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 interface Base {
+        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 fun m(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public companion object Companion : Container.DerivedAbstract {
+        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*/ fun m(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public interface DerivedAbstract : Container.Base {
+        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 m(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // see https://youtrack.jetbrains.com/issue/KT-21515
 
 open class Container {

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.kt

@@ -0,0 +1,20 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// see https://youtrack.jetbrains.com/issue/KT-21515
+
+interface SomeIrrelevantInterface
+
+// note that C.Base() supertype will be resolved in normal scope
+abstract class <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : C.Base()
+
+class Data
+
+public class C {
+
+    val data: Data = Data()
+
+    // Note that any supertype of Base will be resolved in error-scope, even if it absolutely irrelevant
+    // to the types in cycle.
+    open class <!CYCLIC_SCOPES_WITH_COMPANION!>Base<!>() : SomeIrrelevantInterface
+
+    companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract()
+}

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.txt

@@ -0,0 +1,43 @@
+package
+
+public final class C {
+    public constructor C()
+    public final val data: Data
+    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 open class Base : SomeIrrelevantInterface {
+        public constructor Base()
+        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 companion object Companion : DerivedAbstract {
+        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 class Data {
+    public constructor Data()
+    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 abstract class DerivedAbstract : C.Base {
+    public constructor DerivedAbstract()
+    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 interface SomeIrrelevantInterface {
+    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/cyclicHierarchy/withCompanion/withIrrelevantInterface_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // see https://youtrack.jetbrains.com/issue/KT-21515
 
 interface SomeIrrelevantInterface

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.kt

@@ -0,0 +1,58 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// see https://youtrack.jetbrains.com/issue/KT-21515
+
+object WithFunctionInBase {
+    abstract class <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : C.Base()
+
+    class Data
+
+    public class C {
+        val data: Data = Data()
+
+        open class <!CYCLIC_SCOPES_WITH_COMPANION!>Base<!>() {
+            fun foo(): Int = 42
+        }
+
+        companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract()
+    }
+}
+
+object WithPropertyInBase {
+    // This case is very similar to previous one, but there are subtle differences from POV of implementation
+
+    abstract class <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : C.Base()
+
+    class Data
+
+    public class C {
+
+        open class <!CYCLIC_SCOPES_WITH_COMPANION!>Base<!>() {
+            val foo: Int = 42
+        }
+
+        val data: Data = Data()
+
+        companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract()
+    }
+}
+
+object WithPropertyInBaseDifferentOrder {
+    // This case is very similar to previous one, but there are subtle differences from POV of implementation
+    // Note how position of property in file affected order of resolve, and, consequently, its results and
+    // diagnostics.
+
+    abstract class <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : C.Base()
+
+    class Data
+
+    public class C {
+        val data: Data = Data()
+
+        open class <!CYCLIC_SCOPES_WITH_COMPANION!>Base<!>() {
+            val foo: Int = 42
+
+        }
+
+        companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract()
+    }
+}

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.txt

@@ -0,0 +1,139 @@
+package
+
+public object WithFunctionInBase {
+    private constructor WithFunctionInBase()
+    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 class C {
+        public constructor C()
+        public final val data: WithFunctionInBase.Data
+        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 open class Base {
+            public constructor Base()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final fun foo(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
+        public companion object Companion : WithFunctionInBase.DerivedAbstract {
+            private constructor Companion()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+
+    public final class Data {
+        public constructor Data()
+        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 abstract class DerivedAbstract : WithFunctionInBase.C.Base {
+        public constructor DerivedAbstract()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
+
+public object WithPropertyInBase {
+    private constructor WithPropertyInBase()
+    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 class C {
+        public constructor C()
+        public final val data: WithPropertyInBase.Data
+        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 open class Base {
+            public constructor Base()
+            public final val foo: kotlin.Int = 42
+            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 companion object Companion : WithPropertyInBase.DerivedAbstract {
+            private constructor Companion()
+            public final override /*1*/ /*fake_override*/ val foo: kotlin.Int
+            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 class Data {
+        public constructor Data()
+        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 abstract class DerivedAbstract : WithPropertyInBase.C.Base {
+        public constructor DerivedAbstract()
+        public final override /*1*/ /*fake_override*/ val foo: kotlin.Int
+        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 object WithPropertyInBaseDifferentOrder {
+    private constructor WithPropertyInBaseDifferentOrder()
+    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 class C {
+        public constructor C()
+        public final val data: WithPropertyInBaseDifferentOrder.Data
+        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 open class Base {
+            public constructor Base()
+            public final val foo: kotlin.Int = 42
+            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 companion object Companion : WithPropertyInBaseDifferentOrder.DerivedAbstract {
+            private constructor Companion()
+            public final override /*1*/ /*fake_override*/ val foo: kotlin.Int
+            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 class Data {
+        public constructor Data()
+        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 abstract class DerivedAbstract : WithPropertyInBaseDifferentOrder.C.Base {
+        public constructor DerivedAbstract()
+        public final override /*1*/ /*fake_override*/ val foo: kotlin.Int
+        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/cyclicHierarchy/withCompanion/withMembers_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // see https://youtrack.jetbrains.com/issue/KT-21515
 
 object WithFunctionInBase {

compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.kt

@@ -0,0 +1,16 @@
+// !LANGUAGE: +NestedClassesInEnumEntryShouldBeInner
+
+enum class E {
+    FIRST,
+    SECOND {
+        <!NESTED_CLASS_NOT_ALLOWED!>class A<!>
+    };
+}
+
+val foo: Any.() -> Unit = {}
+
+fun f1() = E.FIRST.foo()
+fun f2() = E.FIRST.(foo)()
+fun f3() = E.SECOND.foo()
+fun f4() = E.SECOND.(foo)()
+fun f5() = E.SECOND.<!UNRESOLVED_REFERENCE!>A<!>()

compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -NestedClassesInEnumEntryShouldBeInner
+
 enum class E {
     FIRST,
     SECOND {

compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt

@@ -0,0 +1,29 @@
+package
+
+public val foo: kotlin.Any.() -> kotlin.Unit
+public fun f1(): kotlin.Unit
+public fun f2(): kotlin.Unit
+public fun f3(): kotlin.Unit
+public fun f4(): kotlin.Unit
+public fun f5(): [ERROR : Error function type]
+
+public final enum class E : kotlin.Enum<E> {
+    enum entry FIRST
+
+    enum entry SECOND
+
+    private constructor E()
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<E!>!
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
+}

compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_after.kt

@@ -0,0 +1,9 @@
+// !LANGUAGE: +NestedClassesInEnumEntryShouldBeInner
+
+enum class E {
+    ABC {
+        <!NESTED_CLASS_NOT_ALLOWED!>enum class F<!> {
+            DEF
+        }
+    }
+}

compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -NestedClassesInEnumEntryShouldBeInner
+
 enum class E {
     ABC {
         <!NESTED_CLASS_DEPRECATED!>enum class F<!> {

compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry_before.txt

@@ -0,0 +1,20 @@
+package
+
+public final enum class E : kotlin.Enum<E> {
+    enum entry ABC
+
+    private constructor E()
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<E!>!
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
+}

compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_after.kt

@@ -0,0 +1,22 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
+open class Outer<E> {
+    inner class Inner<F>
+
+}
+
+class Derived : Outer<String>() {
+    // Inner<Int> here means Outer<String>.Inner<Int>
+    fun foo(x: Inner<Int>) {}
+}
+
+class A {
+    companion object : Outer<String>()
+
+    // Does not work, could be Outer<String>.Inner<Int>
+    // TODO: Should work?
+    fun foo(x: <!UNRESOLVED_REFERENCE!>Inner<!><Int>) {
+        // Inner<Char>() call use companion as implicit receiver
+        val y: Outer<String>.Inner<Char> = Inner<Char>()
+    }
+}

compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_after.txt

@@ -0,0 +1,38 @@
+package
+
+public final class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun foo(/*0*/ x: [ERROR : Inner<Int>]<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public companion object Companion : Outer<kotlin.String> {
+        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 class Derived : Outer<kotlin.String> {
+    public constructor Derived()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun foo(/*0*/ x: Outer<kotlin.String>.Inner<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class Outer</*0*/ E> {
+    public constructor Outer</*0*/ E>()
+    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 inner class Inner</*0*/ F> /*captured type parameters: /*1*/ E*/ {
+        public constructor Inner</*0*/ F>()
+        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/generics/innerClasses/implicitArguments/fromCompanionObject_before.kt

@@ -1,3 +1,4 @@
+// !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 open class Outer<E> {
     inner class Inner<F>

compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_after.kt

@@ -0,0 +1,26 @@
+// !LANGUAGE: +NestedClassesInEnumEntryShouldBeInner
+
+class A {
+    inner class B {
+        <!NESTED_CLASS_NOT_ALLOWED!>class C<!>
+    }
+    
+    fun foo() {
+        class B {
+            <!NESTED_CLASS_NOT_ALLOWED!>class C<!>
+        }
+    }
+}
+
+fun foo() {
+    class B {
+        <!NESTED_CLASS_NOT_ALLOWED!>class C<!>
+    }
+}
+
+
+enum class E {
+    E1 {
+        <!NESTED_CLASS_NOT_ALLOWED!>class D<!>
+    }
+}

compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_before.kt

@@ -1,3 +1,5 @@
+// !LANGUAGE: -NestedClassesInEnumEntryShouldBeInner
+
 class A {
     inner class B {
         <!NESTED_CLASS_NOT_ALLOWED!>class C<!>
@@ -19,7 +21,6 @@ fun foo() {
 
 enum class E {
     E1 {
-        // Not allowed in Java, but no reason to disallow in Kotlin
         <!NESTED_CLASS_DEPRECATED!>class D<!>
     }
 }

compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_before.txt

@@ -0,0 +1,44 @@
+package
+
+public fun foo(): kotlin.Unit
+
+public final class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun foo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    public final inner class B {
+        public constructor B()
+        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 class C {
+            public constructor C()
+            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 enum class E : kotlin.Enum<E> {
+    enum entry E1
+
+    private constructor E()
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<E!>!
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
+}