Drop old enum syntax. Comma / semicolon are now a syntactic part of enum entry.

Comma must present now between enum entries, semicolon between last entry & first member, constructor calls must be without colons / specifiers.
A swarm of tests fixed accordingly.

compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-//KT-1193 Check enum entry supertype
+//KT-1193 Check enum entry supertype / initialization
 
 package kt1193
 
@@ -9,8 +9,5 @@ enum class MyEnum(val i: Int) {
 }
 
 open class A(x: Int = 1)
-enum class MyOtherEnum(val i: Int) {
-    X : <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!><!ENUM_ENTRY_ILLEGAL_TYPE!>A<!>(3)<!>,
-    Y : <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!><!ENUM_ENTRY_ILLEGAL_TYPE!>A<!>()<!>,
-    Z : <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!><!ENUM_ENTRY_ILLEGAL_TYPE!>A<!>(3)<!> {}
-}
+
+val x: MyEnum = MyEnum.A

compiler/testData/diagnostics/tests/declarationChecks/kt1193.txt

@@ -1,6 +1,7 @@
 package
 
 package kt1193 {
+    internal val x: kt1193.MyEnum
 
     internal open class A {
         public constructor A(/*0*/ x: kotlin.Int = ...)
@@ -45,40 +46,4 @@ package kt1193 {
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1193.MyEnum
         public final /*synthesized*/ fun values(): kotlin.Array<kt1193.MyEnum>
     }
-
-    internal final enum class MyOtherEnum : kotlin.Enum<kt1193.MyOtherEnum> {
-        public enum entry X : kt1193.A {
-            private constructor X()
-            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 enum entry Y : kt1193.A {
-            private constructor Y()
-            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 enum entry Z : kt1193.A {
-            private constructor Z()
-            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
-        }
-
-        private constructor MyOtherEnum(/*0*/ i: kotlin.Int)
-        internal final val i: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: kt1193.MyOtherEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        // Static members
-        public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): kt1193.MyOtherEnum
-        public final /*synthesized*/ fun values(): kotlin.Array<kt1193.MyOtherEnum>
-    }
 }

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

@@ -2,6 +2,7 @@ package abstract
 
 
 enum class MyEnum() {
+    <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>INSTANCE<!>;
     //properties
     <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val a: Int<!>
     val a1: Int = 1

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

@@ -3,6 +3,45 @@ package
 package abstract {
 
     internal final enum class MyEnum : kotlin.Enum<abstract.MyEnum> {
+        public enum entry INSTANCE : abstract.MyEnum {
+            private constructor INSTANCE()
+            internal final override /*1*/ /*fake_override*/ val a: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ val a1: kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ val a2: kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ val a3: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var b: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var b1: kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ var b2: kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ var b3: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var c: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var c1: kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ var c2: kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ var c3: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ val e: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ val e1: kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ val e2: kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ val e3: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var i: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var i1: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var j: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var j1: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var k: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var k1: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var l: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var l1: kotlin.Int
+            internal final override /*1*/ /*fake_override*/ var n: kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: abstract.MyEnum): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            internal final override /*1*/ /*fake_override*/ fun f(): kotlin.Unit
+            internal final override /*1*/ /*fake_override*/ fun g(): kotlin.Unit
+            internal abstract override /*1*/ /*fake_override*/ fun h(): kotlin.Unit
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            internal abstract override /*1*/ /*fake_override*/ fun j(): kotlin.Unit
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+
         private constructor MyEnum()
         internal final val a: kotlin.Int
         internal final val a1: kotlin.Int = 1

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

@@ -1,10 +0,0 @@
-// KT-7753: attempt to call enum constructor explicitly
-enum class A(val c: Int) {
-    // No errors at both places, but warnings about deprecated
-    ONE: <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>A(1)<!>,
-    TWO: <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>A(2)<!>;
-    
-    fun getA(): A {
-        return ONE
-    }
-}

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

@@ -1,41 +0,0 @@
-package
-
-internal final enum class A : kotlin.Enum<A> {
-    public enum entry ONE : A {
-        private constructor ONE()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun getA(): A
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry TWO : A {
-        private constructor TWO()
-        internal final override /*1*/ /*fake_override*/ val c: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun getA(): A
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor A(/*0*/ c: kotlin.Int)
-    internal final val c: kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: A): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal final fun getA(): A
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): A
-    public final /*synthesized*/ fun values(): kotlin.Array<A>
-}

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

@@ -1,6 +0,0 @@
-enum class MyEnum {
-    A,
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>B<!>,
- 
-    val z = 42
-}

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

@@ -1,38 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        internal final override /*1*/ /*fake_override*/ val z: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry B : MyEnum {
-        private constructor B()
-        internal final override /*1*/ /*fake_override*/ val z: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum()
-    internal final val z: kotlin.Int = 42
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,10 +0,0 @@
-enum class MyEnum {
-    // Should be comma instead of semicolon
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>A<!><!SYNTAX!>;<!>
-    B,
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>C<!><!SYNTAX!>;<!>
-    // Semicolon missed, comma is optional
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>D<!>,
-
-    fun foo() = 0
-}

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

@@ -1,60 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry B : MyEnum {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry C : MyEnum {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry D : MyEnum {
-        private constructor D()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal final fun foo(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,9 +0,0 @@
-enum class MixedEnum {
-    companion object {
-        val first = 1
-    }
-    fun foo(): String = "xyz"
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER, ENUM_ENTRY_AFTER_ENUM_MEMBER!>ENTRY1<!>
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>ENTRY2<!>
-    ENTRY3
-}

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

@@ -1,57 +0,0 @@
-package
-
-internal final enum class MixedEnum : kotlin.Enum<MixedEnum> {
-    public enum entry ENTRY1 : MixedEnum {
-        private constructor ENTRY1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ENTRY2 : MixedEnum {
-        private constructor ENTRY2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ENTRY3 : MixedEnum {
-        private constructor ENTRY3()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MixedEnum()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal final fun foo(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object Companion {
-        private constructor Companion()
-        internal final val first: kotlin.Int = 1
-        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): MixedEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MixedEnum>
-}

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

@@ -1,3 +0,0 @@
-enum class MyEnum {
-    A, B, <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>C<!> D, <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>E<!> F
-}

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

@@ -1,75 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry B : MyEnum {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry C : MyEnum {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry D : MyEnum {
-        private constructor D()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry E : MyEnum {
-        private constructor E()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry F : MyEnum {
-        private constructor F()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,9 +0,0 @@
-enum class MixedEnum {
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>ENTRY1<!>
-    companion object {
-        val first = 1
-    }
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER, ENUM_ENTRY_AFTER_ENUM_MEMBER!>ENTRY2<!>
-    fun foo(): String = "xyz"
-    <!ENUM_ENTRY_AFTER_ENUM_MEMBER!>ENTRY3<!>
-}

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

@@ -1,57 +0,0 @@
-package
-
-internal final enum class MixedEnum : kotlin.Enum<MixedEnum> {
-    public enum entry ENTRY1 : MixedEnum {
-        private constructor ENTRY1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ENTRY2 : MixedEnum {
-        private constructor ENTRY2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ENTRY3 : MixedEnum {
-        private constructor ENTRY3()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MixedEnum()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal final fun foo(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object Companion {
-        private constructor Companion()
-        internal final val first: kotlin.Int = 1
-        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): MixedEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MixedEnum>
-}

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

@@ -1,9 +0,0 @@
-enum class MixedEnum {
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>ENTRY1<!>,
-    companion object {
-        val first = 1
-    }
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER, ENUM_ENTRY_AFTER_ENUM_MEMBER!>ENTRY2<!>,
-    fun foo(): String = "xyz"
-    <!ENUM_ENTRY_AFTER_ENUM_MEMBER!>ENTRY3<!>
-}

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

@@ -1,57 +0,0 @@
-package
-
-internal final enum class MixedEnum : kotlin.Enum<MixedEnum> {
-    public enum entry ENTRY1 : MixedEnum {
-        private constructor ENTRY1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ENTRY2 : MixedEnum {
-        private constructor ENTRY2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ENTRY3 : MixedEnum {
-        private constructor ENTRY3()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MixedEnum()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal final fun foo(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object Companion {
-        private constructor Companion()
-        internal final val first: kotlin.Int = 1
-        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): MixedEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MixedEnum>
-}

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

@@ -1,9 +0,0 @@
-enum class MixedEnum {
-    ENTRY1;
-    companion object {
-        val first = 1
-    }
-    <!ENUM_ENTRY_AFTER_ENUM_MEMBER!>ENTRY2<!>;
-    fun foo(): String = "xyz"
-    <!ENUM_ENTRY_AFTER_ENUM_MEMBER!>ENTRY3<!>
-}

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

@@ -1,57 +0,0 @@
-package
-
-internal final enum class MixedEnum : kotlin.Enum<MixedEnum> {
-    public enum entry ENTRY1 : MixedEnum {
-        private constructor ENTRY1()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ENTRY2 : MixedEnum {
-        private constructor ENTRY2()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ENTRY3 : MixedEnum {
-        private constructor ENTRY3()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MixedEnum()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MixedEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal final fun foo(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object Companion {
-        private constructor Companion()
-        internal final val first: kotlin.Int = 1
-        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): MixedEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MixedEnum>
-}

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

@@ -1,4 +0,0 @@
-enum class MyEnum {
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>A<!>
-    B
-}

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

@@ -1,35 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry B : MyEnum {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,6 +0,0 @@
-enum class MyEnum {
-    A,
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>B<!>
- 
-    val z = 42
-}

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

@@ -1,38 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        internal final override /*1*/ /*fake_override*/ val z: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry B : MyEnum {
-        private constructor B()
-        internal final override /*1*/ /*fake_override*/ val z: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum()
-    internal final val z: kotlin.Int = 42
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,6 +0,0 @@
-enum class MyEnum(val myArg: Int) {
-    FIRST(1),
-    SECOND: <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>MyEnum(2)<!>,
-    THIRD(3),
-    FOURTH(4)
-}

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

@@ -1,60 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry FIRST : MyEnum {
-        private constructor FIRST()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry SECOND : MyEnum {
-        private constructor SECOND()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry THIRD : MyEnum {
-        private constructor THIRD()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry FOURTH : MyEnum {
-        private constructor FOURTH()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum(/*0*/ myArg: kotlin.Int)
-    internal final val myArg: kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,6 +0,0 @@
-enum class MyEnum(val myArg: Int) {
-    FIRST(1),
-    SECOND: <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>MyEnum(myArg = 2)<!>,
-    THIRD(3),
-    FOURTH(4)
-}

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

@@ -1,60 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry FIRST : MyEnum {
-        private constructor FIRST()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry SECOND : MyEnum {
-        private constructor SECOND()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry THIRD : MyEnum {
-        private constructor THIRD()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry FOURTH : MyEnum {
-        private constructor FOURTH()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum(/*0*/ myArg: kotlin.Int)
-    internal final val myArg: kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,6 +0,0 @@
-enum class MyEnum(val myArg: Int) {
-    FIRST: <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>MyEnum(1)<!>,
-    SECOND: <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>MyEnum(2)<!>,
-    THIRD: <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>MyEnum(3)<!>,
-    FOURTH: <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>MyEnum(4)<!>
-}

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

@@ -1,60 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry FIRST : MyEnum {
-        private constructor FIRST()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry SECOND : MyEnum {
-        private constructor SECOND()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry THIRD : MyEnum {
-        private constructor THIRD()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry FOURTH : MyEnum {
-        private constructor FOURTH()
-        internal final override /*1*/ /*fake_override*/ val myArg: kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum(/*0*/ myArg: kotlin.Int)
-    internal final val myArg: kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,8 +0,0 @@
-enum class MyEnum {
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>A<!><!SYNTAX!>;<!>
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>B<!><!SYNTAX!>;<!>
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>C<!><!SYNTAX!>;<!>
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>D<!>
-
-    fun foo() = 0
-}

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

@@ -1,60 +0,0 @@
-package
-
-internal final enum class MyEnum : kotlin.Enum<MyEnum> {
-    public enum entry A : MyEnum {
-        private constructor A()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry B : MyEnum {
-        private constructor B()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry C : MyEnum {
-        private constructor C()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry D : MyEnum {
-        private constructor D()
-        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    private constructor MyEnum()
-    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: MyEnum): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    internal final fun foo(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    // Static members
-    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): MyEnum
-    public final /*synthesized*/ fun values(): kotlin.Array<MyEnum>
-}

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

@@ -1,6 +1,6 @@
 <!WRONG_MODIFIER_TARGET!>enum<!> interface Some {
     // Enum part
-    <!ABSTRACT_MEMBER_NOT_IMPLEMENTED, ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>D<!>
+    <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>D<!>;
 
     // Interface like part
     fun test()

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

@@ -14,7 +14,7 @@ enum class E {
     <!WRONG_MODIFIER_TARGET!>final<!> FINAL,
 
     <!WRONG_MODIFIER_TARGET!>inner<!> INNER,
-    <!ENUM_ENTRY_USES_DEPRECATED_OR_NO_DELIMITER!>annotation<!> ANNOTATION,
+    <!WRONG_ANNOTATION_TARGET!>@annotation<!> ANNOTATION,
     <!WRONG_MODIFIER_TARGET!>enum<!> ENUM,
     <!WRONG_MODIFIER_TARGET!>out<!> OUT,
     <!WRONG_MODIFIER_TARGET!>in<!> IN,

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

@@ -102,17 +102,7 @@ internal final enum class E : kotlin.Enum<E> {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    public enum entry annotation : E {
-        private constructor annotation()
-        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
-        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public enum entry ANNOTATION : E {
+    kotlin.annotation.annotation() public enum entry ANNOTATION : E {
         private constructor ANNOTATION()
         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

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

@@ -3,5 +3,5 @@
 package bug
 
 public enum class Foo<!TYPE_PARAMETERS_IN_ENUM!><T><!> {
-    A : <!ENUM_ENTRY_USES_DEPRECATED_SUPER_CONSTRUCTOR!>Foo<String>()<!>
+    <!NO_GENERICS_IN_SUPERTYPE_SPECIFIER!>A<!><!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><!>()
 }

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

@@ -3,14 +3,8 @@ package
 package bug {
 
     public final enum class Foo</*0*/ T> : kotlin.Enum<bug.Foo<T>> {
-        public enum entry A : bug.Foo<kotlin.String> {
+        public enum entry A {
             private constructor A()
-            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: bug.Foo<kotlin.String>): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
-            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
         private constructor Foo</*0*/ T>()

compiler/testData/diagnostics/tests/regressions/ea69735.kt

@@ -1,5 +1,5 @@
 enum class MyEnum {
     // Here we have a problem 
     // while checking on a deprecated super constructor
-    FIRST:
-<!SYNTAX!><!>}
+    FIRST<!SYNTAX!><!SYNTAX!><!>:<!>
+}