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/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt

@@ -1,6 +1,6 @@
 enum class A {
-    ONE
-    TWO
+    ONE,
+    TWO;
 
     fun invoke(i: Int) = i
 }

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt

@@ -1,5 +1,5 @@
 enum class A {
-    ONE
+    ONE,
     TWO
 }
 

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt

@@ -1,8 +1,8 @@
 import A.ONE
 
 enum class A {
-    ONE
-    TWO
+    ONE,
+    TWO;
 
     fun invoke(i: Int) = i
 }

compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt

@@ -1,7 +1,7 @@
 import A.ONE
 
 enum class A {
-    ONE
+    ONE,
     TWO
 }
 

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

@@ -2,7 +2,7 @@ package a
 
 
 enum class C {
-    E1 E2 E3 {
+    E1, E2, E3 {
         object O_O
 
         fun b() {
@@ -10,7 +10,7 @@ enum class C {
         }
 
         class G
-    }
+    },
 
     E4 {
         fun c() {
@@ -22,7 +22,7 @@ enum class C {
             //TODO: this is a bug
             this.<!UNRESOLVED_REFERENCE!>A<!>()
         }
-    }
+    };
 
     class A
     inner class B

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

@@ -71,11 +71,11 @@ fun t1() {
 enum class ProtocolState {
   WAITING {
     override fun signal() = ProtocolState.TALKING
-  }
+  },
 
   TALKING {
     override fun signal() = ProtocolState.WAITING
-  }
+  };
 
   abstract fun signal() : ProtocolState
 }

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

@@ -3,9 +3,9 @@
 package kt1185
 
 enum class Direction {
-    NORTH
-    SOUTH
-    WEST
+    NORTH,
+    SOUTH,
+    WEST,
     EAST
 }
 
@@ -16,9 +16,9 @@ class A {
 }
 
 enum class Color(val rgb : Int) {
-    RED : Color(0xFF0000)
-    GREEN : Color(0x00FF00)
-    BLUE : Color(0x0000FF)
+    RED(0xFF0000),
+    GREEN(0x00FF00),
+    BLUE(0x0000FF)
 }
 
 fun foo(d: Direction) = when(d) { //no 'else' should be requested

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

@@ -4,13 +4,13 @@
 package kt1193
 
 enum class MyEnum(val i: Int) {
-    A : MyEnum(12)
+    A(12),
     <!ENUM_ENTRY_SHOULD_BE_INITIALIZED!>B<!>  //no error
 }
 
 open class A(x: Int = 1)
 enum class MyOtherEnum(val i: Int) {
-    X : <!ENUM_ENTRY_ILLEGAL_TYPE!>A<!>(3)
-    Y : <!ENUM_ENTRY_ILLEGAL_TYPE!>A<!>()
-    Z : <!ENUM_ENTRY_ILLEGAL_TYPE!>A<!>(3) {}
+    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)<!> {}
 }

compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt

@@ -1,6 +1,6 @@
 enum class <!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>A<!> {
-    A1
-    A2
+    A1,
+    A2;
 
     <!CONFLICTING_JVM_DECLARATIONS!>fun valueOf(s: String): A<!> = valueOf(s)
 

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

compiler/testData/diagnostics/tests/imports/StarImportFromObject.kt

@@ -36,7 +36,7 @@ class A {
 }
 
 enum class E {
-    E1 E2
+    E1, E2
 }
 
 object B {

compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.kt

@@ -1,6 +1,6 @@
 enum class E {
-    A
-    B
+    A,
+    B,
     C
 }
 

compiler/testData/diagnostics/tests/inference/regressions/kt3007.kt

@@ -2,7 +2,7 @@
 package a
 
 enum class SomeEnum {
-    FIRST
+    FIRST,
     SECOND
 }
 

compiler/testData/diagnostics/tests/inference/regressions/kt3038.kt

@@ -2,7 +2,7 @@
 package a
 
 enum class TestEnum {
-    FIRST
+    FIRST,
     SECOND
 }
 

compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.kt

@@ -2,8 +2,8 @@ import Kind.EXT_RETURN
 import Kind.GLOBAL_RETURN
 
 enum class Kind {
-    LOCAL
-    EXT_RETURN
+    LOCAL,
+    EXT_RETURN,
     GLOBAL_RETURN
 }
 

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

@@ -1,10 +1,10 @@
 enum class E {
     E1 {
         override fun foo() = outerFun() + super.outerFun()
-    }
+    },
     E2 {
         override fun foo() = E1.foo()
-    }
+    };
     
     abstract fun foo(): Int
     

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

@@ -17,7 +17,7 @@ class D {
 enum class H {
     <!ILLEGAL_MODIFIER!>inner<!> I {
         inner class II
-    }
+    };
     
     inner class J
 }

compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.kt

@@ -1,6 +1,6 @@
 enum class E {
-    E1
-    E2 { }
+    E1,
+    E2 { };
 }
 
 fun foo() = E.E1

compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.kt

@@ -1,7 +1,7 @@
 class A {
     enum class E {
-        E1
-        E2 { }
+        E1,
+        E2 { };
     }
 }
 

compiler/testData/diagnostics/tests/modifiers/defaultModifier.kt

@@ -38,8 +38,8 @@ class J {
 }
 
 <!ILLEGAL_MODIFIER!>companion<!> enum class Enum {
-    E1
-    E2
+    E1,
+    E2;
 
     companion object
 }

compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt

@@ -1,7 +1,7 @@
 enum class E {
-    FIRST
+    FIRST,
 
-    SECOND
+    SECOND;
 
     companion object {
         class FIRST

compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.kt

@@ -11,9 +11,9 @@ object Foo {
 <!CONFLICTING_OVERLOADS!>fun En()<!> = 239
 
 enum class <!CONFLICTING_OVERLOADS!>En<!> {
-    ENTRY
+    ENTRY,
 
-    SUBCLASS { }
+    SUBCLASS { };
 
     fun ENTRY() = 42
 

compiler/testData/diagnostics/tests/redeclarations/kt2418.kt

@@ -3,24 +3,24 @@
 package kt2418
 
 enum class A {
-    <!REDECLARATION!>FOO<!>
+    <!REDECLARATION!>FOO<!>,
     <!REDECLARATION!>FOO<!>
 }
 
 enum class B {
-    FOO
+    FOO;
     
     fun FOO() {}
 }
 
 enum class C {
-    <!REDECLARATION!>FOO<!>
+    <!REDECLARATION!>FOO<!>;
     
     val <!REDECLARATION!>FOO<!> = 1
 }
 
 enum class D {
-    <!REDECLARATION!>FOO<!>
+    <!REDECLARATION!>FOO<!>;
     
     class <!REDECLARATION!>FOO<!> {}
 }

compiler/testData/diagnostics/tests/regressions/Jet183-1.kt

@@ -1,11 +1,11 @@
 enum class ProtocolState {
   WAITING {
     override fun signal() = ProtocolState.TALKING
-  }
+  },
 
   TALKING {
     override fun signal() = ProtocolState.WAITING
-  }
+  };
 
   abstract fun signal() : ProtocolState
 }

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

@@ -1,11 +1,11 @@
 enum class ProtocolState {
   WAITING {
     override fun signal() = ProtocolState.TALKING
-  }
+  },
 
   TALKING {
     override fun signal() = ProtocolState.WAITING
-  }
+  };
 
   abstract fun signal() : ProtocolState
 }

compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt

@@ -4,7 +4,7 @@ import DOMElementTestClasses.cls2
 
 // use case 1
 enum class DOMElementTestClasses {
-    cls1 cls2
+    cls1, cls2;
 
     fun invoke() {}
 }

compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.kt

@@ -4,7 +4,7 @@ object A {
 }
 
 enum class B {
-    X : B() {
+    X() {
         <!SECONDARY_CONSTRUCTOR_IN_OBJECT!>constructor()
  <!>}
 }

compiler/testData/diagnostics/tests/secondaryConstructors/enums.kt

@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 enum class A {
-    W: A(1) X: A(1, 2) Y: A(3.0) Z: A("") E: A()
+    W(1), X(1, 2), Y(3.0), Z(""), E();
 
     constructor()
     constructor(x: Int)
@@ -10,7 +10,7 @@ enum class A {
 }
 
 enum class B(x: Int) {
-    W: B(1) X: B(1, 2) Y: B(3.0) Z: B("")
+    W(1), X(1, 2), Y(3.0), Z("");
 
     constructor(x: Int, y: Int): this(x+y)
     constructor(x: Double): this(x.toInt(), 1)
@@ -18,20 +18,20 @@ enum class B(x: Int) {
 }
 
 enum class C {
-    EMPTY: C() // may be we should avoid explicit call here
+    EMPTY(); // may be we should avoid explicit call here
     constructor()
 }
 
 enum class D(val prop: Int) {
-    X: D(123) {
+    X(123) {
         override fun f() = 1
-    }
-    Y: D() {
+    },
+    Y() {
         override fun f() = prop
-    }
-    Z: D("abc") {
+    },
+    Z("abc") {
         override fun f() = prop
-    }
+    };
 
     constructor(): this(1)
     constructor(x: String): this(x.length())

compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt

@@ -2,7 +2,7 @@
 
 // FILE: 1.kt
 
-enum class E { A B }
+enum class E { A, B }
 
 fun test(e: E?) = <!NO_ELSE_IN_WHEN!>when<!> (e) {
     E.A -> 1

compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.kt

@@ -1,4 +1,4 @@
-enum class E { A B }
+enum class E { A, B }
 
 fun foo(e: E, something: Any?): Int {
     if (something != null) return 0

compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.kt

@@ -22,7 +22,7 @@ class A {
     }
 
     <!NON_TOPLEVEL_CLASS_DECLARATION!>enum class E<!> {
-        X Y
+        X, Y;
 
         companion object {}
     }
@@ -52,7 +52,7 @@ interface T {
     }
 
     <!NON_TOPLEVEL_CLASS_DECLARATION!>enum class E<!> {
-        X Y
+        X, Y;
 
         companion object {}
     }
@@ -61,7 +61,7 @@ interface T {
 }
 
 enum class E {
-    X Y
+    X, Y;
 
     <!NON_TOPLEVEL_CLASS_DECLARATION!>class B<!> {
         <!NON_TOPLEVEL_CLASS_DECLARATION!>class C<!>
@@ -86,7 +86,7 @@ enum class E {
     }
 
     <!NON_TOPLEVEL_CLASS_DECLARATION!>enum class E<!> {
-        X Y
+        X, Y;
 
         companion object {}
     }