azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR: report WRONG_ANNOTATION_TARGET on types

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-05-18 11:11:28 +03:00
parent 2a33a6927c
commit 9a13ec9b76
45 changed files with 89 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.fir.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
annotation class My
fun foo(arg: Int): Int {
try {
return 1 / (arg - arg)
} catch (e: <!WRONG_ANNOTATION_TARGET!>@My<!> Exception) {
return -1
}
}
compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_IDENTICAL
annotation class My
fun foo(arg: Int): Int {
compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.fir.kt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ fun inParamNested(fn1: (fn2: (@Ann n: Int)->Unit)->Unit) {}
fun inReturn(): (@Ann x: Int)->Unit = {}
class A : (@Ann Int)->Unit {
class A : (<!WRONG_ANNOTATION_TARGET!>@Ann<!> Int)->Unit {
override fun invoke(p1: Int) {
var lambda: (@Ann x: Int)->Unit = {}
}
compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.fir.kt
Vendored
-44
View File
@@ -1,44 +0,0 @@
//!DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.TYPE)
annotation class a
@Target(AnnotationTarget.TYPE)
annotation class b(val i: Int)
annotation class c
fun foo(i: @a Int?) {}
fun foo(l: List<@a Int?>) {}
fun @a Int?.bar() {}
val baz: @a Int? = 1
fun foo1(i: @b(1) Int?) {}
fun foo1(l: List<@b(1) Int?>) {}
fun @b(1) Int?.bar1() {}
val baz1: @b(1) Int? = 1
fun foo2(i: @[a b(1)] Int?) {}
fun foo2(l: List<@[a b(1)] Int?>) {}
fun @[a b(1)] Int?.bar2() {}
val baz2: @[a b(1)] Int? = 1
fun foo3(i: @c Int?) {}
fun foo3(l: List<@c Int?>) {}
fun @c Int?.bar3() {}
val baz3: @c Int? = 1
compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
//!DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.TYPE)
compiler/testData/diagnostics/tests/annotations/options/targets/annotation.fir.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
@Target(AnnotationTarget.ANNOTATION_CLASS) annotation class base
@base annotation class derived
<!WRONG_ANNOTATION_TARGET!>@base<!> class correct(<!WRONG_ANNOTATION_TARGET!>@base<!> val x: Int) {
<!WRONG_ANNOTATION_TARGET!>@base<!> constructor(): this(0)
}
<!WRONG_ANNOTATION_TARGET!>@base<!> enum class My {
<!WRONG_ANNOTATION_TARGET!>@base<!> FIRST,
<!WRONG_ANNOTATION_TARGET!>@base<!> SECOND
}
<!WRONG_ANNOTATION_TARGET!>@base<!> fun foo(<!WRONG_ANNOTATION_TARGET!>@base<!> y: @base Int): Int {
<!WRONG_ANNOTATION_TARGET!>@base<!> fun bar(<!WRONG_ANNOTATION_TARGET!>@base<!> z: @base Int) = z + 1
<!WRONG_ANNOTATION_TARGET!>@base<!> val local = bar(y)
return local
}
<!WRONG_ANNOTATION_TARGET!>@base<!> val z = 0
compiler/testData/diagnostics/tests/annotations/options/targets/annotation.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
@Target(AnnotationTarget.ANNOTATION_CLASS) annotation class base
@base annotation class derived
compiler/testData/diagnostics/tests/annotations/options/targets/classifier.fir.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.CLASS) annotation class base
@base annotation class derived
@base class correct(<!WRONG_ANNOTATION_TARGET!>@base<!> val x: Int, <!WRONG_ANNOTATION_TARGET!>@base<!> w: @base Int) {
<!WRONG_ANNOTATION_TARGET!>@base<!> constructor(): this(0, 0)
}
@base enum class My <!WRONG_ANNOTATION_TARGET!>@base<!> constructor() {
<!WRONG_ANNOTATION_TARGET!>@base<!> FIRST,
<!WRONG_ANNOTATION_TARGET!>@base<!> SECOND
}
<!WRONG_ANNOTATION_TARGET!>@base<!> fun foo(<!WRONG_ANNOTATION_TARGET!>@base<!> y: @base Int): Int {
<!WRONG_ANNOTATION_TARGET!>@base<!> fun bar(<!WRONG_ANNOTATION_TARGET!>@base<!> z: @base Int) = z + 1
<!WRONG_ANNOTATION_TARGET!>@base<!> val local = bar(y)
return local
}
<!WRONG_ANNOTATION_TARGET!>@base<!> val z = 0
compiler/testData/diagnostics/tests/annotations/options/targets/classifier.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.CLASS) annotation class base
compiler/testData/diagnostics/tests/annotations/options/targets/constructor.fir.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
@Target(AnnotationTarget.CONSTRUCTOR) annotation class base
<!WRONG_ANNOTATION_TARGET!>@base<!> annotation class derived
<!WRONG_ANNOTATION_TARGET!>@base<!> class correct(<!WRONG_ANNOTATION_TARGET!>@base<!> val x: Int) {
@base constructor(): this(0)
}
<!WRONG_ANNOTATION_TARGET!>@base<!> enum class My @base constructor() {
<!WRONG_ANNOTATION_TARGET!>@base<!> FIRST,
<!WRONG_ANNOTATION_TARGET!>@base<!> SECOND
}
<!WRONG_ANNOTATION_TARGET!>@base<!> fun foo(<!WRONG_ANNOTATION_TARGET!>@base<!> y: @base Int): Int {
<!WRONG_ANNOTATION_TARGET!>@base<!> fun bar(<!WRONG_ANNOTATION_TARGET!>@base<!> z: @base Int) = z + 1
<!WRONG_ANNOTATION_TARGET!>@base<!> val local = bar(y)
return local
}
<!WRONG_ANNOTATION_TARGET!>@base<!> val z = 0
compiler/testData/diagnostics/tests/annotations/options/targets/constructor.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
@Target(AnnotationTarget.CONSTRUCTOR) annotation class base
<!WRONG_ANNOTATION_TARGET!>@base<!> annotation class derived
compiler/testData/diagnostics/tests/annotations/options/targets/empty.fir.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target() annotation class empty
@empty annotation class derived
@empty class correct(@empty val x: Int, @empty w: @empty Int) {
@empty constructor(): this(0, 0)
}
@empty enum class My @empty constructor() {
@empty FIRST,
@empty SECOND
}
@empty fun foo(@empty y: @empty Int): Int {
@empty fun bar(@empty z: @empty Int) = z + 1
@empty val local = bar(y)
return local
}
@empty val z = <!WRONG_ANNOTATION_TARGET!>@empty<!> 0
compiler/testData/diagnostics/tests/annotations/options/targets/empty.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target() annotation class empty
compiler/testData/diagnostics/tests/annotations/options/targets/function.fir.kt
Vendored
-22
View File
@@ -1,22 +0,0 @@
@Target(AnnotationTarget.FUNCTION) annotation class base
<!WRONG_ANNOTATION_TARGET!>@base<!> annotation class derived
<!WRONG_ANNOTATION_TARGET!>@base<!> class correct(<!WRONG_ANNOTATION_TARGET!>@base<!> val x: Int) {
<!WRONG_ANNOTATION_TARGET!>@base<!> constructor(): this(0)
@base public fun baz() {}
}
<!WRONG_ANNOTATION_TARGET!>@base<!> enum class My <!WRONG_ANNOTATION_TARGET!>@base<!> constructor() {
<!WRONG_ANNOTATION_TARGET!>@base<!> FIRST,
<!WRONG_ANNOTATION_TARGET!>@base<!> SECOND
}
@base fun foo(<!WRONG_ANNOTATION_TARGET!>@base<!> y: @base Int): Int {
@base fun bar(<!WRONG_ANNOTATION_TARGET!>@base<!> z: @base Int) = z + 1
<!WRONG_ANNOTATION_TARGET!>@base<!> val local = bar(y)
return local
}
<!WRONG_ANNOTATION_TARGET!>@base<!> val z = 0
compiler/testData/diagnostics/tests/annotations/options/targets/function.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
@Target(AnnotationTarget.FUNCTION) annotation class base
<!WRONG_ANNOTATION_TARGET!>@base<!> annotation class derived
compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.fir.kt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ annotation class special
@Target(AnnotationTarget.TYPE)
annotation class base
fun transform(i: Int, tr: (@special Int) -> Int): Int = @special tr(@special i)
fun transform(i: Int, tr: (<!WRONG_ANNOTATION_TARGET!>@special<!> Int) -> Int): Int = @special tr(@special i)
fun foo(i: Int): Int {
val j = @special i + 1
compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.fir.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.<!UNRESOLVED_REFERENCE!>INIT<!>) annotation class incorrect
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> annotation class derived
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> class correct(<!WRONG_ANNOTATION_TARGET!>@incorrect<!> val x: Int, <!WRONG_ANNOTATION_TARGET!>@incorrect<!> w: @incorrect Int) {
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> constructor(): this(0, 0)
}
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> enum class My <!WRONG_ANNOTATION_TARGET!>@incorrect<!> constructor() {
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> FIRST,
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> SECOND
}
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> fun foo(<!WRONG_ANNOTATION_TARGET!>@incorrect<!> y: @incorrect Int): Int {
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> fun bar(<!WRONG_ANNOTATION_TARGET!>@incorrect<!> z: @incorrect Int) = z + 1
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> val local = bar(y)
return local
}
<!WRONG_ANNOTATION_TARGET!>@incorrect<!> val z = <!WRONG_ANNOTATION_TARGET!>@incorrect<!> 0
compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.<!UNRESOLVED_REFERENCE!>INIT<!>) annotation class incorrect
compiler/testData/diagnostics/tests/annotations/options/targets/java.fir.kt
Vendored
+3 -3
View File
@@ -64,15 +64,15 @@ import test.AnnotationTargets.*
@base <!WRONG_ANNOTATION_TARGET!>@meta<!> @type <!WRONG_ANNOTATION_TARGET!>@method<!> <!WRONG_ANNOTATION_TARGET!>@multiple<!> class KClass(
@base @fieldann @parameter val y:
@base @type Int) {
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@type<!> Int) {
@base @multiple @fieldann <!WRONG_ANNOTATION_TARGET!>@local<!> val x = 0
@method @konstructor @type get
@base @method @multiple <!WRONG_ANNOTATION_TARGET!>@konstructor<!>
fun foo(@parameter <!WRONG_ANNOTATION_TARGET!>@type<!> i:
@base @multiple Int
): @fieldann @parameter Int {
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@multiple<!> Int
): <!WRONG_ANNOTATION_TARGET!>@fieldann<!> <!WRONG_ANNOTATION_TARGET!>@parameter<!> Int {
@local @base <!WRONG_ANNOTATION_TARGET!>@multiple<!> <!WRONG_ANNOTATION_TARGET!>@fieldann<!> val j = i + 1
<!WRONG_ANNOTATION_TARGET!>@base<!> <!WRONG_ANNOTATION_TARGET!>@multiple<!> return j
compiler/testData/diagnostics/tests/annotations/options/targets/local.fir.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
@Target(AnnotationTarget.LOCAL_VARIABLE) annotation class base
<!WRONG_ANNOTATION_TARGET!>@base<!> annotation class derived
<!WRONG_ANNOTATION_TARGET!>@base<!> class correct(<!WRONG_ANNOTATION_TARGET!>@base<!> val x: Int) {
<!WRONG_ANNOTATION_TARGET!>@base<!> constructor(): this(0)
}
<!WRONG_ANNOTATION_TARGET!>@base<!> enum class My {
<!WRONG_ANNOTATION_TARGET!>@base<!> FIRST,
<!WRONG_ANNOTATION_TARGET!>@base<!> SECOND
}
<!WRONG_ANNOTATION_TARGET!>@base<!> fun foo(<!WRONG_ANNOTATION_TARGET!>@base<!> y: @base Int): Int {
<!WRONG_ANNOTATION_TARGET!>@base<!> fun bar(<!WRONG_ANNOTATION_TARGET!>@base<!> z: @base Int) = z + 1
@base val local = bar(y)
return local
}
<!WRONG_ANNOTATION_TARGET!>@base<!> val z = 0
compiler/testData/diagnostics/tests/annotations/options/targets/local.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
@Target(AnnotationTarget.LOCAL_VARIABLE) annotation class base
<!WRONG_ANNOTATION_TARGET!>@base<!> annotation class derived
compiler/testData/diagnostics/tests/annotations/options/targets/property.fir.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.PROPERTY) annotation class base
<!WRONG_ANNOTATION_TARGET!>@base<!> annotation class derived
<!WRONG_ANNOTATION_TARGET!>@base<!> class correct(@base val x: Int, <!WRONG_ANNOTATION_TARGET!>@base<!> w: Int) {
<!WRONG_ANNOTATION_TARGET!>@base<!> constructor(): this(0, 0)
}
<!WRONG_ANNOTATION_TARGET!>@base<!> enum class My {
@base FIRST,
@base SECOND
}
<!WRONG_ANNOTATION_TARGET!>@base<!> fun foo(<!WRONG_ANNOTATION_TARGET!>@base<!> y: @base Int): Int {
<!WRONG_ANNOTATION_TARGET!>@base<!> fun bar(<!WRONG_ANNOTATION_TARGET!>@base<!> z: @base Int) = z + 1
<!WRONG_ANNOTATION_TARGET!>@base<!> val local = bar(y)
return local
}
@base val z = 0
compiler/testData/diagnostics/tests/annotations/options/targets/property.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.PROPERTY) annotation class base
compiler/testData/diagnostics/tests/annotations/options/targets/returntype.fir.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
annotation class base
@Target(AnnotationTarget.TYPE)
annotation class typed
@base class My(val x: @base @typed Int, y: @base @typed Int) {
val z: @base @typed Int = y
fun foo(): @base @typed Int = z
}
compiler/testData/diagnostics/tests/annotations/options/targets/returntype.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
annotation class base
@Target(AnnotationTarget.TYPE)
compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.fir.kt
Vendored
+2 -2
View File
@@ -26,10 +26,10 @@ class Class2 {
<!WRONG_ANNOTATION_TARGET!>@A<!> fun foo() {}
<!WRONG_ANNOTATION_TARGET!>@A<!> class D
fun foo(i: @A Int) {
fun foo(i: <!WRONG_ANNOTATION_TARGET!>@A<!> Int) {
<!WRONG_ANNOTATION_TARGET!>@A<!> val i = 1
}
fun <T> test(t: @A T): T = t
fun <T> test(t: <!WRONG_ANNOTATION_TARGET!>@A<!> T): T = t
@Target(AnnotationTarget.TYPE)
compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.fir.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
annotation class base
val x: List<@base String>? = null
val y: List<@[base] String>? = null
@Target(AnnotationTarget.TYPE)
annotation class typeAnn
fun foo(list: List<@typeAnn Int>) = list
compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
annotation class base
val x: List<<!WRONG_ANNOTATION_TARGET!>@base<!> String>? = null
compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.fir.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.VALUE_PARAMETER) annotation class base
<!WRONG_ANNOTATION_TARGET!>@base<!> annotation class derived
<!WRONG_ANNOTATION_TARGET!>@base<!> class correct(@base val x: Int, @base w: Int) {
<!WRONG_ANNOTATION_TARGET!>@base<!> constructor(): this(0, 0)
}
<!WRONG_ANNOTATION_TARGET!>@base<!> enum class My {
<!WRONG_ANNOTATION_TARGET!>@base<!> FIRST,
<!WRONG_ANNOTATION_TARGET!>@base<!> SECOND
}
<!WRONG_ANNOTATION_TARGET!>@base<!> fun foo(@base y: @base Int): Int {
<!WRONG_ANNOTATION_TARGET!>@base<!> fun bar(@base z: @base Int) = z + 1
<!WRONG_ANNOTATION_TARGET!>@base<!> val local = bar(y)
return local
}
<!WRONG_ANNOTATION_TARGET!>@base<!> val z = 0
compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Target(AnnotationTarget.VALUE_PARAMETER) annotation class base
compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.fir.kt
Vendored
-22
View File
@@ -1,22 +0,0 @@
// !LANGUAGE: +ProperCheckAnnotationsTargetInTypeUsePositions
// ISSUE: KT-28449
@Target(AnnotationTarget.PROPERTY_GETTER)
annotation class Ann
abstract class Foo : @Ann Any()
abstract class Bar<T : @Ann Any>
fun test_1(a: Any) {
if (a is @Ann String) return
}
open class TypeToken<T>
val test_2 = object : TypeToken<@Ann String>() {}
fun test_3(a: Any) {
a as @Ann Int
}
fun <T> test_4() where T : @Ann Any, T : @Ann CharSequence {}
compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProperCheckAnnotationsTargetInTypeUsePositions
// ISSUE: KT-28449
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/kt23992.fir.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ annotation class Ann
class E : <!ANNOTATION_ON_SUPERCLASS!>@field:Ann<!> <!ANNOTATION_ON_SUPERCLASS!>@get:Ann<!> <!ANNOTATION_ON_SUPERCLASS!>@set:Ann<!> <!ANNOTATION_ON_SUPERCLASS!>@setparam:Ann<!> Foo
interface G : @Ann Foo
interface G : <!WRONG_ANNOTATION_TARGET!>@Ann<!> Foo
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/kt23992_after.fir.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
// !LANGUAGE: +ProhibitUseSiteTargetAnnotationsOnSuperTypes
interface Foo
annotation class Ann
class E : <!ANNOTATION_ON_SUPERCLASS!>@field:Ann<!> <!ANNOTATION_ON_SUPERCLASS!>@get:Ann<!> <!ANNOTATION_ON_SUPERCLASS!>@set:Ann<!> <!ANNOTATION_ON_SUPERCLASS!>@setparam:Ann<!> Foo
interface G : <!WRONG_ANNOTATION_TARGET!>@Ann<!> Foo
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/kt23992_after.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitUseSiteTargetAnnotationsOnSuperTypes
interface Foo