Enum deprecated syntax detection implemented and integrated into DeclarationsChecker.

A lot of tests was changed to refactor deprecated syntax. Six new tests were added to check deprecated syntax detection.
Diagnostic for "enum entry uses deprecated super constructor": constructor is highlighted
Diagnostic for "enum entry uses deprecated or no delimiter".
One warning removed.

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

@@ -2,7 +2,7 @@ enum class E : T {
     ENTRY {
         override fun f() {
         }
-    }
+    };
 
     abstract override fun f()
 }

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

@@ -1,5 +1,5 @@
 enum class E {
-    ENTRY
+    ENTRY;
 
     companion object {
         fun entry() = ENTRY

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

@@ -1,5 +1,5 @@
 enum class E {
-    ENTRY
+    ENTRY;
 
     private companion object
 }

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

@@ -1,8 +1,8 @@
 enum class E {
-    FIRST
+    FIRST,
     SECOND {
         class A
-    }
+    };
 }
 
 val foo: Any.() -> Unit = {}

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

@@ -1,5 +1,5 @@
 enum class E {
-    E1
+    E1,
     E2
 }
 

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

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

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

@@ -0,0 +1,38 @@
+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/enumEntryCannotHaveClassObject.kt

@@ -1,11 +1,11 @@
 enum class E {
-    FIRST
+    FIRST,
 
     SECOND {
         <!COMPANION_OBJECT_NOT_ALLOWED!>companion<!> object {
             fun foo() = 42
         }
-    }
+    };
 }
 
 fun f() = E.SECOND.<!UNRESOLVED_REFERENCE!>foo<!>()

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

@@ -2,11 +2,11 @@ enum class EnumClass {
     E1 {
         override fun foo() = 1
         override val bar: String = "a"
-    }
+    },
 
     <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>E2<!> {
 
-    }
+    };
 
     abstract fun foo(): Int
     abstract val bar: String

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

@@ -5,7 +5,7 @@ interface T1 {
 enum class EnumImplementingTraitWithFun: T1 {
     E1 {
         override fun foo() {}
-    }
+    },
     <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>E2<!>
 }
 
@@ -16,6 +16,6 @@ interface T2 {
 enum class EnumImplementingTraitWithVal: T2 {
     E1 {
         override val bar = 1
-    }
+    },
     <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>E2<!>
 }

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,75 @@
+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/enumNoComma.kt

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

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

@@ -0,0 +1,35 @@
+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

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

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

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,60 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,60 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,60 @@
+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/enumStarImport.kt

@@ -3,7 +3,7 @@
 package enum
 
 enum class HappyEnum {
-    CASE1
+    CASE1,
     CASE2
 }
 

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

@@ -3,7 +3,7 @@ public enum MyJavaEnum {}
 
 // FILE: test.kt
 <!OPEN_MODIFIER_IN_ENUM!>open<!> enum class MyEnum() {
-    A: MyEnum()
+    A()
 }
 
 enum class MyEnum2() {}

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

@@ -1,5 +1,5 @@
 enum class E {
-    ABC
+    ABC;
     
     enum class F {
         DEF

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

@@ -1,5 +1,5 @@
 private enum class MethodKind {
-    INSTANCE
+    INSTANCE,
     STATIC
 }
 

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

@@ -2,7 +2,7 @@
 
 fun foo() {
     <!LOCAL_ENUM_NOT_ALLOWED!>enum class A<!> {
-        FOO
+        FOO,
         BAR
     }
     val foo = A.FOO

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

@@ -1,23 +1,23 @@
 enum class E {
     <!ILLEGAL_MODIFIER!>public<!> <!ILLEGAL_MODIFIER!>final<!> SUBCLASS {
         fun foo() {}
-    }
+    },
 
-    <!ILLEGAL_MODIFIER!>public<!> PUBLIC
-    <!ILLEGAL_MODIFIER!>protected<!> PROTECTED
-    <!ILLEGAL_MODIFIER!>private<!> PRIVATE
-    <!ILLEGAL_MODIFIER!>internal<!> INTERNAL
+    <!ILLEGAL_MODIFIER!>public<!> PUBLIC,
+    <!ILLEGAL_MODIFIER!>protected<!> PROTECTED,
+    <!ILLEGAL_MODIFIER!>private<!> PRIVATE,
+    <!ILLEGAL_MODIFIER!>internal<!> INTERNAL,
 
-    <!ILLEGAL_MODIFIER!>abstract<!> ABSTRACT
-    <!ILLEGAL_MODIFIER!>open<!> OPEN
-    <!ILLEGAL_MODIFIER!>override<!> OVERRIDE
-    <!ILLEGAL_MODIFIER!>final<!> FINAL
+    <!ILLEGAL_MODIFIER!>abstract<!> ABSTRACT,
+    <!ILLEGAL_MODIFIER!>open<!> OPEN,
+    <!ILLEGAL_MODIFIER!>override<!> OVERRIDE,
+    <!ILLEGAL_MODIFIER!>final<!> FINAL,
 
-    <!ILLEGAL_MODIFIER!>inner<!> INNER
-    <!ILLEGAL_MODIFIER!>annotation<!> ANNOTATION
-    <!ILLEGAL_MODIFIER!>enum<!> ENUM
-    <!ILLEGAL_MODIFIER!>out<!> OUT
-    <!ILLEGAL_MODIFIER!>in<!> IN
-    <!ILLEGAL_MODIFIER!>vararg<!> VARARG
+    <!ILLEGAL_MODIFIER!>inner<!> INNER,
+    <!ILLEGAL_MODIFIER!>annotation<!> ANNOTATION,
+    <!ILLEGAL_MODIFIER!>enum<!> ENUM,
+    <!ILLEGAL_MODIFIER!>out<!> OUT,
+    <!ILLEGAL_MODIFIER!>in<!> IN,
+    <!ILLEGAL_MODIFIER!>vararg<!> VARARG,
     <!ILLEGAL_MODIFIER!>reified<!> REIFIED
 }

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

@@ -2,12 +2,12 @@ enum class EnumWithOpenMembers {
     E1 {
         override fun foo() = 1
         override val bar: String = "a"
-    }
+    },
 
     E2 {
         <!OVERRIDING_FINAL_MEMBER!>override<!> fun f() = 3
         <!OVERRIDING_FINAL_MEMBER!>override<!> val b = 4
-    }
+    };
 
     open fun foo() = 1
     open val bar: String = ""

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

@@ -2,8 +2,8 @@
 package foo
 
 enum class E {
-    ENTRY
-    ANOTHER
+    ENTRY,
+    ANOTHER;
 
     class Nested {
         companion object {

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

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

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

@@ -1,5 +1,5 @@
 enum class E {
-    ENTRY
+    ENTRY;
 
     companion object {
         fun foo(): E = ENTRY