Introduce use-site annotation target checks for FIR

2021-05-18 18:39:08 +03:00
parent 9a13ec9b76
commit 6572010eed
25 changed files with 247 additions and 208 deletions
@@ -1,33 +0,0 @@
-import kotlin.reflect.KProperty
-
-@Target(AnnotationTarget.FIELD) annotation class Field
-
-@Target(AnnotationTarget.PROPERTY) annotation class Prop
-
-class CustomDelegate {
-    operator fun getValue(thisRef: Any?, prop: KProperty<*>): String = prop.name
-}
-
-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Field<!>
-class SomeClass {
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Field<!>
-    constructor()
-
-    @delegate:Field <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Prop<!>
-    protected val simpleProperty: String = "text"
-
-    @delegate:Field <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Prop<!>
-    protected val delegatedProperty: String by CustomDelegate()
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Field<!> <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Prop<!>
-    val propertyWithCustomGetter: Int
-        get() = 5
-
-}
-
-class WithPrimaryConstructor(@delegate:Field <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Prop<!> val a: String,
-                             <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:Field<!> <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:Prop<!> val b: String)
-
-fun foo(<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Field<!> <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@delegate:Prop<!> x: Int) = x
-
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 import kotlin.reflect.KProperty

@Target(AnnotationTarget.FIELD) annotation class Field
@@ -1,36 +0,0 @@
-import kotlin.reflect.KProperty
-
-annotation class Ann
-
-class CustomDelegate {
-    operator fun getValue(thisRef: Any?, prop: KProperty<*>): String = prop.name
-}
-
-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>
-class SomeClass {
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>
-    constructor()
-
-    @field:Ann
-    protected val simpleProperty: String = "text"
-
-    @field:[Ann]
-    protected val simplePropertyWithAnnotationList: String = "text"
-
-    @field:Ann
-    protected val delegatedProperty: String by CustomDelegate()
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>
-    val propertyWithCustomGetter: Int
-        get() = 5
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>
-    fun anotherFun(<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!> s: String) {
-        <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>
-        val localVariable = 5
-    }
-
-}
-
-class WithPrimaryConstructor(@field:Ann val a: String)
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 import kotlin.reflect.KProperty

 annotation class Ann
@@ -1,24 +0,0 @@
-annotation class Ann
-annotation class Second
-
-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:Ann<!>
-class SomeClass {
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:Ann<!>
-    constructor(@param:Ann a: String)
-
-    @param:Ann
-    protected val simpleProperty: String = "text"
-
-    @param:Ann
-    fun anotherFun() {
-        @param:Ann
-        val localVariable = 5
-    }
-
-}
-
-class PrimaryConstructorClass(
-        @param:Ann a: String,
-@param:[Ann Second] b: String,
-@param:Ann val c: String)
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 annotation class Ann
 annotation class Second

@@ -1,25 +0,0 @@
-annotation class Ann
-
-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@receiver:Ann<!>
-class SomeClass {
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@receiver:Ann<!>
-    constructor(@receiver:Ann a: String)
-
-    @receiver:Ann
-    protected val simpleProperty: String = "text"
-
-    @receiver:Ann
-    fun anotherFun() {
-        @receiver:Ann
-        val localVariable = 5
-    }
-
-    val @receiver:Ann String.extensionProperty2: String
-        get() = "A"
-}
-
-fun @receiver:Ann String.length2() = length
-
-val @receiver:Ann String.extensionProperty: String
-    get() = "A"
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 annotation class Ann

 <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@receiver:Ann<!>
@@ -1,38 +0,0 @@
-import kotlin.reflect.KProperty
-
-annotation class Ann
-
-class CustomDelegate {
-    operator fun getValue(thisRef: Any?, prop: KProperty<*>): String = prop.name
-    operator fun setValue(thisRef: Any?, prop: KProperty<*>, value: String) {}
-}
-
-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@set:Ann<!>
-class SomeClass {
-
-    @set:Ann
-    protected val simpleProperty: String = "text"
-
-    @set:Ann
-    protected var mutableProperty: String = "text"
-
-    @set:[Ann]
-    protected var mutablePropertyWithAnnotationList: String = "text"
-
-    @set:Ann
-    protected var delegatedProperty: String by CustomDelegate()
-
-    @set:Ann
-    var propertyWithCustomSetter: Int
-        get() = 5
-        set(v) {}
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@set:Ann<!>
-    fun annotationOnFunction(a: Int) = a + 5
-
-    fun anotherFun() {
-        @set:Ann
-        val localVariable = 5
-    }
-
-}
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 import kotlin.reflect.KProperty

 annotation class Ann
@@ -1,39 +0,0 @@
-import kotlin.reflect.KProperty
-
-annotation class Ann
-
-class CustomDelegate {
-    operator fun getValue(thisRef: Any?, prop: KProperty<*>): String = prop.name
-    operator fun setValue(thisRef: Any?, prop: KProperty<*>, value: String) {}
-}
-
-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@setparam:Ann<!>
-class SomeClass {
-
-    <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@setparam:Ann<!>
-    constructor()
-
-    @setparam:Ann
-    protected val simpleProperty: String = "text"
-
-    @setparam:Ann
-    protected var mutableProperty: String = "text"
-
-    @setparam:[Ann]
-    protected var mutablePropertyWithAnnotationList: String = "text"
-
-    @setparam:Ann
-    protected var delegatedProperty: String by CustomDelegate()
-
-    @setparam:Ann
-    var propertyWithCustomSetter: Int
-        get() = 5
-        set(v) {}
-
-    @setparam:Ann
-    fun anotherFun() {
-        @setparam:Ann
-        val localVariable = 5
-    }
-
-}
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 import kotlin.reflect.KProperty

 annotation class Ann
@@ -1,12 +1,12 @@
 package bar

-<!MUST_BE_INITIALIZED!><!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file:foo<!>
+<!MUST_BE_INITIALIZED!><!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file:foo<!>
 val prop<!>

-@file:[<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>bar<!> <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>baz<!>]
+@file:[<!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>bar<!> <!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>baz<!>]
 fun func() {}

-@file:[<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>baz<!>]
+@file:[<!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>baz<!>]
 class C

 <!SYNTAX!>@file:<!>
@@ -1,6 +1,6 @@
 <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file:foo<!>
@foo @bar
-@file:[<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>baz<!>]
+@file:[<!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>baz<!>]
 fun test() {}

 annotation class foo
@@ -1,6 +1,6 @@
 <!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file:foo<!>
@foo @bar
-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file: baz<!>
+<!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file: baz<!>
 fun test() {}

 annotation class foo
@@ -1,9 +1,9 @@
 // !LANGUAGE: +RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes
 // !DIAGNOSTICS: -UNUSED_PARAMETER

-fun test1(<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file<!SYNTAX!><!> Suppress("")<!> x: Int) {}
+fun test1(<!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file<!SYNTAX!><!> Suppress("")<!> x: Int) {}

-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file <!SYNTAX!>@<!>Suppress("")<!>
+<!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file <!SYNTAX!>@<!>Suppress("")<!>
 fun test2() {}

 class OnType(x: @file<!SYNTAX!><!> Suppress("") Int)
@@ -1,9 +1,9 @@
 // !LANGUAGE: -RestrictionOfWrongAnnotationsWithUseSiteTargetsOnTypes
 // !DIAGNOSTICS: -UNUSED_PARAMETER

-fun test1(<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file<!SYNTAX!><!> Suppress("")<!> x: Int) {}
+fun test1(<!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file<!SYNTAX!><!> Suppress("")<!> x: Int) {}

-<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file <!SYNTAX!>@<!>Suppress("")<!>
+<!INAPPLICABLE_FILE_TARGET, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@file <!SYNTAX!>@<!>Suppress("")<!>
 fun test2() {}

 class OnType(x: @file<!SYNTAX!><!> Suppress("") Int)
@@ -55,5 +55,5 @@ public class B(<!WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@param:fieldOrPro
    var w: Int
        @getSetAndParamAnn @get:getSetAndParamAnn get() = 0
        // See KT-15470: fake INAPPLICABLE_TARGET_ON_PROPERTY
-        @getSetAndParamAnn @set:getSetAndParamAnn set(arg) {}
+        @getSetAndParamAnn <!INAPPLICABLE_TARGET_ON_PROPERTY!>@set:getSetAndParamAnn<!> set(arg) {}
 }