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

Fix checking repeatablilty of use-site target annotations. KT-26638 fixed

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-02-21 15:09:11 +03:00
parent cfda468f13
commit 92bd907983
10 changed files with 91 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/kt26638.kt
Vendored
+6 -5
View File
@@ -1,21 +1,22 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: -ProhibitRepeatedUseSiteTargetAnnotations
// Ann is not repeatable
annotation class Ann(val x: Int)
@get:Ann(10)
<!REPEATED_ANNOTATION_WARNING!>@get:Ann(10)<!>
val a: String
@Ann(20) get() = "foo"
@set:Ann(10)
<!REPEATED_ANNOTATION_WARNING!>@set:Ann(10)<!>
var b: String = ""
@Ann(20) set(value) { field = value }
@setparam:Ann(10)
<!REPEATED_ANNOTATION_WARNING!>@setparam:Ann(10)<!>
var c = " "
set(@Ann(20) x) {}
@get:Ann(10)
<!REPEATED_ANNOTATION!>@get:Ann(20)<!>
<!REPEATED_ANNOTATION_WARNING!>@get:Ann(10)<!>
<!REPEATED_ANNOTATION, REPEATED_ANNOTATION_WARNING!>@get:Ann(20)<!>
val d: String
@Ann(30) <!REPEATED_ANNOTATION!>@Ann(40)<!> get() = "foo"
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/kt26638.txt
Vendored
+4 -1
View File
@@ -1,6 +1,9 @@
package
@setparam:Ann(x = 20) @setparam:Ann(x = 10) public var a: kotlin.String
@get:Ann(x = 10) @get:Ann(x = 20) public val a: kotlin.String
@set:Ann(x = 10) @set:Ann(x = 20) public var b: kotlin.String
@setparam:Ann(x = 20) @setparam:Ann(x = 10) public var c: kotlin.String
@get:Ann(x = 10) @get:Ann(x = 20) @get:Ann(x = 30) @get:Ann(x = 40) public val d: kotlin.String
public final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ x: kotlin.Int)
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/kt26638_after.kt
Vendored
+22
View File
@@ -0,0 +1,22 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !LANGUAGE: +ProhibitRepeatedUseSiteTargetAnnotations
// Ann is not repeatable
annotation class Ann(val x: Int)
<!REPEATED_ANNOTATION!>@get:Ann(10)<!>
val a: String
@Ann(20) get() = "foo"
<!REPEATED_ANNOTATION!>@set:Ann(10)<!>
var b: String = ""
@Ann(20) set(value) { field = value }
<!REPEATED_ANNOTATION!>@setparam:Ann(10)<!>
var c = " "
set(@Ann(20) x) {}
<!REPEATED_ANNOTATION!>@get:Ann(10)<!>
<!REPEATED_ANNOTATION!>@get:Ann(20)<!>
val d: String
@Ann(30) <!REPEATED_ANNOTATION!>@Ann(40)<!> get() = "foo"
compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/kt26638_after.txt
Vendored
+14
View File
@@ -0,0 +1,14 @@
package
@get:Ann(x = 10) @get:Ann(x = 20) public val a: kotlin.String
@set:Ann(x = 10) @set:Ann(x = 20) public var b: kotlin.String
@setparam:Ann(x = 20) @setparam:Ann(x = 10) public var c: kotlin.String
@get:Ann(x = 10) @get:Ann(x = 20) @get:Ann(x = 30) @get:Ann(x = 40) public val d: kotlin.String
public final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ x: kotlin.Int)
public final val x: kotlin.Int
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
}