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

[FIR] Resolve annotations as calls

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-07-23 17:47:38 +03:00
committed by Mikhail Glukhikh
parent bc1fa8ed7f
commit 721b9b4d8c
99 changed files with 529 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
// !WITH_NEW_INFERENCE
import java.util.ArrayList
@ArrayList<Int>(1, 1) fun b() {}
@<!UNRESOLVED_REFERENCE!>Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>) fun c() {}
@java.lang.Deprecated(x) fun a() {}
<!UNRESOLVED_REFERENCE!>@ArrayList<Int>(1, 1)<!> fun b() {}
<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>)<!> fun c() {}
<!INAPPLICABLE_CANDIDATE!>@java.lang.Deprecated(<!UNRESOLVED_REFERENCE!>x<!>)<!> fun a() {}
compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.fir.kt
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
annotation class A1
annotation class A2(val some: Int = 12)
class TopLevelClass<@A1 @A2(3) @A2 @A1(12) @A2("Test") T> {
class InnerClass<@A1 @A2(3) @A2 @A1(12) @A2("Test") T> {
class TopLevelClass<@A1 @A2(3) @A2 <!INAPPLICABLE_CANDIDATE!>@A1(12)<!> <!INAPPLICABLE_CANDIDATE!>@A2("Test")<!> T> {
class InnerClass<@A1 @A2(3) @A2 <!INAPPLICABLE_CANDIDATE!>@A1(12)<!> <!INAPPLICABLE_CANDIDATE!>@A2("Test")<!> T> {
fun test() {
class InFun<@A1 @A2(3) @A2 @A1(12) @A2("Test") T>
class InFun<@A1 @A2(3) @A2 <!INAPPLICABLE_CANDIDATE!>@A1(12)<!> <!INAPPLICABLE_CANDIDATE!>@A2("Test")<!> T>
}
}
}
}
compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.fir.kt
Vendored
+4 -4
View File
@@ -1,12 +1,12 @@
annotation class A1
annotation class A2(val some: Int = 12)
fun <@A1 @A2(3) @A2 @A1(12) @A2("Test") T> topFun() = 12
fun <@A1 @A2(3) @A2 <!INAPPLICABLE_CANDIDATE!>@A1(12)<!> <!INAPPLICABLE_CANDIDATE!>@A2("Test")<!> T> topFun() = 12
class SomeClass {
fun <@A1 @A2(3) @A2 @A1(12) @A2("Test") T> method() = 12
fun <@A1 @A2(3) @A2 <!INAPPLICABLE_CANDIDATE!>@A1(12)<!> <!INAPPLICABLE_CANDIDATE!>@A2("Test")<!> T> method() = 12
fun foo() {
fun <@A1 @A2(3) @A2 @A1(12) @A2("Test") T> innerFun() = 12
fun <@A1 @A2(3) @A2 <!INAPPLICABLE_CANDIDATE!>@A1(12)<!> <!INAPPLICABLE_CANDIDATE!>@A2("Test")<!> T> innerFun() = 12
}
}
}
compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.fir.kt
Vendored
+3 -3
View File
@@ -6,7 +6,7 @@ annotation class annotation
package test
@test.annotation class annotation
<!UNRESOLVED_REFERENCE!>@test.annotation<!> class annotation
// FILE: other/c.kt
@@ -14,6 +14,6 @@ package other
annotation class My
@test.annotation class Your
<!UNRESOLVED_REFERENCE!>@test.annotation<!> class Your
@My class Our
@My class Our
compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.fir.kt
Vendored
+3 -3
View File
@@ -3,12 +3,12 @@
annotation class A1
annotation class A2(val some: Int = 12)
val <@A1 @A2(3) @A2 @A1(12) @A2("Test") T> T.topProp: Int get() = 12
val <@A1 @A2(3) @A2 <!INAPPLICABLE_CANDIDATE!>@A1(12)<!> <!INAPPLICABLE_CANDIDATE!>@A2("Test")<!> T> T.topProp: Int get() = 12
class SomeClass {
val <@A1 @A2(3) @A2 @A1(12) @A2("Test") T> T.field: Int get() = 12
val <@A1 @A2(3) @A2 <!INAPPLICABLE_CANDIDATE!>@A1(12)<!> <!INAPPLICABLE_CANDIDATE!>@A2("Test")<!> T> T.field: Int get() = 12
fun foo() {
val <@A1 @A2(3) @A2 @A1(12) @A2("Test") T> localVal = 12
}
}
}
compiler/testData/diagnostics/tests/annotations/BasicAnnotations.fir.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ annotation class my1(val i : Int)
annotation class my2(val i : Int = 0)
@my fun foo() {}
@my1 fun foo2() {}
<!INAPPLICABLE_CANDIDATE!>@my1<!> fun foo2() {}
@my1(2) fun foo3() {}
@my2() fun foo4() {}
@my2 fun foo41() {}
compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.fir.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
class Foo
@Foo class Bar
<!UNRESOLVED_REFERENCE!>@Foo<!> class Bar
compiler/testData/diagnostics/tests/annotations/RecursivelyIncorrectlyAnnotatedParameter.fir.kt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
// Class constructor parameter CAN be recursively annotated
class RecursivelyAnnotated(@RecursivelyAnnotated(1) val x: Int)
class RecursivelyAnnotated(<!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>@RecursivelyAnnotated(1)<!> val x: Int)
compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.fir.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package test
@BadAnnotation(1)
<!INAPPLICABLE_CANDIDATE!>@BadAnnotation(1)<!>
object SomeObject
val some = SomeObject
annotation class BadAnnotation(val s: String)
annotation class BadAnnotation(val s: String)
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.fir.kt
Vendored
+2 -2
View File
@@ -11,5 +11,5 @@ enum class MyEnum {
A
}
@AnnE(Test())
class Test2
<!INAPPLICABLE_CANDIDATE!>@AnnE(Test())<!>
class Test2
compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.fir.kt
Vendored
+2 -2
View File
@@ -11,5 +11,5 @@ enum class MyEnum {
A
}
@AnnE(Test())
class Test2
<!INAPPLICABLE_CANDIDATE!>@AnnE(Test())<!>
class Test2
compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.fir.kt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ fun foo() {
return@l1 103
}
bar @Ann("") {
bar <!INAPPLICABLE_CANDIDATE!>@Ann("")<!> {
104
}
}
compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.fir.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ annotation class Ann(val x: Int = 6)
@Ann(1) @Ann(2) @Ann(3) private class A @Ann constructor() {
@Ann(x = 5) fun foo() {
1 + @Ann(1) 1 * @Ann("") 6
1 + @Ann(1) 1 * <!INAPPLICABLE_CANDIDATE!>@Ann("")<!> 6
@Ann fun local() {}
}
compiler/testData/diagnostics/tests/annotations/deprecatedRepeatable.fir.kt
Vendored
+2 -2
View File
@@ -2,9 +2,9 @@
import java.lang.annotation.Repeatable
@java.lang.annotation.Repeatable(Annotations::class) annotation class RepAnn
<!INAPPLICABLE_CANDIDATE!>@java.lang.annotation.Repeatable(Annotations::class)<!> annotation class RepAnn
@Repeatable(OtherAnnotations::class) annotation class OtherAnn
<!INAPPLICABLE_CANDIDATE!>@Repeatable(OtherAnnotations::class)<!> annotation class OtherAnn
annotation class Annotations(vararg val value: RepAnn)
compiler/testData/diagnostics/tests/annotations/illegalRequireKotlinValue.fir.kt
Vendored
+11 -11
View File
@@ -3,36 +3,36 @@ package test
import kotlin.internal.RequireKotlin
@RequireKotlin("")
<!HIDDEN!>@RequireKotlin("")<!>
fun f01() {}
@RequireKotlin("x")
<!HIDDEN!>@RequireKotlin("x")<!>
fun f02() {}
@RequireKotlin("1")
<!HIDDEN!>@RequireKotlin("1")<!>
fun f03() {}
@RequireKotlin("1.0-beta")
<!HIDDEN!>@RequireKotlin("1.0-beta")<!>
fun f04() {}
@RequireKotlin("1.1.0-dev-1111")
<!HIDDEN!>@RequireKotlin("1.1.0-dev-1111")<!>
fun f05() {}
@RequireKotlin("1.5.3.7")
<!HIDDEN!>@RequireKotlin("1.5.3.7")<!>
fun f06() {}
@RequireKotlin("1..0")
<!HIDDEN!>@RequireKotlin("1..0")<!>
fun f07() {}
@RequireKotlin(" 1.0")
<!HIDDEN!>@RequireKotlin(" 1.0")<!>
fun f08() {}
@RequireKotlin("1.1")
<!HIDDEN!>@RequireKotlin("1.1")<!>
fun ok1() {}
@RequireKotlin("1.1.0")
<!HIDDEN!>@RequireKotlin("1.1.0")<!>
fun ok2() {}
@RequireKotlin("0.0.0")
<!HIDDEN!>@RequireKotlin("0.0.0")<!>
fun ok3() {}
compiler/testData/diagnostics/tests/annotations/kt1860-negative.fir.kt
Vendored
+5 -5
View File
@@ -1,10 +1,10 @@
// !WITH_NEW_INFERENCE
fun foo(@<!UNRESOLVED_REFERENCE!>varargs<!> f : Int) {}
fun foo(<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>varargs<!> f : Int) {}
var bar : Int = 1
set(@<!UNRESOLVED_REFERENCE!>varargs<!> v) {}
set(<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>varargs<!> v) {}
val x : (Int) -> Int = {@<!UNRESOLVED_REFERENCE!>varargs<!> x <!SYNTAX!>: Int -> x<!>}
val x : (Int) -> Int = {<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>varargs<!> x <!SYNTAX!>: Int -> x<!>}
class Hello(@<!UNRESOLVED_REFERENCE!>varargs<!> args: Any) {
}
class Hello(<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>varargs<!> args: Any) {
}
compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.fir.kt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
class Foo<T> {
@T
<!UNRESOLVED_REFERENCE!>@T<!>
fun foo() = 0
}
class Bar<T : Annotation> {
@T
<!UNRESOLVED_REFERENCE!>@T<!>
fun foo() = 0
}
}
compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.fir.kt
Vendored
+5 -5
View File
@@ -1,5 +1,5 @@
@<!UNRESOLVED_REFERENCE!>Ann<!> class A
@<!UNRESOLVED_REFERENCE!>Ann<!> class B
@<!UNRESOLVED_REFERENCE!>Ann<!>(1) class C
@<!UNRESOLVED_REFERENCE!>kotlin.Ann<!>(1) class D
@<!UNRESOLVED_REFERENCE!>kotlin.annotation.Ann<!>(1) class E
<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>Ann<!> class A
<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>Ann<!> class B
<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>Ann<!>(1)<!> class C
<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>kotlin.Ann<!>(1)<!> class D
<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>kotlin.annotation.Ann<!>(1)<!> class E
compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.fir.kt
Vendored
+2 -2
View File
@@ -34,8 +34,8 @@ fun test6() {}
annotation class AnnArray(val a: Array<String>)
@AnnArray(*["/"])
<!INAPPLICABLE_CANDIDATE!>@AnnArray(*["/"])<!>
fun testArray() {}
@Ann1([""])
fun testVararg() {}
fun testVararg() {}
compiler/testData/diagnostics/tests/deprecated/javaDeprecated.fir.kt
Vendored
+1 -1
View File
@@ -11,6 +11,6 @@ public class A {
// FILE: B.kt
class B(private @property:Deprecated val foo: String) : A() {
class B(private <!INAPPLICABLE_CANDIDATE, INAPPLICABLE_CANDIDATE!>@property:Deprecated<!> val foo: String) : A() {
override fun getFoo(text: String): String = super.getFoo(text + foo)
}
compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.fir.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// !CHECK_TYPE
@kotlin.internal.InlineOnly
<!HIDDEN!>@kotlin.internal.InlineOnly<!>
public inline fun <C, R> C.ifEmpty(f: () -> R): R where C : Collection<*>, C : R = if (isEmpty()) f() else this
public fun <T> listOf(t: T): List<T> = TODO()
@@ -13,4 +13,4 @@ fun usage(c: List<String>) {
val cs = c.ifEmpty { listOf("x") }
cs checkType { _<List<String>>() }
}
}
compiler/testData/diagnostics/tests/localClasses/localAnnotationClass.fir.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
fun f() {
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation class Anno<!>
@Anno class Local {
<!UNRESOLVED_REFERENCE!>@Anno<!> class Local {
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation class Nested<!>
}
}
compiler/testData/diagnostics/tests/localClasses/localAnnotationClassError.fir.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
fun f() {
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation class Anno<!>
@Anno class Local {
<!UNRESOLVED_REFERENCE!>@Anno<!> class Local {
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation class Nested<!>
}
}
compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.fir.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
@<!UNRESOLVED_REFERENCE!><!SYNTAX!><!>myAnnotation<!> public
<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!><!SYNTAX!><!>myAnnotation<!> public
package illegal_modifiers
abstract class A() {
compiler/testData/diagnostics/tests/objects/kt21515/annotationConstructor.fir.kt
Vendored
+2 -2
View File
@@ -8,6 +8,6 @@ open class Base {
class Derived : Base() {
@<!UNRESOLVED_REFERENCE!>Foo<!>
<!UNRESOLVED_REFERENCE!>@<!UNRESOLVED_REFERENCE!>Foo<!>
fun foo() = 42
}
}
compiler/testData/diagnostics/tests/privateInFile/topLevelAnnotationCall.fir.kt
Vendored
+3 -3
View File
@@ -17,11 +17,11 @@ class C1
// FILE: 2.kt
package pp
@A(<!HIDDEN!>foo<!>)
<!HIDDEN!>@A(<!HIDDEN!>foo<!>)<!>
fun f2() {}
@A(<!HIDDEN!>foo<!>)
<!HIDDEN!>@A(<!HIDDEN!>foo<!>)<!>
val p2 = ""
@A(<!HIDDEN!>foo<!>)
<!HIDDEN!>@A(<!HIDDEN!>foo<!>)<!>
class C2
compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.fir.kt
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ annotation class Ann2(val x: Int)
class A {
@Ann1
constructor()
@Ann2
<!INAPPLICABLE_CANDIDATE!>@Ann2<!>
constructor(x1: Int)
@Ann2(2)
constructor(x1: Int, x2: Int)
}
}
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
Vendored
+2 -2
View File
@@ -31,6 +31,6 @@ fun test_ann(s: String, arr: Array<String>) {
@Ann("", x = 1)
foo()
@Ann(s = "", x = 1)
<!INAPPLICABLE_CANDIDATE!>@Ann(s = "", x = 1)<!>
foo()
}
}
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.fir.kt
Vendored
+1 -1
View File
@@ -31,6 +31,6 @@ fun test_ann(s: String, arr: Array<String>) {
@Ann("", x = 1)
foo()
@Ann(s = "", x = 1)
<!INAPPLICABLE_CANDIDATE!>@Ann(s = "", x = 1)<!>
foo()
}
compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.fir.kt
Vendored
+3 -3
View File
@@ -15,10 +15,10 @@ annotation class Ann(vararg val s: String)
@Ann(s = arrayOf())
fun test1() {}
@Ann(s = intArrayOf())
<!INAPPLICABLE_CANDIDATE!>@Ann(s = intArrayOf())<!>
fun test2() {}
@Ann(s = arrayOf(1))
<!INAPPLICABLE_CANDIDATE!>@Ann(s = arrayOf(1))<!>
fun test3() {}
@Ann("value1", "value2")
@@ -43,4 +43,4 @@ annotation class IntAnn(vararg val i: Int)
fun foo1() {}
@IntAnn(i = intArrayOf(0))
fun foo2() {}
fun foo2() {}
compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_after.fir.kt
Vendored
+3 -3
View File
@@ -11,7 +11,7 @@
annotation class Ann(vararg val s: String)
@Ann(s = "value")
<!INAPPLICABLE_CANDIDATE!>@Ann(s = "value")<!>
fun test1() {}
@Ann(s = *arrayOf("value"))
@@ -20,11 +20,11 @@ fun test2() {}
@Ann(s = *["value"])
fun test3() {}
@JavaAnn(value = "value")
<!INAPPLICABLE_CANDIDATE!>@JavaAnn(value = "value")<!>
fun test4() {}
@JavaAnn("value", path = arrayOf("path"))
fun test5() {}
@JavaAnn("value", path = ["path"])
fun test6() {}
fun test6() {}
compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_before.fir.kt
Vendored
+3 -3
View File
@@ -11,7 +11,7 @@
annotation class Ann(vararg val s: String)
@Ann(s = "value")
<!INAPPLICABLE_CANDIDATE!>@Ann(s = "value")<!>
fun test1() {}
@Ann(s = *arrayOf("value"))
@@ -20,11 +20,11 @@ fun test2() {}
@Ann(s = *["value"])
fun test3() {}
@JavaAnn(value = "value")
<!INAPPLICABLE_CANDIDATE!>@JavaAnn(value = "value")<!>
fun test4() {}
@JavaAnn("value", path = arrayOf("path"))
fun test5() {}
@JavaAnn("value", path = ["path"])
fun test6() {}
fun test6() {}
compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.fir.kt
Vendored
+4 -4
View File
@@ -15,10 +15,10 @@ annotation class Ann(vararg val s: String)
@Ann(s = arrayOf())
fun test1() {}
@Ann(s = intArrayOf())
<!INAPPLICABLE_CANDIDATE!>@Ann(s = intArrayOf())<!>
fun test2() {}
@Ann(s = arrayOf(1))
<!INAPPLICABLE_CANDIDATE!>@Ann(s = arrayOf(1))<!>
fun test3() {}
@Ann(s = ["value"])
@@ -43,7 +43,7 @@ fun foo2() {}
fun foo(vararg i: Int) {}
@Ann(s = "value")
<!INAPPLICABLE_CANDIDATE!>@Ann(s = "value")<!>
fun dep1() {
<!INAPPLICABLE_CANDIDATE!>foo<!>(i = 1)
}
}
compiler/testData/diagnostics/tests/varargs/prohibitAssigningSingleElementsInNamedForm.fir.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@
annotation class Anno1(vararg val s: String)
annotation class Anno2(vararg val i: Int)
@Anno1(s = "foo")
<!INAPPLICABLE_CANDIDATE!>@Anno1(s = "foo")<!>
@Anno2(i = *intArrayOf(1))
fun f1() {}