From e6092e2dffd8012315ad400d6c06ff183324ddf2 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 10 Aug 2022 13:44:11 +0300 Subject: [PATCH] [AA LC] Generate nullability annotations for properties in enums --- .../symbol/methods/SymbolLightAccessorMethod.kt | 2 +- .../lightClasses/DeprecatedEnumEntry.fir.java | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.fir.java diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt index 1cc6e6e0472..2f630df4daa 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt @@ -82,7 +82,7 @@ internal class SymbolLightAccessorMethod( private fun computeAnnotations(isPrivate: Boolean): List { val nullabilityApplicable = isGetter && !isPrivate && - !(isParameter && (containingClass.isAnnotationType || containingClass.isEnum)) + !(isParameter && containingClass.isAnnotationType) val nullabilityType = if (nullabilityApplicable) { getTypeNullability(containingPropertySymbol.returnType) diff --git a/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.fir.java b/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.fir.java deleted file mode 100644 index be2c1259031..00000000000 --- a/compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.fir.java +++ /dev/null @@ -1,14 +0,0 @@ -public enum E /* p.E*/ { - Entry1, - Entry2, - Entry3; - - @org.jetbrains.annotations.NotNull() - public static p.E valueOf(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.lang.IllegalArgumentException;// valueOf(java.lang.String) - - @org.jetbrains.annotations.NotNull() - public static p.E[] values();// values() - - private E();// .ctor() - -}