From c071ac854e3ed92def9b0e68382269aafaa0c438 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 16 Oct 2014 21:09:32 +0400
Subject: [PATCH] Prohibit all modifiers for enum entries

 #KT-2679 Fixed
---
 .../jet/lang/resolve/ModifiersChecker.java    |  32 +-
 .../tests/enum/modifiersOnEnumEntry.kt        |  23 ++
 .../tests/enum/modifiersOnEnumEntry.txt       | 337 ++++++++++++++++++
 .../checkers/JetDiagnosticsTestGenerated.java |   6 +
 4 files changed, 385 insertions(+), 13 deletions(-)
 create mode 100644 compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.kt
 create mode 100644 compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java
index e73875667df..d33171a4e40 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java
@@ -28,11 +28,13 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.constants.*;
+import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
+import org.jetbrains.jet.lang.resolve.constants.StringValue;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lexer.JetModifierKeywordToken;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -66,11 +68,11 @@ public class ModifiersChecker {
     @NotNull
     private final BindingTrace trace;
     @NotNull
-    private AdditionalCheckerProvider additionalCheckerProvider;
+    private final AdditionalCheckerProvider additionalCheckerProvider;
 
-    public ModifiersChecker(@NotNull BindingTrace trace, @NotNull AdditionalCheckerProvider provider) {
+    public ModifiersChecker(@NotNull BindingTrace trace, @NotNull AdditionalCheckerProvider additionalCheckerProvider) {
         this.trace = trace;
-        additionalCheckerProvider = provider;
+        this.additionalCheckerProvider = additionalCheckerProvider;
     }
 
     public static ModifiersChecker create(@NotNull BindingTrace trace, @NotNull AdditionalCheckerProvider provider) {
@@ -78,10 +80,14 @@ public class ModifiersChecker {
     }
 
     public void checkModifiersForDeclaration(@NotNull JetDeclaration modifierListOwner, @NotNull MemberDescriptor descriptor) {
-        JetModifierList modifierList = modifierListOwner.getModifierList();
-        checkModalityModifiers(modifierList);
-        checkVisibilityModifiers(modifierListOwner, descriptor);
-        checkInnerModifier(modifierListOwner, descriptor);
+        if (modifierListOwner instanceof JetEnumEntry) {
+            checkIllegalInThisContextModifiers(modifierListOwner, Arrays.asList(MODIFIER_KEYWORDS_ARRAY));
+        }
+        else {
+            checkInnerModifier(modifierListOwner, descriptor);
+            checkModalityModifiers(modifierListOwner.getModifierList());
+            checkVisibilityModifiers(modifierListOwner, descriptor);
+        }
         checkPlatformNameApplicability(descriptor);
         runAnnotationCheckers(modifierListOwner, descriptor);
     }
@@ -94,11 +100,11 @@ public class ModifiersChecker {
     }
 
     public void checkIllegalModalityModifiers(@NotNull JetModifierListOwner modifierListOwner) {
-        checkIllegalInThisContextModifiers(modifierListOwner.getModifierList(), MODALITY_MODIFIERS);
+        checkIllegalInThisContextModifiers(modifierListOwner, MODALITY_MODIFIERS);
     }
 
     public void checkIllegalVisibilityModifiers(@NotNull JetModifierListOwner modifierListOwner) {
-        checkIllegalInThisContextModifiers(modifierListOwner.getModifierList(), VISIBILITY_MODIFIERS);
+        checkIllegalInThisContextModifiers(modifierListOwner, VISIBILITY_MODIFIERS);
     }
 
     private void checkModalityModifiers(@Nullable JetModifierList modifierList) {
@@ -126,7 +132,7 @@ public class ModifiersChecker {
     private void checkInnerModifier(@NotNull JetModifierListOwner modifierListOwner, @NotNull DeclarationDescriptor descriptor) {
         if (modifierListOwner.hasModifier(INNER_KEYWORD)) {
             if (isIllegalInner(descriptor)) {
-                checkIllegalInThisContextModifiers(modifierListOwner.getModifierList(), Collections.singletonList(INNER_KEYWORD));
+                checkIllegalInThisContextModifiers(modifierListOwner, Collections.singletonList(INNER_KEYWORD));
             }
             return;
         }
@@ -221,10 +227,10 @@ public class ModifiersChecker {
     }
 
     public void checkIllegalInThisContextModifiers(
-            @Nullable JetModifierList modifierList,
+            @NotNull JetModifierListOwner modifierListOwner,
             @NotNull Collection<JetModifierKeywordToken> illegalModifiers
     ) {
-        reportIllegalModifiers(modifierList, illegalModifiers, trace);
+        reportIllegalModifiers(modifierListOwner.getModifierList(), illegalModifiers, trace);
     }
 
     @NotNull
diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.kt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.kt
new file mode 100644
index 00000000000..21fa319bc1a
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.kt
@@ -0,0 +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!>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!>reified<!> REIFIED
+}
diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
new file mode 100644
index 00000000000..6b8d82c5451
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.txt
@@ -0,0 +1,337 @@
+package 
+
+internal final enum class E : kotlin.Enum<E> {
+    private constructor E()
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+    public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    
+    public abstract enum entry ABSTRACT : E {
+        private constructor ABSTRACT()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-ABSTRACT> : E.ABSTRACT {
+            private constructor <class-object-for-ABSTRACT>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry ANNOTATION : E {
+        private constructor ANNOTATION()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-ANNOTATION> : E.ANNOTATION {
+            private constructor <class-object-for-ANNOTATION>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry ENUM : E {
+        private constructor ENUM()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-ENUM> : E.ENUM {
+            private constructor <class-object-for-ENUM>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry FINAL : E {
+        private constructor FINAL()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-FINAL> : E.FINAL {
+            private constructor <class-object-for-FINAL>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry IN : E {
+        private constructor IN()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-IN> : E.IN {
+            private constructor <class-object-for-IN>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry INNER : E {
+        private constructor INNER()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-INNER> : E.INNER {
+            private constructor <class-object-for-INNER>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    internal enum entry INTERNAL : E {
+        private constructor INTERNAL()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-INTERNAL> : E.INTERNAL {
+            private constructor <class-object-for-INTERNAL>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public open enum entry OPEN : E {
+        private constructor OPEN()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-OPEN> : E.OPEN {
+            private constructor <class-object-for-OPEN>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry OUT : E {
+        private constructor OUT()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-OUT> : E.OUT {
+            private constructor <class-object-for-OUT>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public open enum entry OVERRIDE : E {
+        private constructor OVERRIDE()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-OVERRIDE> : E.OVERRIDE {
+            private constructor <class-object-for-OVERRIDE>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    private enum entry PRIVATE : E {
+        private constructor PRIVATE()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-PRIVATE> : E.PRIVATE {
+            private constructor <class-object-for-PRIVATE>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    protected enum entry PROTECTED : E {
+        private constructor PROTECTED()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-PROTECTED> : E.PROTECTED {
+            private constructor <class-object-for-PROTECTED>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry PUBLIC : E {
+        private constructor PUBLIC()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-PUBLIC> : E.PUBLIC {
+            private constructor <class-object-for-PUBLIC>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry REIFIED : E {
+        private constructor REIFIED()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-REIFIED> : E.REIFIED {
+            private constructor <class-object-for-REIFIED>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    public enum entry SUBCLASS : E {
+        private constructor SUBCLASS()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        internal final fun foo(): kotlin.Unit
+        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 class object <class-object-for-SUBCLASS> : E.SUBCLASS {
+            private constructor <class-object-for-SUBCLASS>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            internal final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
+            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 VARARG : E {
+        private constructor VARARG()
+        public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+        public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        
+        public class object <class-object-for-VARARG> : E.VARARG {
+            private constructor <class-object-for-VARARG>()
+            public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: E): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
+            public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+    
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): E
+    public final /*synthesized*/ fun values(): kotlin.Array<E>
+}
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index e614c46666c..87b27c4aaa9 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -3907,6 +3907,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 doTest(fileName);
             }
             
+            @TestMetadata("modifiersOnEnumEntry.kt")
+            public void testModifiersOnEnumEntry() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.kt");
+                doTest(fileName);
+            }
+            
             @TestMetadata("openMemberInEnum.kt")
             public void testOpenMemberInEnum() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/openMemberInEnum.kt");