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/psi/CommentsBinding.kt

@@ -57,9 +57,9 @@ public fun foo() {
 } // end
 
 enum class E {
-    A // this is A
-    /** This is B */ B
-    /* And this is C */ C
+    A, // this is A
+    /** This is B */ B,
+    /* And this is C */ C,
     /** This is X */
     X {
         override fun toString() = "X"

compiler/testData/psi/CommentsBinding.txt

@@ -352,6 +352,7 @@ JetFile: CommentsBinding.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('A')
+        PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         PsiComment(EOL_COMMENT)('// this is A')
       PsiWhiteSpace('\n    ')
@@ -364,12 +365,14 @@ JetFile: CommentsBinding.kt
         PsiWhiteSpace(' ')
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('B')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         PsiComment(BLOCK_COMMENT)('/* And this is C */')
         PsiWhiteSpace(' ')
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('C')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         KDoc

compiler/testData/psi/DefaultKeyword.kt

@@ -44,7 +44,7 @@ interface A {
 }
 
 enum class D {
-    A B
+    A, B;
 
     companion object
 }
@@ -68,15 +68,15 @@ val t = companion object {
 }
 
 enum class I {
-    A
-    B
+    A,
+    B;
 
     companion object
 }
 
 enum class I {
-    A
-    B
+    A,
+    B;
 
     companion object {}
 }

compiler/testData/psi/DefaultKeyword.txt

@@ -219,10 +219,12 @@ JetFile: DefaultKeyword.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('A')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace(' ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('B')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n\n    ')
       OBJECT_DECLARATION
         MODIFIER_LIST
@@ -326,10 +328,12 @@ JetFile: DefaultKeyword.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('A')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('B')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n\n    ')
       OBJECT_DECLARATION
         MODIFIER_LIST
@@ -353,10 +357,12 @@ JetFile: DefaultKeyword.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('A')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('B')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n\n    ')
       OBJECT_DECLARATION
         MODIFIER_LIST

compiler/testData/psi/EnumCommas.txt

@@ -17,23 +17,23 @@ JetFile: EnumCommas.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('NORTH')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('SOUTH')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('WEST')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('EAST')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n    ')
-      PsiElement(SEMICOLON)(';')
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace('\n    ')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n')
       PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntryCommaAnnotatedMember.kt

@@ -0,0 +1,5 @@
+enum class My {
+    FIRST,
+
+    @inline fun foo() {}
+}

compiler/testData/psi/EnumEntryCommaAnnotatedMember.txt

@@ -0,0 +1,45 @@
+JetFile: EnumEntryCommaAnnotatedMember.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+        PsiElement(COMMA)(',')
+      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
+        <empty list>
+      PsiWhiteSpace('\n\n    ')
+      FUN
+        MODIFIER_LIST
+          ANNOTATION_ENTRY
+            PsiElement(AT)('@')
+            CONSTRUCTOR_CALLEE
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('inline')
+        PsiWhiteSpace(' ')
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        BLOCK
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntryCommaInlineMember.kt

@@ -0,0 +1,5 @@
+enum class My {
+    FIRST,
+
+    inline fun foo() {}
+}

compiler/testData/psi/EnumEntryCommaInlineMember.txt

@@ -0,0 +1,40 @@
+JetFile: EnumEntryCommaInlineMember.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+        PsiElement(COMMA)(',')
+      PsiWhiteSpace('\n\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('inline')
+      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
+        <empty list>
+      PsiWhiteSpace(' ')
+      FUN
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        BLOCK
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntryCommaMember.kt

@@ -0,0 +1,5 @@
+enum class My {
+    FIRST,
+
+    fun foo() {}
+}

compiler/testData/psi/EnumEntryCommaMember.txt

@@ -0,0 +1,36 @@
+JetFile: EnumEntryCommaMember.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+        PsiElement(COMMA)(',')
+      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
+        <empty list>
+      PsiWhiteSpace('\n\n    ')
+      FUN
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        BLOCK
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntryCommaPublicMember.kt

@@ -0,0 +1,5 @@
+enum class My {
+    FIRST,
+
+    public fun foo() {}
+}

compiler/testData/psi/EnumEntryCommaPublicMember.txt

@@ -0,0 +1,39 @@
+JetFile: EnumEntryCommaPublicMember.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+        PsiElement(COMMA)(',')
+      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
+        <empty list>
+      PsiWhiteSpace('\n\n    ')
+      FUN
+        MODIFIER_LIST
+          PsiElement(public)('public')
+        PsiWhiteSpace(' ')
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        BLOCK
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntrySemicolonInlineMember.kt

@@ -0,0 +1,5 @@
+enum class My {
+    FIRST;
+
+    inline fun foo() {}
+}

compiler/testData/psi/EnumEntrySemicolonInlineMember.txt

@@ -0,0 +1,42 @@
+JetFile: EnumEntrySemicolonInlineMember.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n\n    ')
+      FUN
+        MODIFIER_LIST
+          ANNOTATION_ENTRY
+            CONSTRUCTOR_CALLEE
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('inline')
+        PsiWhiteSpace(' ')
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        BLOCK
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntrySemicolonMember.kt

@@ -0,0 +1,5 @@
+enum class My {
+    FIRST;
+
+    fun foo() {}
+}

compiler/testData/psi/EnumEntrySemicolonMember.txt

@@ -0,0 +1,34 @@
+JetFile: EnumEntrySemicolonMember.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n\n    ')
+      FUN
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        BLOCK
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntrySpaceInlineMember.kt

@@ -0,0 +1,5 @@
+enum class My {
+    FIRST
+
+    inline fun foo() {}
+}

compiler/testData/psi/EnumEntrySpaceInlineMember.txt

@@ -0,0 +1,43 @@
+JetFile: EnumEntrySpaceInlineMember.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
+        <empty list>
+      PsiWhiteSpace('\n\n    ')
+      FUN
+        MODIFIER_LIST
+          ANNOTATION_ENTRY
+            CONSTRUCTOR_CALLEE
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('inline')
+        PsiWhiteSpace(' ')
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        BLOCK
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntrySpaceMember.kt

@@ -0,0 +1,5 @@
+enum class My {
+    FIRST
+
+    fun foo() {}
+}

compiler/testData/psi/EnumEntrySpaceMember.txt

@@ -0,0 +1,35 @@
+JetFile: EnumEntrySpaceMember.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
+        <empty list>
+      PsiWhiteSpace('\n\n    ')
+      FUN
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        BLOCK
+          PsiElement(LBRACE)('{')
+          PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumEntryTwoCommas.kt

@@ -0,0 +1,3 @@
+enum class My {
+    FIRST,,
+}

compiler/testData/psi/EnumEntryTwoCommas.txt

@@ -0,0 +1,26 @@
+JetFile: EnumEntryTwoCommas.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+        PsiElement(COMMA)(',')
+      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
+        <empty list>
+      PsiErrorElement:Expecting member declaration
+        PsiElement(COMMA)(',')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumIn.kt

@@ -0,0 +1,3 @@
+enum class Foo {
+    `in`
+}

compiler/testData/psi/EnumIn.txt

@@ -0,0 +1,21 @@
+JetFile: EnumIn.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('Foo')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('`in`')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumMissingName.txt

@@ -47,7 +47,7 @@ JetFile: EnumMissingName.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0xFF000')
               PsiElement(RPAR)(')')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
@@ -65,7 +65,7 @@ JetFile: EnumMissingName.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0x00FF00')
               PsiElement(RPAR)(')')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME

compiler/testData/psi/EnumNoAnnotations.kt

@@ -1,11 +0,0 @@
-package a.b.c.test.enum
-
-enum class Enum {
-    // We have six entries in the following line,
-    // not one entry with five annotations
-    A B C D E F {
-        override fun f() = 4
-    }
-
-    open fun f() = 3
-}

compiler/testData/psi/EnumNoAnnotations.txt

@@ -1,102 +0,0 @@
-JetFile: EnumNoAnnotations.kt
-  PACKAGE_DIRECTIVE
-    PsiElement(package)('package')
-    PsiWhiteSpace(' ')
-    DOT_QUALIFIED_EXPRESSION
-      DOT_QUALIFIED_EXPRESSION
-        DOT_QUALIFIED_EXPRESSION
-          DOT_QUALIFIED_EXPRESSION
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
-            PsiElement(DOT)('.')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('b')
-          PsiElement(DOT)('.')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('c')
-        PsiElement(DOT)('.')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('test')
-      PsiElement(DOT)('.')
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('enum')
-  IMPORT_LIST
-    <empty list>
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('Enum')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        PsiComment(EOL_COMMENT)('// We have six entries in the following line,')
-        PsiWhiteSpace('\n    ')
-        PsiComment(EOL_COMMENT)('// not one entry with five annotations')
-        PsiWhiteSpace('\n    ')
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('A')
-      PsiWhiteSpace(' ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('B')
-      PsiWhiteSpace(' ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('C')
-      PsiWhiteSpace(' ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('D')
-      PsiWhiteSpace(' ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('E')
-      PsiWhiteSpace(' ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('F')
-        PsiWhiteSpace(' ')
-        CLASS_BODY
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n        ')
-          FUN
-            MODIFIER_LIST
-              PsiElement(override)('override')
-            PsiWhiteSpace(' ')
-            PsiElement(fun)('fun')
-            PsiWhiteSpace(' ')
-            PsiElement(IDENTIFIER)('f')
-            VALUE_PARAMETER_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-            PsiWhiteSpace(' ')
-            PsiElement(EQ)('=')
-            PsiWhiteSpace(' ')
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('4')
-          PsiWhiteSpace('\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      FUN
-        MODIFIER_LIST
-          PsiElement(open)('open')
-        PsiWhiteSpace(' ')
-        PsiElement(fun)('fun')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('f')
-        VALUE_PARAMETER_LIST
-          PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('3')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumOldConstructorSyntax.kt

@@ -0,0 +1,5 @@
+enum class My(x: Int) {
+    FIRST: My(13)
+
+    val y = x + 1
+}

compiler/testData/psi/EnumOldConstructorSyntax.txt

@@ -0,0 +1,68 @@
+JetFile: EnumOldConstructorSyntax.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  CLASS
+    MODIFIER_LIST
+      PsiElement(enum)('enum')
+    PsiWhiteSpace(' ')
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('My')
+    PRIMARY_CONSTRUCTOR
+      VALUE_PARAMETER_LIST
+        PsiElement(LPAR)('(')
+        VALUE_PARAMETER
+          PsiElement(IDENTIFIER)('x')
+          PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('Int')
+        PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      ENUM_ENTRY
+        OBJECT_DECLARATION_NAME
+          PsiElement(IDENTIFIER)('FIRST')
+      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
+        <empty list>
+      PsiErrorElement:Expecting member declaration
+        PsiElement(COLON)(':')
+      PsiWhiteSpace(' ')
+      PROPERTY
+        MODIFIER_LIST
+          ANNOTATION_ENTRY
+            CONSTRUCTOR_CALLEE
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('My')
+            VALUE_ARGUMENT_LIST
+              PsiElement(LPAR)('(')
+              VALUE_ARGUMENT
+                INTEGER_CONSTANT
+                  PsiElement(INTEGER_LITERAL)('13')
+              PsiElement(RPAR)(')')
+        PsiWhiteSpace('\n\n    ')
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('y')
+        PsiWhiteSpace(' ')
+        PsiElement(EQ)('=')
+        PsiWhiteSpace(' ')
+        BINARY_EXPRESSION
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('x')
+          PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
+            PsiElement(PLUS)('+')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('1')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumSemicolonBetween.kt

@@ -1,6 +0,0 @@
-enum class Color {
-    NORTH;
-    SOUTH;
-    WEST;
-    EAST
-}

compiler/testData/psi/EnumSemicolonBetween.txt

@@ -1,39 +0,0 @@
-JetFile: EnumSemicolonBetween.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('Color')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('NORTH')
-      PsiErrorElement:Expecting ','
-        PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('SOUTH')
-      PsiErrorElement:Expecting ','
-        PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('WEST')
-      PsiErrorElement:Expecting ','
-        PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('EAST')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumSemicolonBetweenWithMembers.kt

@@ -1,10 +0,0 @@
-enum class Color {
-    NORTH;
-    fun foo() = 1
-    SOUTH;
-    companion object {
-        fun bar() = 2
-    }
-    WEST;
-    EAST
-}

compiler/testData/psi/EnumSemicolonBetweenWithMembers.txt

@@ -1,74 +0,0 @@
-JetFile: EnumSemicolonBetweenWithMembers.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('Color')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('NORTH')
-      PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n    ')
-      FUN
-        PsiElement(fun)('fun')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('foo')
-        VALUE_PARAMETER_LIST
-          PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('SOUTH')
-      PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n    ')
-      OBJECT_DECLARATION
-        MODIFIER_LIST
-          PsiElement(companion)('companion')
-        PsiWhiteSpace(' ')
-        PsiElement(object)('object')
-        PsiWhiteSpace(' ')
-        CLASS_BODY
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n        ')
-          FUN
-            PsiElement(fun)('fun')
-            PsiWhiteSpace(' ')
-            PsiElement(IDENTIFIER)('bar')
-            VALUE_PARAMETER_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-            PsiWhiteSpace(' ')
-            PsiElement(EQ)('=')
-            PsiWhiteSpace(' ')
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('2')
-          PsiWhiteSpace('\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('WEST')
-      PsiErrorElement:Expecting ','
-        PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('EAST')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumShortCommas.txt

@@ -45,7 +45,7 @@ JetFile: EnumShortCommas.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0xFF000')
               PsiElement(RPAR)(')')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
@@ -63,7 +63,7 @@ JetFile: EnumShortCommas.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0x00FF00')
               PsiElement(RPAR)(')')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
@@ -81,8 +81,8 @@ JetFile: EnumShortCommas.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0x0000FF')
               PsiElement(RPAR)(')')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n    ')
-      PsiElement(SEMICOLON)(';')
+        PsiElement(COMMA)(',')
+        PsiWhiteSpace('\n    ')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n')
       PsiElement(RBRACE)('}')

compiler/testData/psi/EnumShortNoCommas.kt

@@ -1,7 +0,0 @@
-// NB: this test uses deprecated syntax
-// Delete it when this syntax is no longer supported
-enum class Color(val rgb : Int) {
-    RED(0xFF000)
-    GREEN(0x00FF00)
-    BLUE(0x0000FF)
-}

compiler/testData/psi/EnumShortNoCommas.txt

@@ -1,87 +0,0 @@
-JetFile: EnumShortNoCommas.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiComment(EOL_COMMENT)('// NB: this test uses deprecated syntax')
-    PsiWhiteSpace('\n')
-    PsiComment(EOL_COMMENT)('// Delete it when this syntax is no longer supported')
-    PsiWhiteSpace('\n')
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('Color')
-    PRIMARY_CONSTRUCTOR
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        VALUE_PARAMETER
-          PsiElement(val)('val')
-          PsiWhiteSpace(' ')
-          PsiElement(IDENTIFIER)('rgb')
-          PsiWhiteSpace(' ')
-          PsiElement(COLON)(':')
-          PsiWhiteSpace(' ')
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('Int')
-        PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('RED')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('0xFF000')
-              PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('GREEN')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('0x00FF00')
-              PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('BLUE')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('0x0000FF')
-              PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')

compiler/testData/psi/EnumShortWithOverload.txt

@@ -78,7 +78,7 @@ JetFile: EnumShortWithOverload.kt
               PsiElement(RBRACE)('}')
           PsiWhiteSpace('\n    ')
           PsiElement(RBRACE)('}')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
@@ -129,7 +129,7 @@ JetFile: EnumShortWithOverload.kt
               PsiElement(RBRACE)('}')
           PsiWhiteSpace('\n    ')
           PsiElement(RBRACE)('}')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
@@ -180,7 +180,7 @@ JetFile: EnumShortWithOverload.kt
               PsiElement(RBRACE)('}')
           PsiWhiteSpace('\n    ')
           PsiElement(RBRACE)('}')
-      PsiElement(SEMICOLON)(';')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n    \n    ')
       FUN
         MODIFIER_LIST

compiler/testData/psi/EnumShortWithOverloadNoCommas.kt

@@ -1,13 +0,0 @@
-enum class Color(val rgb : Int) {
-    RED(0xFF000) {
-        override fun foo(): Int { return 1 }
-    }
-    GREEN(0x00FF00) {
-        override fun foo(): Int { return 2 }
-    }
-    BLUE(0x0000FF) {
-        override fun foo(): Int { return 3 }
-    }
-    
-    abstract fun foo(): Int
-}

compiler/testData/psi/EnumShortWithOverloadNoCommas.txt

@@ -1,199 +0,0 @@
-JetFile: EnumShortWithOverloadNoCommas.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('Color')
-    PRIMARY_CONSTRUCTOR
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        VALUE_PARAMETER
-          PsiElement(val)('val')
-          PsiWhiteSpace(' ')
-          PsiElement(IDENTIFIER)('rgb')
-          PsiWhiteSpace(' ')
-          PsiElement(COLON)(':')
-          PsiWhiteSpace(' ')
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('Int')
-        PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('RED')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('0xFF000')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        CLASS_BODY
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n        ')
-          FUN
-            MODIFIER_LIST
-              PsiElement(override)('override')
-            PsiWhiteSpace(' ')
-            PsiElement(fun)('fun')
-            PsiWhiteSpace(' ')
-            PsiElement(IDENTIFIER)('foo')
-            VALUE_PARAMETER_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-            PsiElement(COLON)(':')
-            PsiWhiteSpace(' ')
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('Int')
-            PsiWhiteSpace(' ')
-            BLOCK
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace(' ')
-              RETURN
-                PsiElement(return)('return')
-                PsiWhiteSpace(' ')
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('1')
-              PsiWhiteSpace(' ')
-              PsiElement(RBRACE)('}')
-          PsiWhiteSpace('\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('GREEN')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('0x00FF00')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        CLASS_BODY
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n        ')
-          FUN
-            MODIFIER_LIST
-              PsiElement(override)('override')
-            PsiWhiteSpace(' ')
-            PsiElement(fun)('fun')
-            PsiWhiteSpace(' ')
-            PsiElement(IDENTIFIER)('foo')
-            VALUE_PARAMETER_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-            PsiElement(COLON)(':')
-            PsiWhiteSpace(' ')
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('Int')
-            PsiWhiteSpace(' ')
-            BLOCK
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace(' ')
-              RETURN
-                PsiElement(return)('return')
-                PsiWhiteSpace(' ')
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('2')
-              PsiWhiteSpace(' ')
-              PsiElement(RBRACE)('}')
-          PsiWhiteSpace('\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('BLUE')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('0x0000FF')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        CLASS_BODY
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n        ')
-          FUN
-            MODIFIER_LIST
-              PsiElement(override)('override')
-            PsiWhiteSpace(' ')
-            PsiElement(fun)('fun')
-            PsiWhiteSpace(' ')
-            PsiElement(IDENTIFIER)('foo')
-            VALUE_PARAMETER_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-            PsiElement(COLON)(':')
-            PsiWhiteSpace(' ')
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('Int')
-            PsiWhiteSpace(' ')
-            BLOCK
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace(' ')
-              RETURN
-                PsiElement(return)('return')
-                PsiWhiteSpace(' ')
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('3')
-              PsiWhiteSpace(' ')
-              PsiElement(RBRACE)('}')
-          PsiWhiteSpace('\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n    \n    ')
-      FUN
-        MODIFIER_LIST
-          PsiElement(abstract)('abstract')
-        PsiWhiteSpace(' ')
-        PsiElement(fun)('fun')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('foo')
-        VALUE_PARAMETER_LIST
-          PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')

compiler/testData/psi/Enums.kt

@@ -1,5 +1,7 @@
 enum class Color(val rgb : Int) {
-    RED : Color(0xFF000)
-    GREEN : Color(0x00FF00)
-    BLUE : Color(0x0000FF)
+    RED(0xFF000),
+    GREEN(0x00FF00),
+    BLUE(0x0000FF)
+
+    // the end
 }

compiler/testData/psi/Enums.txt

@@ -32,61 +32,56 @@ JetFile: Enums.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('RED')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Color')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0xFF000')
               PsiElement(RPAR)(')')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('GREEN')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Color')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0x00FF00')
               PsiElement(RPAR)(')')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('BLUE')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Color')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0x0000FF')
               PsiElement(RPAR)(')')
+      PsiWhiteSpace('\n\n    ')
+      PsiComment(EOL_COMMENT)('// the end')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/SimpleModifiers.kt

@@ -2,7 +2,6 @@ package foo.bar.goo
 
 abstract
 open
-enum
 open
 annotation
 override

compiler/testData/psi/SimpleModifiers.txt

@@ -21,8 +21,6 @@ JetFile: SimpleModifiers.kt
       PsiWhiteSpace('\n')
       PsiElement(open)('open')
       PsiWhiteSpace('\n')
-      PsiElement(enum)('enum')
-      PsiWhiteSpace('\n')
       PsiElement(open)('open')
       PsiWhiteSpace('\n')
       ANNOTATION_ENTRY

compiler/testData/psi/SoftKeywords.kt

@@ -5,7 +5,6 @@ import foo
 public protected private internal
 abstract
 open
-enum
 open
 annotation
 override

compiler/testData/psi/SoftKeywords.txt

@@ -34,8 +34,6 @@ JetFile: SoftKeywords.kt
       PsiWhiteSpace('\n')
       PsiElement(open)('open')
       PsiWhiteSpace('\n')
-      PsiElement(enum)('enum')
-      PsiWhiteSpace('\n')
       PsiElement(open)('open')
       PsiWhiteSpace('\n')
       ANNOTATION_ENTRY

compiler/testData/psi/annotation/at/enumEntries.kt

@@ -1,13 +1,14 @@
 enum class A {
-    @[Ann] @Ann(1) X : A()
+    @[Ann] @Ann(1) X(),
 
-    @Ann Y : A() {}
+    @Ann Y() {},
 
-    private @Ann() Z : A()
+    private @Ann() Z(),
 
-    @Ann @private Q
+    @Ann @private Q,
 
-    Ann() W
+    // TODO: try to make Ann() working here (?)
+    @Ann() W;
 
     @Ann fun foo() {}
 }

compiler/testData/psi/annotation/at/enumEntries.txt

@@ -43,19 +43,17 @@ JetFile: enumEntries.kt
         PsiWhiteSpace(' ')
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('X')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('A')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n\n    ')
       ENUM_ENTRY
         MODIFIER_LIST
@@ -69,16 +67,13 @@ JetFile: enumEntries.kt
         PsiWhiteSpace(' ')
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('Y')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('A')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
@@ -86,6 +81,7 @@ JetFile: enumEntries.kt
         CLASS_BODY
           PsiElement(LBRACE)('{')
           PsiElement(RBRACE)('}')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n\n    ')
       ENUM_ENTRY
         MODIFIER_LIST
@@ -104,19 +100,17 @@ JetFile: enumEntries.kt
         PsiWhiteSpace(' ')
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('Z')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('A')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n\n    ')
       ENUM_ENTRY
         MODIFIER_LIST
@@ -132,24 +126,26 @@ JetFile: enumEntries.kt
         PsiWhiteSpace(' ')
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('Q')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n\n    ')
       ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('Ann')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
+        PsiComment(EOL_COMMENT)('// TODO: try to make Ann() working here (?)')
+        PsiWhiteSpace('\n    ')
+        MODIFIER_LIST
+          ANNOTATION_ENTRY
+            PsiElement(AT)('@')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('Ann')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      ENUM_ENTRY
+        PsiWhiteSpace(' ')
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('W')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n\n    ')
       FUN
         MODIFIER_LIST

compiler/testData/psi/annotation/options/annotation.txt

@@ -19,7 +19,7 @@ JetFile: annotation.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('CLASSIFIER')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
@@ -41,12 +41,12 @@ JetFile: annotation.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('SOURCE')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('BINARY')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME

compiler/testData/psi/examples/AnonymousObjects.kt

@@ -11,7 +11,7 @@ addMouseListener(object : MouseAdapter() {
 })
 
 enum class GodMessages {
-  TOO_MANY_CLICKS
+  TOO_MANY_CLICKS,
   ONE_MORE_MESSAGE
 }
 

compiler/testData/psi/examples/AnonymousObjects.txt

@@ -139,6 +139,7 @@ JetFile: AnonymousObjects.kt
           ENUM_ENTRY
             OBJECT_DECLARATION_NAME
               PsiElement(IDENTIFIER)('TOO_MANY_CLICKS')
+            PsiElement(COMMA)(',')
           PsiWhiteSpace('\n  ')
           ENUM_ENTRY
             OBJECT_DECLARATION_NAME

compiler/testData/psi/examples/Color.kt

@@ -1,5 +1,5 @@
 enum class Color(val r : Int, val g : Int, val sb : Int) {
-  RED : Color(255, 0, 0)
-  GREEN : Color(0, 255, 0)
-  BLUE : Color(0, 0, 255)
+  RED(255, 0, 0),
+  GREEN(0, 255, 0),
+  BLUE(0, 0, 255)
 }

compiler/testData/psi/examples/Color.txt

@@ -58,16 +58,13 @@ JetFile: Color.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('RED')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Color')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT
@@ -84,20 +81,18 @@ JetFile: Color.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0')
               PsiElement(RPAR)(')')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n  ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('GREEN')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Color')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT
@@ -114,20 +109,18 @@ JetFile: Color.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('0')
               PsiElement(RPAR)(')')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n  ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('BLUE')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Color')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT

compiler/testData/psi/examples/util/Comparison.txt

@@ -219,17 +219,17 @@ JetFile: Comparison.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('LS')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace(' ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('EQ')
-      PsiElement(COMMA)(',')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace(' ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('GR')
-      PsiElement(SEMICOLON)(';')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n')
       PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n\n')

compiler/testData/psi/namelessObjectAsEnumMember.kt

@@ -1,7 +1,7 @@
 // test that inner keyword is not parsed as enum entry
 public enum class A {
-    A
-    B
+    A,
+    B;
 
     inner object
 }

compiler/testData/psi/namelessObjectAsEnumMember.txt

@@ -21,10 +21,12 @@ JetFile: namelessObjectAsEnumMember.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('A')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n    ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('B')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n\n    ')
       OBJECT_DECLARATION
         MODIFIER_LIST

compiler/testData/psi/recovery/EnumEntryInitList.kt

@@ -1,45 +0,0 @@
-enum class E1 {
-    FIRST:
-}
-
-enum class E2 {
-    FIRST:
-
-    fun some() {}
-}
-
-enum class E3 {
-    FIRST:
-
-    val some = 1
-}
-
-enum class E4 {
-    FIRST:
-
-    class Other
-}
-
-enum class E5 {
-    FIRST: E5(),
-
-    class Other
-}
-
-enum class E6 {
-    FIRST: E6(),;
-
-    class Other
-}
-
-enum class E7 {
-    FIRST:
-
-    @[Some]
-    SECOND
-}
-
-enum class E8 {
-    FIRST:
-    SECOND
-}

compiler/testData/psi/recovery/EnumEntryInitList.txt

@@ -1,255 +0,0 @@
-JetFile: EnumEntryInitList.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('E1')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('FIRST')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace('\n')
-        INITIALIZER_LIST
-          PsiErrorElement:Expecting constructor call (<class-name>(...))
-            <empty list>
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('E2')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('FIRST')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace('\n\n    ')
-        INITIALIZER_LIST
-          PsiErrorElement:Expecting constructor call (<class-name>(...))
-            <empty list>
-      FUN
-        PsiElement(fun)('fun')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('some')
-        VALUE_PARAMETER_LIST
-          PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        BLOCK
-          PsiElement(LBRACE)('{')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('E3')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('FIRST')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace('\n\n    ')
-        INITIALIZER_LIST
-          PsiErrorElement:Expecting constructor call (<class-name>(...))
-            <empty list>
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('some')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('E4')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('FIRST')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace('\n\n    ')
-        INITIALIZER_LIST
-          PsiErrorElement:Expecting constructor call (<class-name>(...))
-            <empty list>
-      CLASS
-        PsiElement(class)('class')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('Other')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('E5')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('FIRST')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('E5')
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n\n    ')
-      CLASS
-        PsiElement(class)('class')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('Other')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('E6')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('FIRST')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('E6')
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-      PsiElement(COMMA)(',')
-      PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n\n    ')
-      CLASS
-        PsiElement(class)('class')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('Other')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('E7')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('FIRST')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace('\n\n    ')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            ANNOTATION
-              PsiElement(AT)('@')
-              PsiElement(LBRACKET)('[')
-              ANNOTATION_ENTRY
-                CONSTRUCTOR_CALLEE
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('Some')
-              PsiElement(RBRACKET)(']')
-            PsiWhiteSpace('\n    ')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('SECOND')
-            PsiWhiteSpace('\n')
-            VALUE_ARGUMENT_LIST
-              PsiErrorElement:Expecting an argument list
-                <empty list>
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('E8')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        OBJECT_DECLARATION_NAME
-          PsiElement(IDENTIFIER)('FIRST')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace('\n    ')
-        INITIALIZER_LIST
-          DELEGATOR_SUPER_CALL
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('SECOND')
-            PsiWhiteSpace('\n')
-            VALUE_ARGUMENT_LIST
-              PsiErrorElement:Expecting an argument list
-                <empty list>
-      PsiElement(RBRACE)('}')

compiler/testData/psi/secondaryConstructors/enumParsing.kt

@@ -1,7 +1,7 @@
 enum class A {
-   abc1 : A(1,2,3)
-   abc2 : A(1,2,3) {}
-   abc3
+   abc1(1,2,3),
+   abc2(1,2,3) {},
+   abc3;
 
    constructor(x: Int) {}
 

compiler/testData/psi/secondaryConstructors/enumParsing.txt

@@ -17,16 +17,13 @@ JetFile: enumParsing.kt
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('abc1')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('A')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT
@@ -41,20 +38,18 @@ JetFile: enumParsing.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('3')
               PsiElement(RPAR)(')')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n   ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('abc2')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
         INITIALIZER_LIST
           DELEGATOR_SUPER_CALL
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('A')
+                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
+                    <empty list>
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT
@@ -73,10 +68,12 @@ JetFile: enumParsing.kt
         CLASS_BODY
           PsiElement(LBRACE)('{')
           PsiElement(RBRACE)('}')
+        PsiElement(COMMA)(',')
       PsiWhiteSpace('\n   ')
       ENUM_ENTRY
         OBJECT_DECLARATION_NAME
           PsiElement(IDENTIFIER)('abc3')
+        PsiElement(SEMICOLON)(';')
       PsiWhiteSpace('\n\n   ')
       SECONDARY_CONSTRUCTOR
         PsiElement(constructor)('constructor')