More accurate check of repeated use-site annotations #KT-13859 Fixed

compiler/testData/diagnostics/tests/annotations/options/unrepeatable.kt

@@ -10,4 +10,12 @@ annotation class ann(val y: Int)
 
 @ann(0) <!REPEATED_ANNOTATION!>@ann(1)<!> fun foo(@ann(7) <!REPEATED_ANNOTATION!>@ann(2)<!> x: Int): Int {
     @annexpr <!REPEATED_ANNOTATION!>@annexpr<!> return x
-}
+}
+
+@unrepann(0)
+@get:unrepann(1)
+var annotated = 1 // No errors should be here
+
+@unrepann(0)
+<!REPEATED_ANNOTATION!>@property:unrepann(1)<!>
+var annotated2 = 2

compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt

@@ -1,5 +1,7 @@
 package
 
+@unrepann(x = 0) public var annotated: kotlin.Int
+@unrepann(x = 0) @property:unrepann(x = 1) public var annotated2: kotlin.Int
 @ann(y = 0) @ann(y = 1) public fun foo(/*0*/ @ann(y = 7) @ann(y = 2) x: kotlin.Int): kotlin.Int
 
 @unrepann(x = 1) @unrepann(x = 2) public final class DoubleAnnotated {

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.kt

@@ -14,7 +14,7 @@ public class A(@param:Ann <!REPEATED_ANNOTATION!>@Ann<!> val x: Int, @param: Rep
     @field:Ann @property:Ann @RepeatableAnn @property:RepeatableAnn
     val a: Int = 0
 
-    @Ann <!REPEATED_ANNOTATION!>@field:Ann<!> <!REPEATED_ANNOTATION!>@property:Ann<!>
+    @Ann @field:Ann <!REPEATED_ANNOTATION!>@property:Ann<!>
     val b: Int = 0
 
     @field:RepeatableAnn @field:RepeatableAnn
@@ -29,14 +29,31 @@ public class A(@param:Ann <!REPEATED_ANNOTATION!>@Ann<!> val x: Int, @param: Rep
     @property:Ann @delegate:Ann
     val f: String by CustomDelegate()
 
-    // Ideally we should not have repeated anotation here and below
-    // (because @Ann should go to the property and the second annotation to its related field)
-    @Ann <!REPEATED_ANNOTATION!>@delegate:Ann<!>
+    @Ann @delegate:Ann
     val g: String by CustomDelegate()
 
-    @Ann <!REPEATED_ANNOTATION!>@field:Ann<!>
+    @Ann @field:Ann
     val h: String = ""
 
     @property:Ann @field:Ann
     val i: String = ""
+}
+
+@Target(AnnotationTarget.FIELD, AnnotationTarget.PROPERTY)
+annotation class fieldOrPropAnn
+
+@Target(AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.VALUE_PARAMETER)
+annotation class getSetAndParamAnn
+
+public class B(<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:fieldOrPropAnn<!> @fieldOrPropAnn val x: Int,
+               @property:fieldOrPropAnn <!REPEATED_ANNOTATION!>@fieldOrPropAnn<!> val y: Int) {
+    @fieldOrPropAnn @field:fieldOrPropAnn
+    val z: Int = 42
+
+    <!WRONG_ANNOTATION_TARGET!>@getSetAndParamAnn<!>
+    <!REPEATED_ANNOTATION!>@setparam:getSetAndParamAnn<!>
+    var w: Int
+        @getSetAndParamAnn <!REPEATED_ANNOTATION!>@get:getSetAndParamAnn<!> get() = 0
+        // See KT-15470: fake INAPPLICABLE_TARGET_ON_PROPERTY
+        @getSetAndParamAnn <!INAPPLICABLE_TARGET_ON_PROPERTY, REPEATED_ANNOTATION!>@set:getSetAndParamAnn<!> set(arg) {}
 }

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt

@@ -25,6 +25,17 @@ public final annotation class Ann : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
+public final class B {
+    public constructor B(/*0*/ @param:fieldOrPropAnn x: kotlin.Int, /*1*/ y: kotlin.Int)
+    @getSetAndParamAnn @setparam:getSetAndParamAnn public final var w: kotlin.Int
+    @fieldOrPropAnn public final val x: kotlin.Int
+    @property:fieldOrPropAnn @fieldOrPropAnn public final val y: kotlin.Int
+    @fieldOrPropAnn @field:fieldOrPropAnn public final val z: kotlin.Int = 42
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
 public final class CustomDelegate {
     public constructor CustomDelegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -39,3 +50,17 @@ public final class CustomDelegate {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD, AnnotationTarget.PROPERTY}) public final annotation class fieldOrPropAnn : kotlin.Annotation {
+    public constructor fieldOrPropAnn()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.VALUE_PARAMETER}) public final annotation class getSetAndParamAnn : kotlin.Annotation {
+    public constructor getSetAndParamAnn()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}