diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/FirLightAccessorMethodForSymbol.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/FirLightAccessorMethodForSymbol.kt index fd62b21fbb9..a085831d957 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/FirLightAccessorMethodForSymbol.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/FirLightAccessorMethodForSymbol.kt @@ -86,6 +86,7 @@ internal class FirLightAccessorMethodForSymbol( parent = this, nullability = nullabilityType, annotationUseSiteTarget = accessorSite, + includeAnnotationsWithoutSite = false ) val annotationsFromAccessor = propertyAccessorSymbol.computeAnnotations( diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightSetterParameterForSymbol.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightSetterParameterForSymbol.kt index c80bea245ed..65d01f46505 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightSetterParameterForSymbol.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightSetterParameterForSymbol.kt @@ -21,7 +21,7 @@ internal class FirLightSetterParameterForSymbol( ) : FirLightParameterBaseForSymbol(parameterSymbol, containingMethod) { private val _annotations: List by lazyPub { - val annotationsFomSetter = parameterSymbol.computeAnnotations( + val annotationsFromSetter = parameterSymbol.computeAnnotations( parent = this, nullability = NullabilityType.Unknown, annotationUseSiteTarget = null, @@ -34,7 +34,7 @@ internal class FirLightSetterParameterForSymbol( includeAnnotationsWithoutSite = false ) - annotationsFomSetter + annotationsFromProperty + annotationsFromSetter + annotationsFromProperty } override fun getModifierList(): PsiModifierList = _modifierList @@ -51,4 +51,4 @@ internal class FirLightSetterParameterForSymbol( override fun hashCode(): Int = kotlinOrigin.hashCode() override fun isValid(): Boolean = super.isValid() && parameterSymbol.isValid() -} \ No newline at end of file +} diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt b/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt index 9dbb7b87048..42302eac091 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt @@ -10,4 +10,6 @@ class A { @Transient @Volatile var c: String = "" -} \ No newline at end of file +} + +// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt b/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt index 1daee751ed7..727a8c29498 100644 --- a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt +++ b/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt @@ -13,3 +13,5 @@ class A { @JvmSynthetic get @JvmSynthetic set } + +// FIR_COMPARISON