Revert "FIR/LC: create synthetic members of enum class"

This reverts commit 1b6ded60

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForSymbol.kt

@@ -96,10 +96,8 @@ internal open class FirLightClassForSymbol(
             val declaredMemberScope = classOrObjectSymbol.getDeclaredMemberScope()
 
             val visibleDeclarations = declaredMemberScope.getCallableSymbols().applyIf(isEnum) {
-                // Technically, synthetic members of `enum` class, such as `values` or `valueOf`, are visible.
-                // They're just needed to be added later (to be in a backward-compatible order of members).
                 filterNot { function ->
-                    function is KtFunctionSymbol && function.origin == KtSymbolOrigin.SOURCE_MEMBER_GENERATED &&
+                    function is KtFunctionSymbol &&
                             (function.name == ENUM_VALUES || function.name == ENUM_VALUE_OF)
                 }
             }.applyIf(classOrObjectSymbol.isObject) {
@@ -122,7 +120,6 @@ internal open class FirLightClassForSymbol(
 
         addMethodsFromCompanionIfNeeded(result)
 
-        addMethodsFromEnumClass(result)
         addMethodsFromDataClass(result)
         addDelegatesToInterfaceMethods(result)
 
@@ -140,19 +137,6 @@ internal open class FirLightClassForSymbol(
         }
     }
 
-    private fun addMethodsFromEnumClass(result: MutableList<KtLightMethod>) {
-        if (!isEnum) return
-
-        analyzeWithSymbolAsContext(classOrObjectSymbol) {
-            val valuesAndValueOfFunctions = classOrObjectSymbol.getDeclaredMemberScope()
-                .getCallableSymbols { name -> name == ENUM_VALUES || name == ENUM_VALUE_OF }
-                .filter { it.origin == KtSymbolOrigin.SOURCE_MEMBER_GENERATED }
-                .filterIsInstance<KtFunctionSymbol>()
-
-            createMethods(valuesAndValueOfFunctions, result)
-        }
-    }
-
     private fun addMethodsFromDataClass(result: MutableList<KtLightMethod>) {
         if (!classOrObjectSymbol.isData) return
 

analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightParameterBaseForSymbol.kt

@@ -31,7 +31,7 @@ internal abstract class FirLightParameterBaseForSymbol(
 
     protected val nullabilityType: NullabilityType
         get() {
-            val nullabilityApplicable = !containingMethod.containingClass.let { it.isAnnotationType } &&
+            val nullabilityApplicable = !containingMethod.containingClass.let { it.isAnnotationType || it.isEnum } &&
                     !containingMethod.hasModifierProperty(PsiModifier.PRIVATE)
 
             return if (nullabilityApplicable) {

compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt

@@ -23,8 +23,6 @@ import org.jetbrains.kotlin.backend.common.CodegenUtil
 import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.StandardNames
-import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUES
-import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUE_OF
 import org.jetbrains.kotlin.codegen.JvmCodegenUtil
 import org.jetbrains.kotlin.codegen.kotlinType
 import org.jetbrains.kotlin.config.JvmAnalysisFlags
@@ -47,7 +45,6 @@ import org.jetbrains.kotlin.resolve.annotations.JVM_STATIC_ANNOTATION_FQ_NAME
 import org.jetbrains.kotlin.resolve.annotations.argumentValue
 import org.jetbrains.kotlin.resolve.constants.EnumValue
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
-import org.jetbrains.kotlin.resolve.scopes.findFirstFunction
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.typeUtil.isAnyOrNullableAny
 
@@ -315,7 +312,6 @@ open class KtUltraLightClass(classOrObject: KtClassOrObject, internal val suppor
             }
         }
 
-        addMethodsFromEnumClass(result)
         addMethodsFromDataClass(result)
         addDelegatesToInterfaceMethods(result)
 
@@ -341,29 +337,9 @@ open class KtUltraLightClass(classOrObject: KtClassOrObject, internal val suppor
         }, false
     )
 
-    private fun addMethodsFromEnumClass(result: MutableList<KtLightMethod>) {
-        val ktClass = classOrObject as? KtClass ?: return
-        if (!ktClass.isEnum()) return
-        val descriptor = classOrObject.resolve() as? ClassDescriptor ?: return
-
-        val valuesFunction = descriptor.staticScope.findFirstFunction(ENUM_VALUES.identifier) {
-            it.dispatchReceiverParameter == null &&
-                    it.extensionReceiverParameter == null &&
-                    it.valueParameters.size == 0
-        }
-        result.add(createGeneratedMethodFromDescriptor(valuesFunction, JvmDeclarationOriginKind.SYNTHETIC))
-
-        val valueOfFunction = descriptor.staticScope.findFirstFunction(ENUM_VALUE_OF.identifier) {
-            it.dispatchReceiverParameter == null &&
-                    it.extensionReceiverParameter == null &&
-                    it.valueParameters.size == 1
-        }
-        result.add(createGeneratedMethodFromDescriptor(valueOfFunction, JvmDeclarationOriginKind.SYNTHETIC))
-    }
-
     private fun addMethodsFromDataClass(result: MutableList<KtLightMethod>) {
+        if (!classOrObject.hasModifier(DATA_KEYWORD)) return
         val ktClass = classOrObject as? KtClass ?: return
-        if (!ktClass.isData()) return
         val descriptor = classOrObject.resolve() as? ClassDescriptor ?: return
         val bindingContext = classOrObject.analyze()
 

compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.java

@@ -1,12 +1,6 @@
 public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ {
   A;
 
-  @org.jetbrains.annotations.NotNull()
-  public final test.AnnotatedParameterInEnumConstructor valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final test.AnnotatedParameterInEnumConstructor[] values();//  values()
-
   private  AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String, @test.Anno(x = "b") java.lang.String);//  .ctor(java.lang.String, java.lang.String)
 
-}
+}

compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt

@@ -7,5 +7,4 @@ enum class AnnotatedParameterInEnumConstructor(@Anno("a") a: String, @Anno("b")
     A("1", "b")
 }
 
-// FIR_COMPARISON
+// FIR_COMPARISON
-// SKIP_SANITY_TEST

compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.lib.java

@@ -1,6 +0,0 @@
-public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ {
-  A;
-
-  private  AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String, @test.Anno(x = "b") java.lang.String);//  .ctor(java.lang.String, java.lang.String)
-
-}

compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java

@@ -3,12 +3,6 @@ public enum E /* p.E*/ {
   Entry2,
   Entry3;
 
-  @org.jetbrains.annotations.NotNull()
-  public final p.E valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final p.E[] values();//  values()
-
   private  E();//  .ctor()
 
-}
+}

compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt

@@ -11,5 +11,4 @@ enum class E {
     Entry3
 }
 
-// FIR_COMPARISON
+// FIR_COMPARISON
-// SKIP_SANITY_TEST

compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.lib.java

@@ -1,8 +0,0 @@
-public enum E /* p.E*/ {
-  Entry1,
-  Entry2,
-  Entry3;
-
-  private  E();//  .ctor()
-
-}

compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.java

@@ -1,12 +1,6 @@
 public enum EnumNameOverride /* EnumNameOverride*/ implements Bar {
   ;
 
-  @org.jetbrains.annotations.NotNull()
-  public final EnumNameOverride valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final EnumNameOverride[] values();//  values()
-
   private  EnumNameOverride();//  .ctor()
 
-}
+}

compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.kt

@@ -10,5 +10,4 @@ interface Bar : Foo {
 
 enum class EnumNameOverride : Bar
 
-// FIR_COMPARISON
+// FIR_COMPARISON
-// SKIP_SANITY_TEST

compiler/testData/asJava/ultraLightClasses/enums.fir.java

@@ -4,12 +4,6 @@ public enum Direction /* Direction*/ {
   WEST,
   EAST;
 
-  @org.jetbrains.annotations.NotNull()
-  public final Direction valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final Direction[] values();//  values()
-
   private  Direction();//  .ctor()
 
 }
@@ -21,12 +15,6 @@ public enum Color /* Color*/ {
 
   private final int rgb;
 
-  @org.jetbrains.annotations.NotNull()
-  public final Color valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final Color[] values();//  values()
-
   private  Color(int);//  .ctor(int)
 
   private  Color(java.lang.String);//  .ctor(java.lang.String)
@@ -54,12 +42,6 @@ public enum ProtocolState /* ProtocolState*/ {
   @org.jetbrains.annotations.NotNull()
   public abstract ProtocolState signal();//  signal()
 
-  @org.jetbrains.annotations.NotNull()
-  public final ProtocolState valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final ProtocolState[] values();//  values()
-
   private  ProtocolState();//  .ctor()
 
 }
@@ -97,12 +79,6 @@ public enum IntArithmetics /* IntArithmetics*/ {
   @org.jetbrains.annotations.NotNull()
   public IntArithmetics applyAsInt(int, int);//  applyAsInt(int, int)
 
-  @org.jetbrains.annotations.NotNull()
-  public final IntArithmetics valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final IntArithmetics[] values();//  values()
-
   private  IntArithmetics();//  .ctor()
 
 }

compiler/testData/asJava/ultraLightClasses/enums.java

@@ -4,12 +4,6 @@ public enum Direction /* Direction*/ {
   WEST,
   EAST;
 
-  @org.jetbrains.annotations.NotNull()
-  public final Direction valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final Direction[] values();//  values()
-
   private  Direction();//  .ctor()
 
 }
@@ -21,12 +15,6 @@ public enum Color /* Color*/ {
 
   private final int rgb;
 
-  @org.jetbrains.annotations.NotNull()
-  public final Color valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final Color[] values();//  values()
-
   private  Color(@org.jetbrains.annotations.NotNull() java.lang.String);//  .ctor(java.lang.String)
 
   private  Color(int);//  .ctor(int)
@@ -54,12 +42,6 @@ public enum ProtocolState /* ProtocolState*/ {
   @org.jetbrains.annotations.NotNull()
   public abstract ProtocolState signal();//  signal()
 
-  @org.jetbrains.annotations.NotNull()
-  public final ProtocolState valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final ProtocolState[] values();//  values()
-
   private  ProtocolState();//  .ctor()
 
 
@@ -102,12 +84,6 @@ public enum IntArithmetics /* IntArithmetics*/ implements java.util.function.Bin
 
   };
 
-  @org.jetbrains.annotations.NotNull()
-  public final IntArithmetics valueOf(@org.jetbrains.annotations.NotNull() java.lang.String);//  valueOf(java.lang.String)
-
-  @org.jetbrains.annotations.NotNull()
-  public final IntArithmetics[] values();//  values()
-
   private  IntArithmetics();//  .ctor()
 
   public int applyAsInt(int, int);//  applyAsInt(int, int)