FIR LC: don't include annotations w/o use-site targets to property accessors

This commit is contained in:
Jinseong Jeon
2021-09-03 00:13:34 -07:00
committed by Ilya Kirillov
parent 5446a8ad10
commit c2964f688e
4 changed files with 9 additions and 4 deletions
@@ -86,6 +86,7 @@ internal class FirLightAccessorMethodForSymbol(
parent = this, parent = this,
nullability = nullabilityType, nullability = nullabilityType,
annotationUseSiteTarget = accessorSite, annotationUseSiteTarget = accessorSite,
includeAnnotationsWithoutSite = false
) )
val annotationsFromAccessor = propertyAccessorSymbol.computeAnnotations( val annotationsFromAccessor = propertyAccessorSymbol.computeAnnotations(
@@ -21,7 +21,7 @@ internal class FirLightSetterParameterForSymbol(
) : FirLightParameterBaseForSymbol(parameterSymbol, containingMethod) { ) : FirLightParameterBaseForSymbol(parameterSymbol, containingMethod) {
private val _annotations: List<PsiAnnotation> by lazyPub { private val _annotations: List<PsiAnnotation> by lazyPub {
val annotationsFomSetter = parameterSymbol.computeAnnotations( val annotationsFromSetter = parameterSymbol.computeAnnotations(
parent = this, parent = this,
nullability = NullabilityType.Unknown, nullability = NullabilityType.Unknown,
annotationUseSiteTarget = null, annotationUseSiteTarget = null,
@@ -34,7 +34,7 @@ internal class FirLightSetterParameterForSymbol(
includeAnnotationsWithoutSite = false includeAnnotationsWithoutSite = false
) )
annotationsFomSetter + annotationsFromProperty annotationsFromSetter + annotationsFromProperty
} }
override fun getModifierList(): PsiModifierList = _modifierList override fun getModifierList(): PsiModifierList = _modifierList
@@ -51,4 +51,4 @@ internal class FirLightSetterParameterForSymbol(
override fun hashCode(): Int = kotlinOrigin.hashCode() override fun hashCode(): Int = kotlinOrigin.hashCode()
override fun isValid(): Boolean = super.isValid() && parameterSymbol.isValid() override fun isValid(): Boolean = super.isValid() && parameterSymbol.isValid()
} }
@@ -10,4 +10,6 @@ class A {
@Transient @Transient
@Volatile @Volatile
var c: String = "" var c: String = ""
} }
// FIR_COMPARISON
@@ -13,3 +13,5 @@ class A {
@JvmSynthetic get @JvmSynthetic get
@JvmSynthetic set @JvmSynthetic set
} }
// FIR_COMPARISON