diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt index 05c5f30f0df..97cd7fe0e5c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt @@ -219,7 +219,7 @@ class AnnotationChecker(private val additionalCheckers: Iterable checkIfProperty(annotated, annotation) - AnnotationUseSiteTarget.PROPERTY -> checkIfProperty(annotated, annotation) - AnnotationUseSiteTarget.PROPERTY_GETTER -> checkIfProperty(annotated, annotation) + AnnotationUseSiteTarget.FIELD, + AnnotationUseSiteTarget.PROPERTY, + AnnotationUseSiteTarget.PROPERTY_GETTER -> {} AnnotationUseSiteTarget.PROPERTY_SETTER -> checkIfMutableProperty(annotated, annotation) AnnotationUseSiteTarget.CONSTRUCTOR_PARAMETER -> { if (annotated !is KtParameter) { diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt index 33cfb759000..b3dd4eea75a 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt @@ -6,10 +6,10 @@ class CustomDelegate { operator fun getValue(thisRef: Any?, prop: KProperty<*>): String = prop.name } -@field:Ann +@field:Ann class SomeClass { - @field:Ann + @field:Ann constructor() @field:Ann @@ -25,9 +25,9 @@ class SomeClass { val propertyWithCustomGetter: Int get() = 5 - @field:Ann - fun anotherFun(@field:Ann s: String) { - @field:Ann + @field:Ann + fun anotherFun(@field:Ann s: String) { + @field:Ann val localVariable = 5 } diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.kt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.kt index d1147446d0b..5fceaa5dc2b 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.kt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.kt @@ -6,10 +6,10 @@ class CustomDelegate { operator fun getValue(thisRef: Any?, prop: KProperty<*>): String = prop.name } -@get:Ann +@get:Ann class SomeClass { - @get:Ann + @get:Ann constructor() @get:Ann @@ -28,11 +28,11 @@ class SomeClass { val propertyWithCustomGetter: Int get() = 5 - @get:Ann + @get:Ann fun annotationOnFunction(a: Int) = a + 5 fun anotherFun() { - @get:Ann + @get:Ann val localVariable = 5 } diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt index 03f7d2a6fc7..3599af8db54 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt @@ -7,10 +7,10 @@ class CustomDelegate { operator fun getValue(thisRef: Any?, prop: KProperty<*>): String = prop.name } -@property:Ann +@property:Ann class SomeClass { - @property:Ann + @property:Ann constructor(s: String) @property:Ann @@ -30,9 +30,9 @@ class SomeClass { get() = 5 set(v) {} - @property:Ann + @property:Ann fun anotherFun() { - @property:Ann + @property:Ann val localVariable = 5 }