diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 7056b234b0e..bc2957624a0 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -283,7 +283,7 @@ public interface Comparable { public abstract fun compareTo(/*0*/ other: T): kotlin.Int } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class Deprecated : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class Deprecated : kotlin.Annotation { /*primary*/ public constructor Deprecated(/*0*/ value: kotlin.String, /*1*/ replaceWith: kotlin.ReplaceWith = ...) internal final val replaceWith: kotlin.ReplaceWith internal final fun (): kotlin.ReplaceWith @@ -435,7 +435,7 @@ public abstract class Enum> : kotlin.Comparable { } } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class Extension : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class Extension : kotlin.Annotation { /*primary*/ public constructor Extension() } @@ -587,7 +587,7 @@ public interface FloatingPointConstants { public interface Function { } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.Retention(value = AnnotationRetention.BINARY) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class HiddenDeclaration : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.Retention(value = AnnotationRetention.BINARY) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class HiddenDeclaration : kotlin.Annotation { /*primary*/ public constructor HiddenDeclaration() } @@ -1092,7 +1092,7 @@ public interface Range> { public open fun isEmpty(): kotlin.Boolean } -kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.Retention(value = AnnotationRetention.BINARY) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class ReplaceWith : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {}) kotlin.annotation.Retention(value = AnnotationRetention.BINARY) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class ReplaceWith : kotlin.Annotation { /*primary*/ public constructor ReplaceWith(/*0*/ expression: kotlin.String, /*1*/ vararg imports: kotlin.String /*kotlin.Array*/) internal final val expression: kotlin.String internal final fun (): kotlin.String @@ -1251,7 +1251,7 @@ public final class String : kotlin.Comparable, kotlin.CharSequenc } } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.TYPE, AnnotationTarget.EXPRESSION, AnnotationTarget.FILE}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.annotation() public final class Suppress : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.LOCAL_VARIABLE, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.TYPE, AnnotationTarget.EXPRESSION, AnnotationTarget.FILE}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.annotation() public final class Suppress : kotlin.Annotation { /*primary*/ public constructor Suppress(/*0*/ vararg names: kotlin.String /*kotlin.Array*/) internal final val names: kotlin.Array internal final fun (): kotlin.Array @@ -1268,34 +1268,34 @@ public object Unit { /*primary*/ private constructor Unit() } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class data : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class data : kotlin.Annotation { /*primary*/ public constructor data() } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class external : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class external : kotlin.Annotation { /*primary*/ public constructor external() } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class inline : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class inline : kotlin.Annotation { /*primary*/ public constructor inline(/*0*/ strategy: kotlin.InlineStrategy = ...) public final val strategy: kotlin.InlineStrategy public final fun (): kotlin.InlineStrategy } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class inlineOptions : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class inlineOptions : kotlin.Annotation { /*primary*/ public constructor inlineOptions(/*0*/ vararg value: kotlin.InlineOption /*kotlin.Array*/) internal final val value: kotlin.Array internal final fun (): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class noinline : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) kotlin.annotation.MustBeDocumented() kotlin.annotation.annotation() public final class noinline : kotlin.Annotation { /*primary*/ public constructor noinline() } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.annotation() public final class tailRecursive : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.annotation() public final class tailRecursive : kotlin.Annotation { /*primary*/ public constructor tailRecursive() } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.annotation() public final class tailrec : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.annotation() public final class tailrec : kotlin.Annotation { /*primary*/ public constructor tailrec() } diff --git a/compiler/testData/cli/js/diagnosticForUnhandledElements.kt b/compiler/testData/cli/js/diagnosticForUnhandledElements.kt index 63a097901ec..ee924501143 100644 --- a/compiler/testData/cli/js/diagnosticForUnhandledElements.kt +++ b/compiler/testData/cli/js/diagnosticForUnhandledElements.kt @@ -1,6 +1,6 @@ package foo -target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION) annotation class fancy @fancy diff --git a/compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt b/compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt index 2d5a08ee0f8..664daa280cf 100644 --- a/compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt +++ b/compiler/testData/codegen/boxWithJava/annotatedSamLambda/annotatedSamLambda.kt @@ -1,7 +1,7 @@ import java.lang.reflect.Method import kotlin.test.assertEquals -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) @Retention(AnnotationRetention.RUNTIME) annotation class Ann(val x: String) diff --git a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt index 1bcb5019add..6384c03c07e 100644 --- a/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt +++ b/compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt @@ -1,7 +1,7 @@ import java.lang.reflect.Method import kotlin.test.assertEquals -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) @Retention(AnnotationRetention.RUNTIME) annotation class Ann(val x: String) diff --git a/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.kt b/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.kt index 1c5ad8b7ca9..3613f6c692d 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.kt +++ b/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.kt @@ -1,28 +1,28 @@ -target(AnnotationTarget.PROPERTY) +@Target(AnnotationTarget.PROPERTY) annotation class AnnProperty -target(AnnotationTarget.FIELD) +@Target(AnnotationTarget.FIELD) annotation class AnnField -target(AnnotationTarget.FIELD, AnnotationTarget.PROPERTY) +@Target(AnnotationTarget.FIELD, AnnotationTarget.PROPERTY) annotation class AnnFieldProperty -target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.PROPERTY) +@Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.PROPERTY) annotation class AnnParameterProperty -target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD) +@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD) annotation class AnnParameterField -target(AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) +@Target(AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) annotation class AnnGetterSetter -target(AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY) +@Target(AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.PROPERTY) annotation class AnnPropertySetter -target(AnnotationTarget.PROPERTY, AnnotationTarget.PROPERTY_GETTER) +@Target(AnnotationTarget.PROPERTY, AnnotationTarget.PROPERTY_GETTER) annotation class AnnTypeGetter -target(AnnotationTarget.PROPERTY, AnnotationTarget.TYPE) +@Target(AnnotationTarget.PROPERTY, AnnotationTarget.TYPE) annotation class AnnTypeField public class A( diff --git a/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt b/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt index 61ed5f898f9..8e348499f27 100644 --- a/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt +++ b/compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.txt @@ -10,20 +10,20 @@ method (@AnnParameterProperty p0: int): void } -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnField +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnField -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnFieldProperty +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnFieldProperty -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnGetterSetter +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnGetterSetter -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnParameterField +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnParameterField -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnParameterProperty +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnParameterProperty -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnProperty +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnProperty -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnPropertySetter +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnPropertySetter -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnTypeField +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnTypeField -@kotlin.annotation.target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnTypeGetter \ No newline at end of file +@kotlin.annotation.Target @java.lang.annotation.Retention @java.lang.annotation.Target @kotlin.jvm.internal.KotlinClass AnnTypeGetter \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt index a560c088c9e..f0013e052e5 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.ANNOTATION_CLASS) +@Target(AnnotationTarget.ANNOTATION_CLASS) annotation class meta \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt index 6349b9ea3ed..4ac91e0905e 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt @@ -4,6 +4,6 @@ test.meta() public/*package*/ final class MyAnn : kotlin.Annotation { public/*package*/ constructor MyAnn() } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class meta : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class meta : kotlin.Annotation { public constructor meta() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt b/compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt index 42ed393d490..1abd6a2338c 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.CLASSIFIER) +@Target(AnnotationTarget.CLASSIFIER) annotation class classifier \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt b/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt index f19f7e8a330..5e10042fb89 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class classifier : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class classifier : kotlin.Annotation { public constructor classifier() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt b/compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt index f30855bce29..c46b56770da 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.CONSTRUCTOR) +@Target(AnnotationTarget.CONSTRUCTOR) annotation class constructor \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt b/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt index 084487bdda8..846dd041a53 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.annotation() internal final class constructor : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.annotation() internal final class constructor : kotlin.Annotation { public constructor constructor() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/empty.kt b/compiler/testData/compileJavaAgainstKotlin/targets/empty.kt index baf723a676d..ebbd1222fb9 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/empty.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/empty.kt @@ -1,4 +1,4 @@ package test -target() +@Target() annotation class empty diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt b/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt index d2e4b24462c..195f4278898 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/empty.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() internal final class empty : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {}) kotlin.annotation.annotation() internal final class empty : kotlin.Annotation { public constructor empty() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/field.kt b/compiler/testData/compileJavaAgainstKotlin/targets/field.kt index 121f11551c2..4900ffe2818 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/field.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/field.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.FIELD) +@Target(AnnotationTarget.FIELD) annotation class field diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/field.txt b/compiler/testData/compileJavaAgainstKotlin/targets/field.txt index c85e2edcd7f..7d498e519e9 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/field.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/field.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FIELD}) kotlin.annotation.annotation() internal final class field : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) kotlin.annotation.annotation() internal final class field : kotlin.Annotation { public constructor field() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/function.kt b/compiler/testData/compileJavaAgainstKotlin/targets/function.kt index 149d5a6feb5..f6b6ecac1e8 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/function.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/function.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.FUNCTION) annotation class function \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/function.txt b/compiler/testData/compileJavaAgainstKotlin/targets/function.txt index 8e421090589..dbf6bc947af 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/function.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/function.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class function : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class function : kotlin.Annotation { public constructor function() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/getter.kt b/compiler/testData/compileJavaAgainstKotlin/targets/getter.kt index d4f36ed4e5b..c01931a587e 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/getter.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/getter.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.PROPERTY_GETTER) +@Target(AnnotationTarget.PROPERTY_GETTER) annotation class getter \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt index 39bf0f57ecb..d4107fe2b47 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/getter.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) kotlin.annotation.annotation() internal final class getter : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) kotlin.annotation.annotation() internal final class getter : kotlin.Annotation { public constructor getter() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/local.kt b/compiler/testData/compileJavaAgainstKotlin/targets/local.kt index 22315fd2751..353f8a822bc 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/local.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/local.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.LOCAL_VARIABLE) +@Target(AnnotationTarget.LOCAL_VARIABLE) annotation class local diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/local.txt b/compiler/testData/compileJavaAgainstKotlin/targets/local.txt index 2a1332759af..59ac6e5fc22 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/local.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/local.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kotlin.annotation.annotation() internal final class local : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kotlin.annotation.annotation() internal final class local : kotlin.Annotation { public constructor local() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt b/compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt index e6917422932..c3bdf7c5f57 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION) annotation class multiple diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt b/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt index e8113fd2d4f..7fbb036be9a 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class multiple : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class multiple : kotlin.Annotation { public constructor multiple() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt b/compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt index a0480e339b7..0a93caf8193 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.VALUE_PARAMETER) +@Target(AnnotationTarget.VALUE_PARAMETER) annotation class parameter diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt index 8773097824a..564b7671195 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final class parameter : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final class parameter : kotlin.Annotation { public constructor parameter() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/property.kt b/compiler/testData/compileJavaAgainstKotlin/targets/property.kt index 8dfbeda314f..7add7cbeba7 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/property.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/property.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.PROPERTY) +@Target(AnnotationTarget.PROPERTY) annotation class property diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/property.txt b/compiler/testData/compileJavaAgainstKotlin/targets/property.txt index fdc224d14ea..e06fe0b9b8a 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/property.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/property.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.annotation.annotation() internal final class property : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.annotation.annotation() internal final class property : kotlin.Annotation { public constructor property() } diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/setter.kt b/compiler/testData/compileJavaAgainstKotlin/targets/setter.kt index 8d1a40ba08a..f411a141d18 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/setter.kt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/setter.kt @@ -1,4 +1,4 @@ package test -target(AnnotationTarget.PROPERTY_SETTER) +@Target(AnnotationTarget.PROPERTY_SETTER) annotation class setter \ No newline at end of file diff --git a/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt b/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt index a60787c4175..425d2158878 100644 --- a/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt +++ b/compiler/testData/compileJavaAgainstKotlin/targets/setter.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.annotation() internal final class setter : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.annotation() internal final class setter : kotlin.Annotation { public constructor setter() } diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.kt b/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.kt index c38ec8d9835..af41d3d5944 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.kt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.kt @@ -1,5 +1,5 @@ // Result type can be annotated -target(AnnotationTarget.TYPE) +@Target(AnnotationTarget.TYPE) annotation class My(val x: Int) fun foo(): @My(42) Int = 24 \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt b/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt index 76c1bb536a0..1ed36f068e3 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.txt @@ -2,7 +2,7 @@ package internal fun foo(): @[My(x = 42)] kotlin.Int -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class My : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class My : kotlin.Annotation { public constructor My(/*0*/ x: kotlin.Int) internal final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.kt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.kt index a44dfffb3f1..2d4d8f77a20 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.kt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.kt @@ -1,3 +1,3 @@ // Class constructor parameter type CAN be recursively annotated -target(AnnotationTarget.TYPE) +@Target(AnnotationTarget.TYPE) annotation class RecursivelyAnnotated(val x: @RecursivelyAnnotated(1) Int) \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt index a5994d556c1..a452f3a9f59 100644 --- a/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt +++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.txt @@ -1,6 +1,6 @@ package -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class RecursivelyAnnotated : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class RecursivelyAnnotated : kotlin.Annotation { public constructor RecursivelyAnnotated(/*0*/ x: @[RecursivelyAnnotated(x = 1)] kotlin.Int) internal final val x: @[RecursivelyAnnotated(x = 1)] kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.kt b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.kt index e738fe8a346..90a1b864b65 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.kt +++ b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) @Retention(AnnotationRetention.SOURCE) @Repeatable annotation class Ann(val x: Int = 1) diff --git a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt index e69ac74f8cc..13ea9483bde 100644 --- a/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt +++ b/compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.txt @@ -3,7 +3,7 @@ package kotlin.inline() internal fun bar(/*0*/ block: () -> kotlin.Int): kotlin.Int internal fun foo(): kotlin.Unit -kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.Repeatable() kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.Repeatable() kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int = ...) internal final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt index 5997402d13e..1ddd00c48d2 100644 --- a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt +++ b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt @@ -1,7 +1,7 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -target(AnnotationTarget.TYPE, AnnotationTarget.CLASSIFIER, - AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, - AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY) +@Target(AnnotationTarget.TYPE, AnnotationTarget.CLASSIFIER, + AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, + AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY) @Retention(AnnotationRetention.SOURCE) @Repeatable annotation class Ann(val x: Int = 6) diff --git a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt index e8b3a011ac3..06fc12b148b 100644 --- a/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt +++ b/compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.txt @@ -10,7 +10,7 @@ Ann(x = 1) Ann(x = 2) Ann(x = 3) private final class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.CLASSIFIER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.Repeatable() kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.CLASSIFIER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION, AnnotationTarget.EXPRESSION, AnnotationTarget.PROPERTY}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.Repeatable() kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { public constructor Ann(/*0*/ x: kotlin.Int = ...) internal final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt index c4751e8cf8b..9c84353aeca 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt +++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION) annotation class test fun foo(test f : Int) {} diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt index bb12f4d9876..bc144da9d4e 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt +++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.txt @@ -11,7 +11,7 @@ internal final class Hello { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class test : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class test : kotlin.Annotation { public constructor test() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/onExpression.kt b/compiler/testData/diagnostics/tests/annotations/onExpression.kt index f1d47b1fde4..f5c1abdd2d5 100644 --- a/compiler/testData/diagnostics/tests/annotations/onExpression.kt +++ b/compiler/testData/diagnostics/tests/annotations/onExpression.kt @@ -1,4 +1,4 @@ fun foo() = @ann 1 -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) annotation class ann \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/annotations/onExpression.txt b/compiler/testData/diagnostics/tests/annotations/onExpression.txt index 483adc1101c..966f437ca59 100644 --- a/compiler/testData/diagnostics/tests/annotations/onExpression.txt +++ b/compiler/testData/diagnostics/tests/annotations/onExpression.txt @@ -2,7 +2,7 @@ package internal fun foo(): kotlin.Int -kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class ann : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class ann : kotlin.Annotation { public constructor ann() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/repeatable.kt b/compiler/testData/diagnostics/tests/annotations/options/repeatable.kt index 6aaf91bfa0e..0b27b984202 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/repeatable.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/repeatable.kt @@ -13,7 +13,7 @@ annotation class repann2(val f: Boolean) @Repeatable annotation class binrepann -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) @Repeatable annotation class repexpr diff --git a/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt b/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt index 85a9fd565fa..cfcc5da96b5 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/repeatable.txt @@ -60,7 +60,7 @@ kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotatio public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.Repeatable() kotlin.annotation.annotation() internal final class repexpr : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.Repeatable() kotlin.annotation.annotation() internal final class repexpr : kotlin.Annotation { public constructor repexpr() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/target.kt b/compiler/testData/diagnostics/tests/annotations/options/target.kt index 1b47729396a..4ffd9395901 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/target.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/target.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.CLASSIFIER) +@Target(AnnotationTarget.CLASSIFIER) annotation class base base data class My diff --git a/compiler/testData/diagnostics/tests/annotations/options/target.txt b/compiler/testData/diagnostics/tests/annotations/options/target.txt index 09152f6db0f..d2affb937a7 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/target.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/target.txt @@ -8,7 +8,7 @@ base() kotlin.data() internal final class My { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.kt index eaa94700d74..2672d2e57be 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.kt @@ -1,10 +1,10 @@ -target(AnnotationTarget.PROPERTY_GETTER) +@Target(AnnotationTarget.PROPERTY_GETTER) annotation class smartget -target(AnnotationTarget.PROPERTY_SETTER) +@Target(AnnotationTarget.PROPERTY_SETTER) annotation class smartset -target(AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.FUNCTION) annotation class base class My(x: Int) { diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt index 176a08cc51e..0aea07890e8 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt @@ -9,21 +9,21 @@ internal final class My { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() 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}) kotlin.annotation.annotation() internal final class smartget : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) kotlin.annotation.annotation() internal final class smartget : kotlin.Annotation { public constructor smartget() 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_SETTER}) kotlin.annotation.annotation() internal final class smartset : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.annotation() internal final class smartset : kotlin.Annotation { public constructor smartset() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.kt index 7b789761ccb..a25530e72f9 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.ANNOTATION_CLASS) annotation class base +@Target(AnnotationTarget.ANNOTATION_CLASS) annotation class base base annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt index 698f2c0f8f6..e1ecc88cca5 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/annotation.txt @@ -22,7 +22,7 @@ base() internal final enum class My : kotlin.Enum { public final /*synthesized*/ fun values(): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.kt index 1bedffc957d..7549a4cc94c 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -target(AnnotationTarget.CLASSIFIER) annotation class base +@Target(AnnotationTarget.CLASSIFIER) annotation class base base annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt index cdcad7775ce..f164e0bda27 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/classifier.txt @@ -22,7 +22,7 @@ base() internal final enum class My : kotlin.Enum { public final /*synthesized*/ fun values(): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.kt index dce66d46d27..6fa9014b3ca 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.CONSTRUCTOR) annotation class base +@Target(AnnotationTarget.CONSTRUCTOR) annotation class base base annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt index e486ebdc249..6cf34dd75b9 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/constructor.txt @@ -22,7 +22,7 @@ base() internal final enum class My : kotlin.Enum { public final /*synthesized*/ fun values(): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.kt index 5af7fcb516c..75849e1bde8 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -target() annotation class empty +@Target() annotation class empty empty annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt index ee6f1eca761..718aec63b48 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/empty.txt @@ -38,7 +38,7 @@ empty() kotlin.annotation.annotation() internal final class derived : kotlin.Ann public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() internal final class empty : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {}) kotlin.annotation.annotation() internal final class empty : kotlin.Annotation { public constructor empty() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/expr.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.kt index fff356d1dc8..97c831d9ea9 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/expr.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.kt @@ -1,6 +1,6 @@ annotation class base -target(AnnotationTarget.EXPRESSION) annotation class special +@Target(AnnotationTarget.EXPRESSION) annotation class special fun transform(i: Int, tr: (Int) -> Int): Int = @base @special tr(@special i) diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt index 58e6479fa39..e428938c37c 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/expr.txt @@ -10,7 +10,7 @@ kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation { public constructor special() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/file.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/file.kt index cb6d93d4bf2..03826b13ea2 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/file.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/file.kt @@ -2,7 +2,7 @@ package test -target(AnnotationTarget.FILE) annotation class special +@Target(AnnotationTarget.FILE) annotation class special annotation class common diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt index 084c6b9a796..db27851ea59 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/file.txt @@ -23,7 +23,7 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.FILE}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation { public constructor special() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.kt index 7c6251bb42f..31001806ef2 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.FUNCTION) annotation class base +@Target(AnnotationTarget.FUNCTION) annotation class base base annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt index 33db50a321a..7fc520f19b4 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/function.txt @@ -22,7 +22,7 @@ base() internal final enum class My : kotlin.Enum { public final /*synthesized*/ fun values(): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.kt index d158d935f4e..acca49127dc 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.kt @@ -1,7 +1,7 @@ -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) annotation class special -target(AnnotationTarget.TYPE) +@Target(AnnotationTarget.TYPE) annotation class base fun transform(i: Int, tr: (@special Int) -> Int): Int = @special tr(@special i) diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt index f0528388ae0..8e71a7c4890 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.txt @@ -3,14 +3,14 @@ package internal fun foo(/*0*/ i: kotlin.Int): kotlin.Int internal fun transform(/*0*/ i: kotlin.Int, /*1*/ tr: (kotlin.Int) -> kotlin.Int): kotlin.Int -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() 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.EXPRESSION}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class special : kotlin.Annotation { public constructor special() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.kt index d6dd3e4fcc1..d499d8a2910 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -target(AnnotationTarget.INIT) annotation class incorrect +@Target(AnnotationTarget.INIT) annotation class incorrect incorrect annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt index 009f53add6e..307634fc12b 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.txt @@ -38,7 +38,7 @@ incorrect() kotlin.annotation.annotation() internal final class derived : kotlin public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() internal final class incorrect : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {}) kotlin.annotation.annotation() internal final class incorrect : kotlin.Annotation { public constructor incorrect() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt index c8b8fadc1b2..477ebb86378 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt @@ -15,56 +15,56 @@ package test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.FIELD}) public final class fieldann : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) public final class fieldann : kotlin.Annotation { public constructor fieldann() 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.CONSTRUCTOR}) public final class konstructor : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final class konstructor : kotlin.Annotation { public constructor konstructor() 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.LOCAL_VARIABLE}) public final class local : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final class local : kotlin.Annotation { public constructor local() 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.ANNOTATION_CLASS}) public final class meta : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final class meta : kotlin.Annotation { public constructor meta() 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.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) public final class method : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) public final class method : kotlin.Annotation { public constructor method() 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.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD}) public final class multiple : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD}) public final class multiple : kotlin.Annotation { public constructor multiple() 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.VALUE_PARAMETER}) public final class parameter : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final class parameter : kotlin.Annotation { public constructor parameter() 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.CLASSIFIER, AnnotationTarget.FILE}) public final class type : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FILE}) public final class type : kotlin.Annotation { public constructor type() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.kt index ebe2cd8a8e7..db192a51665 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.LOCAL_VARIABLE) annotation class base +@Target(AnnotationTarget.LOCAL_VARIABLE) annotation class base base annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt index f20dd6c4b0d..9cfbc235c0a 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/local.txt @@ -22,7 +22,7 @@ base() internal final enum class My : kotlin.Enum { public final /*synthesized*/ fun values(): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/nested.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.kt index 150737260e9..aa94be888ad 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/nested.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.kt @@ -1,7 +1,7 @@ -target(AnnotationTarget.CLASSIFIER) +@Target(AnnotationTarget.CLASSIFIER) annotation class base -target(AnnotationTarget.ANNOTATION_CLASS) +@Target(AnnotationTarget.ANNOTATION_CLASS) annotation class meta base class Outer { diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt index 8387782eb3f..24090b1c26f 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/nested.txt @@ -22,14 +22,14 @@ base() internal final class Outer { } } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() 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.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class meta : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class meta : kotlin.Annotation { public constructor meta() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.kt index 5ae884fc531..3a797212c78 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -target(AnnotationTarget.PROPERTY) annotation class base +@Target(AnnotationTarget.PROPERTY) annotation class base base annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt index 01bac8411b7..986ce6e8399 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/property.txt @@ -22,7 +22,7 @@ base() internal final enum class My : kotlin.Enum { public final /*synthesized*/ fun values(): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.kt index ccbb7aab7bc..1b37c9146ff 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.kt @@ -1,6 +1,6 @@ annotation class base -target(AnnotationTarget.TYPE) +@Target(AnnotationTarget.TYPE) annotation class typed base class My(val x: @base @typed Int, y: @base @typed Int) { diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt index 134aba571d9..cb260c87e8b 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/returntype.txt @@ -17,7 +17,7 @@ kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class typed : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class typed : kotlin.Annotation { public constructor typed() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.kt index d3f8e3d8a23..e72d05f670a 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.TYPE) annotation class base +@Target(AnnotationTarget.TYPE) annotation class base base annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt index 04e93a0e9e8..e6487e6cc35 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/type.txt @@ -22,7 +22,7 @@ base() internal final enum class My : kotlin.Enum { public final /*synthesized*/ fun values(): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.kt index 4a9b95b1a88..a64de9ac747 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -target(AnnotationTarget.VALUE_PARAMETER) annotation class base +@Target(AnnotationTarget.VALUE_PARAMETER) annotation class base base annotation class derived diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt index 15359a0dac5..aa0dfee9a08 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.txt @@ -22,7 +22,7 @@ base() internal final enum class My : kotlin.Enum { public final /*synthesized*/ fun values(): kotlin.Array } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final class base : kotlin.Annotation { public constructor base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.kt b/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.kt index 3a36e88c335..7a9eb0fe2b5 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.kt +++ b/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.kt @@ -6,7 +6,7 @@ unrepann(1) unrepann(2) class DoubleAnnotated ann(3) ann(7) ann(42) class TripleAnnotated -target(AnnotationTarget.EXPRESSION) annotation class annexpr +@Target(AnnotationTarget.EXPRESSION) annotation class annexpr ann(0) ann(1) fun foo(@ann(7) @ann(2) x: Int): Int { @annexpr @annexpr return x diff --git a/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt b/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt index 46577d01af5..37293186674 100644 --- a/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt +++ b/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt @@ -24,7 +24,7 @@ kotlin.annotation.annotation() internal final class ann : kotlin.Annotation { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class annexpr : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class annexpr : kotlin.Annotation { public constructor annexpr() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.kt b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.kt index d66724bf5d7..8777bd214f2 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.kt +++ b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.TYPE, AnnotationTarget.FUNCTION) +@Target(AnnotationTarget.TYPE, AnnotationTarget.FUNCTION) annotation class a interface A interface B diff --git a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt index b5b0b635cc4..588fc48992a 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.txt @@ -29,7 +29,7 @@ internal final class Outer { internal final fun B.(): kotlin.Unit } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class a : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE, AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class a : kotlin.Annotation { public constructor a() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.kt b/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.kt index b191ad37d03..d06fa5d2a08 100644 --- a/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.kt +++ b/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) annotation class foo fun f(s : String?) : Boolean { diff --git a/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt b/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt index 0e1cfbb02fd..a5040dd24ba 100644 --- a/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt +++ b/compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.txt @@ -2,7 +2,7 @@ package internal fun f(/*0*/ s: kotlin.String?): kotlin.Boolean -kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class foo : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.annotation() internal final class foo : kotlin.Annotation { public constructor foo() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.kt b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.kt index 7c999935f11..02d00521086 100644 --- a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.kt +++ b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.kt @@ -1,5 +1,5 @@ // !DIAGNOSTICS: -UNUSED_PARAMETER -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) @Retention(AnnotationRetention.SOURCE) @Repeatable annotation class Ann diff --git a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt index ec5da6c8fb0..c8e42f99245 100644 --- a/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt +++ b/compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.txt @@ -3,7 +3,7 @@ package internal fun bar(/*0*/ block: (T) -> kotlin.Int): kotlin.Unit internal fun foo(): kotlin.Unit -kotlin.annotation.target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.Repeatable() kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) kotlin.annotation.Repeatable() kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { public constructor Ann() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.kt index 8b8c11c4383..e460ad515b3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.kt @@ -1,10 +1,9 @@ // FILE: TargetUse.java -import kotlin.annotation.target; import java.lang.annotation.Target; public class TargetUse { - public static String foo(target aTarget) { + public static String foo(kotlin.annotation.Target aTarget) { return aTarget.toString(); } @@ -15,8 +14,8 @@ public class TargetUse { // FILE: TargetUse.kt -import java.lang.annotation.Target +import java.lang.annotation.Target as JTarget -fun fooUse(aTarget: target): String = TargetUse.foo(aTarget) +fun fooUse(aTarget: Target): String = TargetUse.foo(aTarget) -fun barUse(aTarget: Target): String = TargetUse.bar(aTarget) +fun barUse(aTarget: JTarget): String = TargetUse.bar(aTarget) diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.txt index 30313eda340..7e2c89e2f25 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.txt @@ -1,7 +1,7 @@ package internal fun barUse(/*0*/ aTarget: java.lang.annotation.Target): kotlin.String -internal fun fooUse(/*0*/ aTarget: kotlin.annotation.target): kotlin.String +internal fun fooUse(/*0*/ aTarget: kotlin.annotation.Target): kotlin.String public open class TargetUse { public constructor TargetUse() @@ -11,5 +11,5 @@ public open class TargetUse { // Static members public open fun bar(/*0*/ aTarget: java.lang.annotation.Target!): kotlin.String! - public open fun foo(/*0*/ aTarget: kotlin.annotation.target!): kotlin.String! + public open fun foo(/*0*/ aTarget: kotlin.annotation.Target!): kotlin.String! } diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt index 16fe37893ee..7dacabd815a 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.txt @@ -3,7 +3,7 @@ package test public open class AnnotationTargets { public constructor AnnotationTargets() - kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final class annotation : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) public final class annotation : kotlin.Annotation { public constructor annotation() } @@ -11,35 +11,35 @@ public open class AnnotationTargets { public constructor base() } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final class constructor : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) public final class constructor : kotlin.Annotation { public constructor constructor() } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.FIELD}) public final class field : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD}) public final class field : kotlin.Annotation { public constructor field() } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final class local : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) public final class local : kotlin.Annotation { public constructor local() } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) public final class method : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER}) public final class method : kotlin.Annotation { public constructor method() } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD}) public final class multiple : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD}) public final class multiple : kotlin.Annotation { public constructor multiple() } - kotlin.annotation.target(allowedTargets = {}) public final class packag : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {}) public final class packag : kotlin.Annotation { public constructor packag() } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final class parameter : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) public final class parameter : kotlin.Annotation { public constructor parameter() } - kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FILE}) public final class type : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FILE}) public final class type : kotlin.Annotation { public constructor type() } } diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt index ff291941228..dd3fd4e0969 100644 --- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt +++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt @@ -2,7 +2,7 @@ package test public interface ArrayOfEnumInParam { - kotlin.annotation.target(allowedTargets = {AnnotationTarget.FIELD, AnnotationTarget.CONSTRUCTOR}) public final class targetAnnotation : kotlin.Annotation { + kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FIELD, AnnotationTarget.CONSTRUCTOR}) public final class targetAnnotation : kotlin.Annotation { public constructor targetAnnotation(/*0*/ value: kotlin.String) public final val value: kotlin.String public abstract fun value(): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt index 5127231dbc9..100387765f2 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt @@ -2,5 +2,5 @@ package test -target(AnnotationTarget.CLASSIFIER) +@Target(AnnotationTarget.CLASSIFIER) public annotation class TargetedAnnotation diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt index fab329677cf..31954a15408 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.txt @@ -1,5 +1,5 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() public final class TargetedAnnotation : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() public final class TargetedAnnotation : kotlin.Annotation { /*primary*/ public constructor TargetedAnnotation() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt index cb32b4da07a..622440a53c3 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt @@ -1,7 +1,7 @@ //ALLOW_AST_ACCESS package test -target(AnnotationTarget.TYPE) +@Target(AnnotationTarget.TYPE) annotation class A fun @A String.foo() {} diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt index 1aea8d9d3f4..519939a9585 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.txt @@ -2,6 +2,6 @@ package test internal fun @[test.A()] kotlin.String.foo(): kotlin.Unit -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class A : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt index 2e545ac8769..c1f3ef7c6ef 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt @@ -2,7 +2,7 @@ package test -target(AnnotationTarget.TYPE) +@Target(AnnotationTarget.TYPE) annotation class A class SimpleTypeAnnotation { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt index e28ef2829f2..7ec7ad67ca8 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt @@ -1,6 +1,6 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class A : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class A : kotlin.Annotation { /*primary*/ public constructor A() } diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt index 40278100b5a..1cb3cbca6f6 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt @@ -2,7 +2,7 @@ package test -target(AnnotationTarget.TYPE) +@Target(AnnotationTarget.TYPE) annotation class Ann(val x: String, val y: Double) class TypeAnnotationWithArguments { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt index f7a5831e0ac..4ba5afc61ef 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt @@ -1,6 +1,6 @@ package test -kotlin.annotation.target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { /*primary*/ public constructor Ann(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Double) internal final val x: kotlin.String internal final fun (): kotlin.String diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt index 7de05aeb649..85577c83616 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt @@ -1,7 +1,7 @@ //ALLOW_AST_ACCESS package test -target(AnnotationTarget.VALUE_PARAMETER) +@Target(AnnotationTarget.VALUE_PARAMETER) annotation class Ann class A { diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt index e5c78579137..e4c41aa1b2a 100644 --- a/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt +++ b/compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt @@ -10,6 +10,6 @@ internal final class A { internal final fun @receiver:test.Ann() kotlin.String.myLength(/*0*/ test.Ann() q: kotlin.String): kotlin.Int } -kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { +kotlin.annotation.Target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final class Ann : kotlin.Annotation { /*primary*/ public constructor Ann() } diff --git a/compiler/testData/psi/annotation/options/options.kt b/compiler/testData/psi/annotation/options/options.kt index f51b6127ec7..0cbf31c14c2 100644 --- a/compiler/testData/psi/annotation/options/options.kt +++ b/compiler/testData/psi/annotation/options/options.kt @@ -8,5 +8,5 @@ annotation(Retention.BINARY, false) class ann2 annotation(retention = Retention.RUNTIME) class ann3 -target(Target.FUNCTION, Target.CLASSIFIER, Target.EXPRESSION) +@Target(Target.FUNCTION, Target.CLASSIFIER, Target.EXPRESSION) annotation(Retention.SOURCE) class ann4 \ No newline at end of file diff --git a/compiler/testData/psi/annotation/options/options.txt b/compiler/testData/psi/annotation/options/options.txt index 0352a3b4644..dd5c4902909 100644 --- a/compiler/testData/psi/annotation/options/options.txt +++ b/compiler/testData/psi/annotation/options/options.txt @@ -117,11 +117,12 @@ JetFile: options.kt CLASS MODIFIER_LIST ANNOTATION_ENTRY + PsiElement(AT)('@') CONSTRUCTOR_CALLEE TYPE_REFERENCE USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('target') + PsiElement(IDENTIFIER)('Target') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/core/builtins/src/kotlin/Annotations.kt b/core/builtins/src/kotlin/Annotations.kt index 1062d8ad5ba..268e4b816ba 100644 --- a/core/builtins/src/kotlin/Annotations.kt +++ b/core/builtins/src/kotlin/Annotations.kt @@ -26,7 +26,7 @@ import kotlin.annotation.AnnotationTarget.* * See [the Kotlin language documentation](http://kotlinlang.org/docs/reference/data-classes.html) * for more information. */ -target(CLASSIFIER) +@Target(CLASSIFIER) @MustBeDocumented public annotation class data @@ -36,8 +36,8 @@ public annotation class data * @property replaceWith if present, specifies a code fragment which should be used as a replacement for * the deprecated API usage. */ -target(CLASSIFIER, FUNCTION, PROPERTY, ANNOTATION_CLASS, CONSTRUCTOR, PROPERTY_SETTER, PROPERTY_GETTER, - LOCAL_VARIABLE, VALUE_PARAMETER) +@Target(CLASSIFIER, FUNCTION, PROPERTY, ANNOTATION_CLASS, CONSTRUCTOR, PROPERTY_SETTER, PROPERTY_GETTER, + LOCAL_VARIABLE, VALUE_PARAMETER) @MustBeDocumented public annotation class Deprecated(val value: String, val replaceWith: ReplaceWith = ReplaceWith("")) @@ -54,7 +54,7 @@ public annotation class Deprecated(val value: String, val replaceWith: ReplaceWi * @property imports the qualified names that need to be imported in order for the references in the * replacement expression to be resolved correctly. */ -target() +@Target() @Retention(BINARY) @MustBeDocumented public annotation class ReplaceWith(val expression: String, vararg val imports: String) @@ -62,7 +62,7 @@ public annotation class ReplaceWith(val expression: String, vararg val imports: /** * Signifies that the annotated functional type represents an extension function. */ -target(TYPE) +@Target(TYPE) @MustBeDocumented public annotation class Extension @@ -70,8 +70,8 @@ public annotation class Extension * Suppresses the given compilation warnings in the annotated element. * @property names names of the compiler diagnostics to suppress. */ -target(CLASSIFIER, ANNOTATION_CLASS, PROPERTY, FIELD, LOCAL_VARIABLE, VALUE_PARAMETER, - CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, TYPE, EXPRESSION, FILE) +@Target(CLASSIFIER, ANNOTATION_CLASS, PROPERTY, FIELD, LOCAL_VARIABLE, VALUE_PARAMETER, + CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, TYPE, EXPRESSION, FILE) @Retention(SOURCE) public annotation class Suppress(vararg val names: String) @@ -81,12 +81,12 @@ public annotation class Suppress(vararg val names: String) * growing the stack depth. Tail call optimization is currently only supported by the JVM * backend. */ -target(FUNCTION) +@Target(FUNCTION) // @deprecated("Use kotlin.tailrec instead", ReplaceWith("kotlin.tailrec")) @Retention(SOURCE) public annotation class tailRecursive -target(FUNCTION) +@Target(FUNCTION) @Retention(SOURCE) public annotation class tailrec @@ -95,7 +95,7 @@ public annotation class tailrec * thus preventing its usages from newly compiled code, but keeps compiling it * to retain binary compatibility with the code compiled against it before. */ -target(FUNCTION, PROPERTY, CONSTRUCTOR) +@Target(FUNCTION, PROPERTY, CONSTRUCTOR) @Retention(BINARY) @MustBeDocumented public annotation class HiddenDeclaration @@ -104,7 +104,7 @@ public annotation class HiddenDeclaration * Marks annotated function as `external`, meaning that it's not implemented * in Kotlin but rather in a different language (for example, in C/C++ using JNI or JavaScript). */ -target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) @Retention(SOURCE) @MustBeDocumented public annotation class external diff --git a/core/builtins/src/kotlin/Inline.kt b/core/builtins/src/kotlin/Inline.kt index 5a14c6f6910..1e5be53d2e1 100644 --- a/core/builtins/src/kotlin/Inline.kt +++ b/core/builtins/src/kotlin/Inline.kt @@ -20,7 +20,7 @@ package kotlin * Annotates the parameter of a function annotated as [inline] and forbids inlining of * function literals passed as arguments for this parameter. */ -target(AnnotationTarget.VALUE_PARAMETER) +@Target(AnnotationTarget.VALUE_PARAMETER) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented public annotation class noinline @@ -36,7 +36,7 @@ public annotation class noinline * @see noinline * @see inlineOptions */ -target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY) +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented public annotation class inline(public val strategy: InlineStrategy = InlineStrategy.AS_FUNCTION) @@ -67,7 +67,7 @@ public enum class InlineStrategy { * * @property value the inlining options selected for the annotated function parameter. */ -target(AnnotationTarget.VALUE_PARAMETER) +@Target(AnnotationTarget.VALUE_PARAMETER) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented public annotation class inlineOptions(vararg val value: InlineOption) diff --git a/core/builtins/src/kotlin/annotation/Annotations.kt b/core/builtins/src/kotlin/annotation/Annotations.kt index 1b4c35ed93e..1d2c477c355 100644 --- a/core/builtins/src/kotlin/annotation/Annotations.kt +++ b/core/builtins/src/kotlin/annotation/Annotations.kt @@ -72,15 +72,15 @@ public enum class AnnotationRetention { * * @property allowedTargets list of allowed annotation targets */ -target(AnnotationTarget.ANNOTATION_CLASS) +@Target(AnnotationTarget.ANNOTATION_CLASS) @MustBeDocumented -public annotation class target(vararg val allowedTargets: AnnotationTarget) +public annotation class Target(vararg val allowedTargets: AnnotationTarget) /** * This special meta-annotation is used to declare an annotation. * So a class in Kotlin is an annotation if and only if it has the "annotation" meta-annotation. */ -target(AnnotationTarget.ANNOTATION_CLASS) +@Target(AnnotationTarget.ANNOTATION_CLASS) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented public annotation class annotation @@ -90,17 +90,17 @@ public annotation class annotation * * @property value necessary annotation retention (RUNTIME, BINARY or SOURCE) */ -target(AnnotationTarget.ANNOTATION_CLASS) +@Target(AnnotationTarget.ANNOTATION_CLASS) public annotation class Retention(val value: AnnotationRetention = AnnotationRetention.RUNTIME) /** * This meta-annotation determines that an annotation is applicable twice or more on a single code element */ -target(AnnotationTarget.ANNOTATION_CLASS) +@Target(AnnotationTarget.ANNOTATION_CLASS) public annotation class Repeatable /** * This meta-annotation determines that an annotation is a part of public API and therefore must be documented */ -target(AnnotationTarget.ANNOTATION_CLASS) +@Target(AnnotationTarget.ANNOTATION_CLASS) public annotation class MustBeDocumented \ No newline at end of file diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt index 97a9a73a48f..a24577a94d4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt @@ -172,7 +172,7 @@ public object JavaAnnotationTargetMapper { public fun mapJavaTargetArgumentByName(argumentName: String?): Set = targetNameLists[argumentName] ?: emptySet() public fun mapJavaTargetArguments(arguments: List, builtIns: KotlinBuiltIns): ConstantValue<*>? { - // Map arguments: java.lang.annotation.Target -> kotlin.annotation.target + // Map arguments: java.lang.annotation.Target -> kotlin.annotation.Target val kotlinTargets = arguments.filterIsInstance() .flatMap { mapJavaTargetArgumentByName(it.resolve()?.name?.asString()) } .map { builtIns.getAnnotationTargetEnumEntry(it) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 5590e988b70..c60f34ea41c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -182,7 +182,7 @@ public class KotlinBuiltIns { public final FqName noinline = fqName("noinline"); public final FqName inlineOptions = fqName("inlineOptions"); public final FqName extension = fqName("Extension"); - public final FqName target = annotationName("target"); + public final FqName target = annotationName("Target"); public final FqName annotation = annotationName("annotation"); public final FqName annotationTarget = annotationName("AnnotationTarget"); public final FqName annotationRetention = annotationName("AnnotationRetention"); diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/DecapitalizedAnnotationScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/DecapitalizedAnnotationScope.kt index 8bd69f81a89..08896ebff39 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/DecapitalizedAnnotationScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/DecapitalizedAnnotationScope.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe val DECAPITALIZED_DEPRECATED_ANNOTATIONS = arrayOf( "Deprecated", "Extension", "Suppress", "Throws", "jvm.Volatile", "jvm.Transient", "jvm.Strictfp", "jvm.Synchronized", - "jvm.JvmOverloads", "jvm.JvmName", "jvm.JvmStatic" + "jvm.JvmOverloads", "jvm.JvmName", "jvm.JvmStatic", "annotation.Target" ).map { FqName("kotlin.$it") }.toSet() val DECAPITALIZED_SHORT_NAMES = DECAPITALIZED_DEPRECATED_ANNOTATIONS.map { it.shortName().asString().decapitalize() }.toSet() diff --git a/core/runtime.jvm/src/kotlin/jvm/PurelyImplements.kt b/core/runtime.jvm/src/kotlin/jvm/PurelyImplements.kt index b34e0bb1c1a..c11a404a98a 100644 --- a/core/runtime.jvm/src/kotlin/jvm/PurelyImplements.kt +++ b/core/runtime.jvm/src/kotlin/jvm/PurelyImplements.kt @@ -34,7 +34,7 @@ package kotlin.jvm * MyList().add(null) // Error * MyList().add(null) // Ok */ -target(AnnotationTarget.CLASSIFIER) +@Target(AnnotationTarget.CLASSIFIER) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented public annotation class PurelyImplements(public val value: String) diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/Intrinsic.kt b/core/runtime.jvm/src/kotlin/jvm/internal/Intrinsic.kt index 6d2abb4b699..7fad604aaae 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/Intrinsic.kt +++ b/core/runtime.jvm/src/kotlin/jvm/internal/Intrinsic.kt @@ -16,6 +16,6 @@ package kotlin.jvm.internal -target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY) +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY) @Retention(AnnotationRetention.RUNTIME) public annotation class Intrinsic(val value: String) diff --git a/idea/idea-completion/testData/basic/common/annotations/AnnotationTarget.kt b/idea/idea-completion/testData/basic/common/annotations/AnnotationTarget.kt index b5aeaea8b6c..f06aa54f499 100644 --- a/idea/idea-completion/testData/basic/common/annotations/AnnotationTarget.kt +++ b/idea/idea-completion/testData/basic/common/annotations/AnnotationTarget.kt @@ -1,3 +1,3 @@ annotation class Annotated -// EXIST: target +// EXIST: Target diff --git a/idea/testData/checker/AnnotationOnFile.kt b/idea/testData/checker/AnnotationOnFile.kt index 8a5547b25ac..7f2a7be0e1f 100644 --- a/idea/testData/checker/AnnotationOnFile.kt +++ b/idea/testData/checker/AnnotationOnFile.kt @@ -19,7 +19,7 @@ package boo val BAZ = "baz" val N = 0 -target(AnnotationTarget.FILE) +@Target(AnnotationTarget.FILE) @Retention(AnnotationRetention.SOURCE) @Repeatable annotation class myAnnotation(val i: Int, val s: String) diff --git a/idea/testData/decompiler/decompiledText/Annotations/Dependency.kt b/idea/testData/decompiler/decompiledText/Annotations/Dependency.kt index b43d7999b16..65918ca39aa 100644 --- a/idea/testData/decompiler/decompiledText/Annotations/Dependency.kt +++ b/idea/testData/decompiler/decompiledText/Annotations/Dependency.kt @@ -1,13 +1,13 @@ package dependency -target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, - AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE) +@Target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, + AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE) annotation class A(val s: String) -target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, - AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE) +@Target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, + AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.TYPE) annotation class B(val i: Int) -target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, - AnnotationTarget.VALUE_PARAMETER) +@Target(AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, + AnnotationTarget.VALUE_PARAMETER) annotation class C diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt index 5fa02937843..856bf16e199 100644 --- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt +++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.kt @@ -25,13 +25,13 @@ a public class Annotations private @a constructor(private @property:a @param:a v fun types(param: @a @b(E.E1) DoubleRange): @a @b(E.E2) Unit {} } -target(AnnotationTarget.PROPERTY, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.FUNCTION, - AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, - AnnotationTarget.TYPE, AnnotationTarget.CLASSIFIER) +@Target(AnnotationTarget.PROPERTY, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.FUNCTION, + AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, + AnnotationTarget.TYPE, AnnotationTarget.CLASSIFIER) annotation class a -target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION, AnnotationTarget.CLASSIFIER, - AnnotationTarget.CONSTRUCTOR, AnnotationTarget.TYPE) +@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION, AnnotationTarget.CLASSIFIER, + AnnotationTarget.CONSTRUCTOR, AnnotationTarget.TYPE) @Retention(AnnotationRetention.SOURCE) @Repeatable annotation class b(val e: E) diff --git a/idea/testData/intentions/convertToBlockBody/annotatedExpr.kt b/idea/testData/intentions/convertToBlockBody/annotatedExpr.kt index 04d788b43ee..4185583095b 100644 --- a/idea/testData/intentions/convertToBlockBody/annotatedExpr.kt +++ b/idea/testData/intentions/convertToBlockBody/annotatedExpr.kt @@ -1,4 +1,4 @@ -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) annotation class ann fun foo(): Int = @ann 1 \ No newline at end of file diff --git a/idea/testData/intentions/convertToBlockBody/annotatedExpr.kt.after b/idea/testData/intentions/convertToBlockBody/annotatedExpr.kt.after index 33e6615c957..ceae330f3c4 100644 --- a/idea/testData/intentions/convertToBlockBody/annotatedExpr.kt.after +++ b/idea/testData/intentions/convertToBlockBody/annotatedExpr.kt.after @@ -1,4 +1,4 @@ -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) annotation class ann fun foo(): Int { diff --git a/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt b/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt index 7a193109653..9a18d2346e7 100644 --- a/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt +++ b/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt @@ -4,5 +4,5 @@ fun foo() { @ann ""!! } -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) annotation class ann \ No newline at end of file diff --git a/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt.after b/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt.after index ba9de61828f..161c86e65d0 100644 --- a/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt.after +++ b/idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt.after @@ -5,5 +5,5 @@ fun foo() { @ann ""!! } -target(AnnotationTarget.EXPRESSION) +@Target(AnnotationTarget.EXPRESSION) annotation class ann \ No newline at end of file diff --git a/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt index 40ec510338b..315e79c8731 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt @@ -129,8 +129,8 @@ class AnnotationConverter(private val converter: Converter) { Identifier(name, false).assignNoPrototype()) } } - return Annotation(Identifier("target").assignNoPrototype(), - deferredExpressionList, withAt, newLineAfter).assignPrototype(annotation) + return Annotation(Identifier("Target").assignNoPrototype(), + deferredExpressionList, true, newLineAfter).assignPrototype(annotation) } val nameRef = annotation.getNameReferenceElement() diff --git a/j2k/testData/fileOrElement/annotations/annotationInterface1.kt b/j2k/testData/fileOrElement/annotations/annotationInterface1.kt index 2c8c05d3f25..e4654208c47 100644 --- a/j2k/testData/fileOrElement/annotations/annotationInterface1.kt +++ b/j2k/testData/fileOrElement/annotations/annotationInterface1.kt @@ -2,11 +2,11 @@ annotation class Anon(public val stringArray: Array, public val intArray public val string: String) Anon(string = "a", stringArray = arrayOf("a", "b"), intArray = intArrayOf(1, 2)) -target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD) +@Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FIELD) annotation class I -target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) annotation class J -target +@Target annotation class K diff --git a/js/js.libraries/src/core/annotations.kt b/js/js.libraries/src/core/annotations.kt index 89bdeae8838..e3fcaa9921c 100644 --- a/js/js.libraries/src/core/annotations.kt +++ b/js/js.libraries/src/core/annotations.kt @@ -19,31 +19,31 @@ package kotlin.js import kotlin.annotation.AnnotationTarget.* native -target(CLASSIFIER, FUNCTION, PROPERTY, CONSTRUCTOR, VALUE_PARAMETER) +@Target(CLASSIFIER, FUNCTION, PROPERTY, CONSTRUCTOR, VALUE_PARAMETER) public annotation class native(public val name: String = "") native -target(FUNCTION) +@Target(FUNCTION) public annotation class nativeGetter native -target(FUNCTION) +@Target(FUNCTION) public annotation class nativeSetter native -target(FUNCTION) +@Target(FUNCTION) public annotation class nativeInvoke native -target(CLASSIFIER, FUNCTION, PROPERTY) +@Target(CLASSIFIER, FUNCTION, PROPERTY) public annotation class library(public val name: String = "") native -target(PROPERTY) +@Target(PROPERTY) public annotation class enumerable() // TODO make it "internal" or "fake" native -target(CLASSIFIER) +@Target(CLASSIFIER) deprecated("Do not use this annotation: it is for internal use only") public annotation class marker \ No newline at end of file diff --git a/js/js.libraries/src/core/annotationsJVM.kt b/js/js.libraries/src/core/annotationsJVM.kt index a56e6095ced..b22aa4b5b85 100644 --- a/js/js.libraries/src/core/annotationsJVM.kt +++ b/js/js.libraries/src/core/annotationsJVM.kt @@ -17,6 +17,6 @@ package kotlin.jvm // is used in common generated code in stdlib -target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR) +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR) @Retention(AnnotationRetention.SOURCE) internal annotation class jvmOverloads diff --git a/js/js.libraries/src/core/concurrent.kt b/js/js.libraries/src/core/concurrent.kt index a8df2933db5..41525b457f6 100644 --- a/js/js.libraries/src/core/concurrent.kt +++ b/js/js.libraries/src/core/concurrent.kt @@ -24,12 +24,12 @@ import kotlin.InlineOption.ONLY_LOCAL_RETURN // They was reserved word in ECMAScript 2, but is not since ECMAScript 5. native -target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD) +@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD) @Retention(AnnotationRetention.SOURCE) public annotation class volatile native -target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) @Retention(AnnotationRetention.SOURCE) public annotation class synchronized diff --git a/libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt b/libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt index b5d2ec16123..2d9994f45cb 100644 --- a/libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt +++ b/libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt @@ -22,7 +22,7 @@ import kotlin.annotation.AnnotationTarget.* * Marks the JVM backing field of the annotated property as `volatile`, meaning that writes to this field * are immediately made visible to other threads. */ -target(FIELD) +@Target(FIELD) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented public annotation class Volatile @@ -31,7 +31,7 @@ public annotation class Volatile * Marks the JVM backing field of the annotated property as `transient`, meaning that it is not * part of the default serialized form of the object. */ -target(FIELD) +@Target(FIELD) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented public annotation class Transient @@ -41,7 +41,7 @@ public annotation class Transient * of floating point operations performed inside the method needs to be restricted in order to * achieve better portability. */ -target(FUNCTION, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER, CLASSIFIER) +@Target(FUNCTION, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER, CLASSIFIER) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented public annotation class Strictfp @@ -51,7 +51,7 @@ public annotation class Strictfp * will be protected from concurrent execution by multiple threads by the monitor of the instance (or, * for static methods, the class) on which the method is defined. */ -target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented public annotation class Synchronized @@ -60,7 +60,7 @@ public annotation class Synchronized * Marks the JVM method generated from the annotated function as `native`, meaning that it's not implemented * in Java but rather in a different language (for example, in C/C++ using JNI). */ -target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented @deprecated("Use kotlin.external instead", ReplaceWith("kotlin.external")) diff --git a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt index 7155fb9c55b..b905b97ea15 100644 --- a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt +++ b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt @@ -22,7 +22,7 @@ package kotlin.jvm * If a method has N parameters and M of which have default values, M overloads are generated: the first one * takes N-1 parameters (all but the last one that takes a default value), the second takes N-2 parameters, and so on. */ -target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR) +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR) @Retention(AnnotationRetention.BINARY) @MustBeDocumented public annotation class JvmOverloads @@ -33,7 +33,7 @@ public annotation class JvmOverloads * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#static-methods-and-fields) * for more information. */ -target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented public annotation class JvmStatic @@ -45,7 +45,7 @@ public annotation class JvmStatic * for more information. * @property name the name of the element. */ -target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) +@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented public annotation class JvmName(public val name: String) @@ -53,7 +53,7 @@ public annotation class JvmName(public val name: String) /** * Instructs the Kotlin compiler to generate a public backing field for this property. */ -target(AnnotationTarget.FIELD) +@Target(AnnotationTarget.FIELD) @Retention(AnnotationRetention.SOURCE) @MustBeDocumented public annotation class publicField \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/platform/annotations.kt b/libraries/stdlib/src/kotlin/platform/annotations.kt index e182a2060eb..056c780ebfc 100644 --- a/libraries/stdlib/src/kotlin/platform/annotations.kt +++ b/libraries/stdlib/src/kotlin/platform/annotations.kt @@ -18,13 +18,13 @@ package kotlin.platform import kotlin.annotation.AnnotationTarget.* -target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented @deprecated("Use kotlin.jvm.JvmName instead", ReplaceWith("kotlin.jvm.JvmName")) public annotation class platformName(public val name: String) -target(FUNCTION, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented @deprecated("Use kotlin.jvm.JvmStatic instead", ReplaceWith("kotlin.jvm.JvmStatic"))