diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt index f83e961504f..e5e66b9dd5d 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/symbolLightClassUtils.kt @@ -440,7 +440,7 @@ private fun hasBackingField(property: KtPropertySymbol): Boolean { val fieldUseSite = AnnotationUseSiteTarget.FIELD if (property.isExpect || property.modality == Modality.ABSTRACT || - property.isHiddenOrSynthetic(fieldUseSite, fieldUseSite.toOptionalFilter()) + property.hasJvmSyntheticAnnotation(fieldUseSite.toOptionalFilter()) ) return false return hasBackingFieldByPsi ?: property.hasBackingField diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.java index 896314d9a3c..b416352545f 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_accessors.java @@ -5,6 +5,9 @@ public final class Test /* test.pkg.Test*/ { @org.jetbrains.annotations.Nullable() private java.lang.String pOld_accessors_deprecatedOnGetter = null /* initializer type: null */; + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_accessors_deprecatedOnProperty = null /* initializer type: null */; + @org.jetbrains.annotations.Nullable() private java.lang.String pOld_accessors_deprecatedOnSetter = null /* initializer type: null */; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.java index 55903132bb1..41f050df790 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_getter.java @@ -5,6 +5,9 @@ public final class Test /* test.pkg.Test*/ { @org.jetbrains.annotations.Nullable() private java.lang.String pOld_getter_deprecatedOnGetter = null /* initializer type: null */; + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_getter_deprecatedOnProperty = null /* initializer type: null */; + @org.jetbrains.annotations.Nullable() private java.lang.String pOld_getter_deprecatedOnSetter = null /* initializer type: null */; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.java index dcf83bbd173..cd2f38773e0 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_noAccessor.java @@ -5,6 +5,9 @@ public final class Test /* test.pkg.Test*/ { @org.jetbrains.annotations.NotNull() private java.lang.String pOld_noAccessor_deprecatedOnGetter = "42" /* initializer type: java.lang.String */; + @org.jetbrains.annotations.NotNull() + private java.lang.String pOld_noAccessor_deprecatedOnProperty = "42" /* initializer type: java.lang.String */; + @org.jetbrains.annotations.NotNull() private java.lang.String pOld_noAccessor_deprecatedOnSetter = "42" /* initializer type: java.lang.String */; diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.java index 350c9dd1c60..106e98881e2 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/deprecatedHiddenProperty_setter.java @@ -5,6 +5,9 @@ public final class Test /* test.pkg.Test*/ { @org.jetbrains.annotations.Nullable() private java.lang.String pOld_setter_deprecatedOnGetter = null /* initializer type: null */; + @org.jetbrains.annotations.Nullable() + private java.lang.String pOld_setter_deprecatedOnProperty = null /* initializer type: null */; + @org.jetbrains.annotations.Nullable() private java.lang.String pOld_setter_deprecatedOnSetter = null /* initializer type: null */;