Adjust testData: get rid of obsolete annotations

compiler/testData/asJava/annotations/ExtraAnnotations.kt

@@ -1,4 +1,4 @@
 annotation class Foo(val s: String)
 
-[Foo("...")]
+@Foo("...")
 class ExtraAnnotations

compiler/testData/asJava/lightClassStructure/Declared.kt

@@ -29,9 +29,9 @@ interface Trait
 deprecated("") class Deprecated
 kotlin.deprecated("") class DeprecatedFQN
 kotlin. deprecated /**/ ("") class DeprecatedFQNSpaces
-[deprecated("")] class DeprecatedWithBrackets
+@[deprecated("")] class DeprecatedWithBrackets
-[kotlin.deprecated("")] class DeprecatedWithBracketsFQN
+@[kotlin.deprecated("")] class DeprecatedWithBracketsFQN
-[kotlin
+@[kotlin
 ./**/deprecated  ("")] class DeprecatedWithBracketsFQNSpaces
 
 // Generic

compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt

@@ -19,16 +19,16 @@ class Class {
     var notNullVar: String = ""
 
     val notNullValWithGet: String
-        [Nullable] get() = ""
+        @[Nullable] get() = ""
 
     var notNullVarWithGetSet: String
-        [Nullable] get() = ""
+        @[Nullable] get() = ""
-        [Nullable] set(v) {}
+        @[Nullable] set(v) {}
 
     val nullableValWithGet: String?
-        [NotNull] get() = ""
+        @[NotNull] get() = ""
 
     var nullableVarWithGetSet: String?
-        [NotNull] get() = ""
+        @[NotNull] get() = ""
-        [NotNull] set(v) {}
+        @[NotNull] set(v) {}
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt

@@ -1,7 +1,7 @@
 // C
 
 class C {
-    [kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", s1: String, k: String = "K", s2: String?): String {
+    @[kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", s1: String, k: String = "K", s2: String?): String {
         return o + k
     }
 }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt

@@ -18,18 +18,18 @@ val notNullVal: String = ""
 var notNullVar: String = ""
 
 val notNullValWithGet: String
-    [Nullable] get() = ""
+    @[Nullable] get() = ""
 
 var notNullVarWithGetSet: String
-    [Nullable] get() = ""
+    @[Nullable] get() = ""
-    [Nullable] set(v) {}
+    @[Nullable] set(v) {}
 
 val nullableValWithGet: String?
-    [NotNull] get() = ""
+    @[NotNull] get() = ""
 
 var nullableVarWithGetSet: String?
-    [NotNull] get() = ""
+    @NotNull get() = ""
-    [NotNull] set(v) {}
+    @NotNull set(v) {}
 
 private val privateNn: String = ""
 private val privateN: String? = ""

compiler/testData/codegen/box/functions/functionExpression/functionExpression.kt

@@ -18,7 +18,7 @@ fun box() : String {
     if(  1.(fun Int.(i: Int) = i + this)(1) != 2) return "test 6 failed";
     if(  (fooT1<String>()("mama")) != "mama")  return "test 7 failed";
 
-    val a = [A] fun Int.() = this + 1
+    val a = @A fun Int.() = this + 1
     if (1.a() != 2) return "test 8 failed"
     val b = ( fun Int.() = this + 1)
     if (1.b() != 2) return "test 9 failed"

compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithName.kt

@@ -18,7 +18,7 @@ fun box() : String {
     if(  1.(fun Int.name(i: Int) = i + this)(1) != 2) return "test 6 failed";
     if(  (fooT1<String>()("mama")) != "mama")  return "test 7 failed";
 
-    val a = [A] fun Int.name() = this + 1 // name
+    val a = @A fun Int.name() = this + 1 // name
     if (1.a() != 2) return "test 8 failed"
     val b = ( fun Int.name() = this + 1)
     if (1.b() != 2) return "test 9 failed"

compiler/testData/codegen/box/localClasses/kt3389.kt

@@ -3,7 +3,7 @@ package t
 class Reproduce {
 
     fun test(): String {
-        [data] class Foo(val bar: String, val baz: Int)
+        @data class Foo(val bar: String, val baz: Int)
         val foo = Foo("OK", 5)
         return foo.bar
     }

compiler/testData/codegen/box/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.kt

@@ -1,9 +1,9 @@
 annotation class Anno
 
-[Anno] val Int.foo: Int
+@Anno val Int.foo: Int
     get() = this
 
-[Anno] val String.foo: Int
+@Anno val String.foo: Int
     get() = 42
 
 fun box() = if (42.foo == 42 && "OK".foo == 42) "OK" else "Fail"

compiler/testData/codegen/boxInline/simple/simpleEnum.2.kt

@@ -4,7 +4,7 @@ enum class MyEnum {
     K;
 
     //TODO: KT-4693
-    [inline] fun <T> doSmth(a: T) : String {
+    @inline fun <T> doSmth(a: T) : String {
         return a.toString() + K.name()
     }
 }

compiler/testData/codegen/boxWithJava/jvmOverloads/generics/generics.kt

@@ -1,5 +1,5 @@
 class C<T> {
-    [kotlin.jvm.jvmOverloads] public fun foo(o: T, k: String = "K"): String = o.toString() + k
+    @kotlin.jvm.jvmOverloads public fun foo(o: T, k: String = "K"): String = o.toString() + k
 }
 
 fun box(): String {

compiler/testData/codegen/boxWithJava/jvmOverloads/simple/simple.kt

@@ -1,5 +1,5 @@
 class C {
-    [kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", k: String = "K"): String = o + k
+    @kotlin.jvm.jvmOverloads public fun foo(o: String = "O", k: String = "K"): String = o + k
 }
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt

@@ -9,12 +9,12 @@ Retention(RetentionPolicy.RUNTIME)
 annotation class Second(val value: String)
 
 enum class E {
-    [First]
+    @First
     E1 {
         fun foo() = "something"
     }
 
-    [Second("OK")]
+    @Second("OK")
     E2
 }
 

compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt

@@ -23,7 +23,7 @@ fun testClass(clazz: Class<*>, name: String) {
 }
 
 fun box(): String {
-    testClass(foo0([Ann("OK")] { }), "1")
+    testClass(foo0(@Ann("OK") { }), "1")
     testClass(foo0( @Ann("OK") { }), "2")
 
     testClass(foo0() @Ann("OK") { }, "3")

compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt

@@ -5,7 +5,7 @@ annotation class First
 
 class MyClass() {
     public var x: String by Delegate()
-        [First] set
+        @First set
 }
 
 class Delegate {

compiler/testData/codegen/boxWithStdlib/callableReference/property/platformNamedAccessors.kt

@@ -2,9 +2,9 @@ import kotlin.platform.platformName
 import kotlin.reflect.jvm.*
 
 var state: String = "value"
-    [platformName("getter")]
+    @platformName("getter")
     get
-    [platformName("setter")]
+    @platformName("setter")
     set
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt

@@ -1,27 +1,27 @@
 class C {
     companion object {
         val defaultGetter: Int = 1
-            [native] get
+            @native get
 
         var defaultSetter: Int = 1
-            [native] get
+            @native get
-            [native] set
+            @native set
     }
 
     val defaultGetter: Int = 1
-        [native] get
+        @native get
 
     var defaultSetter: Int = 1
-        [native] get
+        @native get
-        [native] set
+        @native set
 }
 
 val defaultGetter: Int = 1
-    [native] get
+    @native get
 
 var defaultSetter: Int = 1
-    [native] get
+    @native get
-    [native] set
+    @native set
 
 fun check(body: () -> Unit, signature: String): String? {
     try {

compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt

@@ -1,6 +1,6 @@
 class C {
     companion object {
-        [kotlin.platform.platformStatic] [kotlin.jvm.jvmOverloads] public fun foo(o: String, k: String = "K"): String {
+        @kotlin.platform.platformStatic @kotlin.jvm.jvmOverloads public fun foo(o: String, k: String = "K"): String {
             return o + k
         }
     }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt

@@ -1,5 +1,5 @@
 class C {
-    [kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", i1: Int, k: String = "K", i2: Int): String {
+    @kotlin.jvm.jvmOverloads public fun foo(o: String = "O", i1: Int, k: String = "K", i2: Int): String {
         return o + k
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt

@@ -1,5 +1,5 @@
 class C {
-    [kotlin.jvm.jvmOverloads] public fun foo(d1: Double, d2: Double, status: String = "OK"): String {
+    @kotlin.jvm.jvmOverloads public fun foo(d1: Double, d2: Double, status: String = "OK"): String {
         return if (d1 + d2 == 3.0) status else "fail"
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt

@@ -1,7 +1,7 @@
 class C {
 }
 
-[kotlin.jvm.jvmOverloads] fun C.foo(o: String, k: String = "K"): String {
+@kotlin.jvm.jvmOverloads fun C.foo(o: String, k: String = "K"): String {
     return o + k
 }
 

compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt

@@ -1,5 +1,5 @@
 class C {
-    [kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", k: String = "K"): String {
+    @kotlin.jvm.jvmOverloads public fun foo(o: String = "O", k: String = "K"): String {
         return o + k
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt

@@ -1,5 +1,5 @@
 class C {
-    [kotlin.jvm.jvmOverloads] public fun foo(o: String, k: String = "K"): String {
+    @kotlin.jvm.jvmOverloads public fun foo(o: String, k: String = "K"): String {
         return o + k
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt

@@ -1,4 +1,4 @@
-class C [kotlin.jvm.jvmOverloads] (s1: String, s2: String = "K") {
+class C @kotlin.jvm.jvmOverloads constructor(s1: String, s2: String = "K") {
     public val status: String = s1 + s2
 }
 

compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt

@@ -1,7 +1,7 @@
 class C(val i: Int) {
     var status = "fail"
 
-    [kotlin.jvm.jvmOverloads] constructor(o: String, k: String = "K"): this(-1) {
+    @kotlin.jvm.jvmOverloads constructor(o: String, k: String = "K"): this(-1) {
         status = o + k
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt

@@ -1,5 +1,5 @@
 class C {
-    [kotlin.jvm.jvmOverloads] public fun foo(s: String = "OK"): String {
+    @kotlin.jvm.jvmOverloads public fun foo(s: String = "OK"): String {
         return s
     }
 }

compiler/testData/codegen/boxWithStdlib/platformNames/callableReference.kt

@@ -1,6 +1,6 @@
 import kotlin.platform.*
 
-[platformName("bar")]
+@platformName("bar")
 fun foo() = "foo"
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/platformNames/clashingErasure.kt

@@ -2,7 +2,7 @@ import kotlin.platform.*
 
 fun <T> List<T>.foo() = "foo"
 
-[platformName("fooInt")]
+@platformName("fooInt")
 fun List<Int>.foo() = "fooInt"
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/platformNames/functionName.kt

@@ -1,6 +1,6 @@
 import kotlin.platform.*
 
-[platformName("bar")]
+@platformName("bar")
 fun foo() = "foo"
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/platformNames/propertyName.kt

@@ -1,9 +1,9 @@
 import kotlin.platform.*
 
 var v: Int = 1
-    [platformName("vget")]
+    @platformName("vget")
     get
-    [platformName("vset")]
+    @platformName("vset")
     set
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/platformStatic/postfixInc.kt

@@ -5,10 +5,10 @@ object A {
     platformStatic var a: Int = 1
 
     var b: Int = 1
-        [platformStatic] get
+        @platformStatic get
 
     var c: Int = 1
-        [platformStatic] set
+        @platformStatic set
 
 }
 

compiler/testData/codegen/boxWithStdlib/platformStatic/prefixInc.kt

@@ -5,10 +5,10 @@ object A {
     platformStatic var a: Int = 1
 
     var b: Int = 1
-        [platformStatic] get
+        @platformStatic get
 
     var c: Int = 1
-        [platformStatic] set
+        @platformStatic set
 
 }
 

compiler/testData/codegen/boxWithStdlib/platformStatic/propertyAccess.kt

@@ -12,10 +12,10 @@ object A {
     platformStatic var a: Int = 1
 
     var b: Int = 1
-        [platformStatic] get
+        @platformStatic get
 
     var c: Int = 1
-        [platformStatic] set
+        @platformStatic set
 
 }
 

compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt

@@ -7,7 +7,7 @@ open class B
 class A {
 
     companion object {
-        [platformStatic]
+        @platformStatic
         fun <T: B> a(s: T) : T {
             return s
         }

compiler/testData/codegen/properties/syntheticMethod/inClass.kt

@@ -3,6 +3,6 @@ import java.lang.annotation.*
 Retention(RetentionPolicy.RUNTIME) annotation class SomeAnnotation(val value: String)
 
 class A {
-    [SomeAnnotation("OK")] val property: Int
+    @SomeAnnotation("OK") val property: Int
         get() = 42
 }

compiler/testData/codegen/properties/syntheticMethod/inTrait.kt

@@ -3,5 +3,5 @@ import java.lang.annotation.*
 Retention(RetentionPolicy.RUNTIME) annotation class SomeAnnotation(val value: String)
 
 interface T {
-    [SomeAnnotation("OK")] val property: Int
+    @SomeAnnotation("OK") val property: Int
 }

compiler/testData/codegen/properties/syntheticMethod/topLevel.kt

@@ -2,5 +2,5 @@ import java.lang.annotation.*
 
 Retention(RetentionPolicy.RUNTIME) annotation class SomeAnnotation(val value: String)
 
-[SomeAnnotation("OK")] val property: Int
+@SomeAnnotation("OK") val property: Int
     get() = 42

compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt

@@ -2,5 +2,5 @@ package test
 
 import kotlin.platform.*
 
-[platformName("bar")]
+@platformName("bar")
 fun foo() {}

compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt

@@ -3,8 +3,8 @@ package test
 class E1: Exception()
 class E2: Exception()
 
-class None [throws()]() {}
+class None @throws() constructor() {}
-class One [throws(E1::class)]()
+class One @throws(E1::class) constructor()
-class Two [throws(E1::class, E2::class)]()
+class Two @throws(E1::class, E2::class) constructor()
 
-class OneWithParam [throws(E1::class)](a: Int)
+class OneWithParam @throws(E1::class) constructor(a: Int)

compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt

@@ -5,7 +5,7 @@ class E1: Exception()
 throws(E1::class) jvmOverloads
 fun one(a: Int = 1) {}
 
-class One [throws(E1::class)] (a: Int = 1) {
+class One @throws(E1::class) constructor(a: Int = 1) {
     throws(E1::class)
     fun one(a: Int = 1) {}
 }

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt

@@ -4,11 +4,11 @@ import kotlin.platform.platformStatic
 
 class A {
     companion object {
-        [platformStatic] val b: String = "OK"
+        @platformStatic val b: String = "OK"
 
         var A.c: String
-            [platformStatic] get() = "OK"
+            @platformStatic get() = "OK"
-            [platformStatic] set(t: String) {}
+            @platformStatic set(t: String) {}
     }
 }
 

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.kt

@@ -3,11 +3,11 @@ package test
 import kotlin.platform.platformStatic
 
 object A {
-    [platformStatic] val b: String = "OK"
+    @platformStatic val b: String = "OK"
 
     var A.c: String
-        [platformStatic]get() = "OK"
+        @platformStatic get() = "OK"
-        [platformStatic]set(t: String) {}
+        @platformStatic set(t: String) {}
 
 }
 

compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt

@@ -3,7 +3,7 @@ package test
 import kotlin.platform.*
 
 var v: Int = 1
-    [platformName("vget")]
+    @platformName("vget")
     get
-    [platformName("vset")]
+    @platformName("vset")
     set

compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.A.kt

@@ -14,5 +14,5 @@ public val c: Char = '\u03c0' // pi symbol
 
 public val str: String = ":)"
 
-[Retention(RetentionPolicy.RUNTIME)]
+@Retention(RetentionPolicy.RUNTIME)
 public annotation class AnnotationClass(public val value: String)

compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt

@@ -2,11 +2,11 @@ package lib
 
 import kotlin.platform.*
 
-[platformName("bar")]
+@platformName("bar")
 fun foo() = "foo"
 
 var v: Int = 1
-    [platformName("vget")]
+    @platformName("vget")
     get
-    [platformName("vset")]
+    @platformName("vset")
     set

compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.kt

@@ -1,9 +1,9 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -DEPRECATED_ANNOTATION_SYNTAX
+// !DIAGNOSTICS: -UNUSED_PARAMETER
 annotation class Ann
 
 fun <T> bar(block: (T) -> Int) {}
 
 fun foo() {
-    bar<Int> @Ann [Ann] { x -> x }
+    bar<Int> @Ann @[Ann] { x -> x }
-    bar<Int> @Ann [Ann] label@{ x -> x }
+    bar<Int> @Ann @[Ann] label@{ x -> x }
 }

compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt

@@ -1,4 +1,4 @@
 package test
 
-[AnnotatedAnnotation]
+@[AnnotatedAnnotation]
 public annotation class AnnotatedAnnotation

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt

@@ -4,6 +4,6 @@ annotation class Anno
 
 class Class {
     companion object {
-        [Anno] var property: Int = 42
+        @[Anno] var property: Int = 42
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt

@@ -3,4 +3,4 @@ package test
 
 annotation class Anno(val value: String)
 
-class Constructor [Anno(value = "string")]()
+class Constructor @Anno(value = "string") constructor()

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt

@@ -4,5 +4,5 @@ annotation class Anno
 
 class Class {
     val property: Int
-        [Anno] get() = 42
+        @[Anno] get() = 42
 }

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt

@@ -3,5 +3,5 @@ package test
 annotation class Anno
 
 class Class {
-    [Anno] var property: Int = 42
+    @[Anno] var property: Int = 42
 }

compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt

@@ -4,5 +4,5 @@ annotation class Anno
 
 class Class {
     var property: Int = 42
-        [Anno] set(value) { }
+        @[Anno] set(value) { }
 }

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt

@@ -3,4 +3,4 @@ package test
 annotation class Anno
 
 val property: Int
-    [Anno] get() = 42
+    @[Anno] get() = 42

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt

@@ -2,4 +2,4 @@ package test
 
 annotation class Anno
 
-[Anno] var property: Int = 42
+@[Anno] var property: Int = 42

compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt

@@ -3,4 +3,4 @@ package test
 annotation class Anno
 
 var property: Int = 42
-    [Anno] set(value) { }
+    @[Anno] set(value) { }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt

@@ -3,4 +3,4 @@ package test
 annotation class A
 annotation class B
 
-class Class([A] val x: Int, [B] y: String)
+class Class(@[A] val x: Int, @[B] y: String)

compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt

@@ -3,4 +3,4 @@ package test
 annotation class A
 annotation class B
 
-enum class E([A] val x: String, [B] val y: Int)
+enum class E(@[A] val x: String, @[B] val y: Int)

compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt

@@ -2,4 +2,4 @@ package test
 
 annotation class A
 
-fun Int.foo([A] x: Int) {}
+fun Int.foo(@[A] x: Int) {}

compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt

@@ -4,5 +4,5 @@ package test
 annotation class Anno
 
 class Class {
-    fun String.foo([Anno] x: Int) = 42
+    fun String.foo(@[Anno] x: Int) = 42
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt

@@ -5,5 +5,5 @@ annotation class A
 class Class {
     var Int.foo: Int
         get() = this
-        set([A] value) {}
+        set(@[A] value) {}
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt

@@ -3,5 +3,5 @@ package test
 annotation class Anno
 
 class Class {
-    fun foo([Anno] x: String) {}
+    fun foo(@[Anno] x: String) {}
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt

@@ -4,5 +4,5 @@ package test
 annotation class Anno
 
 interface Trait {
-    fun foo([Anno] x: String) = 42
+    fun foo(@[Anno] x: String) = 42
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt

@@ -4,7 +4,7 @@ package test
 annotation class A(val s: String)
 
 class Outer {
-    class Nested([A("nested")] val x: String)
+    class Nested(@[A("nested")] val x: String)
 
-    inner class Inner([A("inner")] val y: String)
+    inner class Inner(@[A("inner")] val y: String)
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt

@@ -5,6 +5,6 @@ annotation class B
 annotation class C
 annotation class D
 
-fun foo([A B] x: Int, [A C] y: Double, [B C D] z: String) {}
+fun foo(@[A B] x: Int, @[A C] y: Double, @[B C D] z: String) {}
 
-fun bar([A B C D] x: Int) {}
+fun bar(@[A B C D] x: Int) {}

compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt

@@ -5,5 +5,5 @@ annotation class A
 class Class {
     var foo: Int
         get() = 42
-        set([A] value) {}
+        set(@[A] value) {}
 }

compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt

@@ -2,4 +2,4 @@ package test
 
 annotation class Anno
 
-fun foo([Anno] x: Int) {}
+fun foo(@[Anno] x: Int) {}

compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt

@@ -5,4 +5,4 @@ annotation class B
 
 var foo: Int
     get() = 42
-    set([A B] value) {}
+    set(@[A B] value) {}

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt

@@ -3,6 +3,6 @@ package test
 annotation class Anno
 
 class Class {
-    [Anno] val property: Int
+    @[Anno] val property: Int
         get() = 42
 }

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt

@@ -4,7 +4,7 @@ annotation class Anno
 
 class Class {
     companion object {
-        [Anno] val property: Int
+        @[Anno] val property: Int
             get() = 42
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt

@@ -5,12 +5,12 @@ annotation class StringAnno
 annotation class DoubleAnno
 
 class Class {
-    [IntAnno] val Int.extension: Int
+    @[IntAnno] val Int.extension: Int
         get() = this
 
-    [StringAnno] val String.extension: String
+    @[StringAnno] val String.extension: String
         get() = this
 
-    [DoubleAnno] val Double.extension: Int
+    @[DoubleAnno] val Double.extension: Int
         get() = 42
 }

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt

@@ -4,11 +4,11 @@ annotation class IntAnno
 annotation class StringAnno
 annotation class DoubleAnno
 
-[IntAnno] val Int.extension: Int
+@[IntAnno] val Int.extension: Int
     get() = this
 
-[StringAnno] val String.extension: String
+@[StringAnno] val String.extension: String
     get() = this
 
-[DoubleAnno] val Double.extension: Int
+@[DoubleAnno] val Double.extension: Int
     get() = 42

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt

@@ -4,6 +4,6 @@ annotation class Anno
 
 class Class {
     interface Trait {
-        [Anno] val property: Int
+        @[Anno] val property: Int
     }
 }

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt

@@ -2,5 +2,5 @@ package test
 
 annotation class Anno
 
-[Anno] val property: Int
+@[Anno] val property: Int
     get() = 42

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt

@@ -3,5 +3,5 @@ package test
 annotation class Anno
 
 interface Trait {
-    [Anno] val property: Int
+    @[Anno] val property: Int
 }

compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt

@@ -4,7 +4,7 @@ annotation class Anno
 
 interface Trait {
     companion object {
-        [Anno] val property: Int
+        @[Anno] val property: Int
             get() = 42
     }
 }

compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.kt

@@ -5,9 +5,9 @@ import org.jetbrains.annotations.*
 public interface LoadIterable<T> {
     Mutable
     public fun getIterable(): MutableIterable<T>?
-    public fun setIterable([Mutable] p0: MutableIterable<T>?)
+    public fun setIterable(@Mutable p0: MutableIterable<T>?)
 
     ReadOnly
     public fun getReadOnlyIterable(): Iterable<T>?
-    public fun setReadOnlyIterable([ReadOnly] p0: Iterable<T>?)
+    public fun setReadOnlyIterable(@ReadOnly p0: Iterable<T>?)
 }

compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.kt

@@ -3,7 +3,7 @@ package test
 import org.jetbrains.annotations.*
 
 public interface LoadIterableWithConflict<T> {
-    [ReadOnly] [Mutable]
+    @ReadOnly @Mutable
     public fun getIterable(): MutableIterable<T>?
-    public fun setIterable([ReadOnly] [Mutable] p0: MutableIterable<T>?)
+    public fun setIterable(@ReadOnly @Mutable p0: MutableIterable<T>?)
 }

compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.kt

@@ -5,9 +5,9 @@ import org.jetbrains.annotations.*
 public interface LoadIterableWithNullability<T> {
     Mutable
     public fun getIterable(): MutableIterable<T>
-    public fun setIterable([Mutable] p0: MutableIterable<T>)
+    public fun setIterable(@Mutable p0: MutableIterable<T>)
 
     ReadOnly
     public fun getReadOnlyIterable(): Iterable<T>
-    public fun setReadOnlyIterable([ReadOnly] p0: Iterable<T>)
+    public fun setReadOnlyIterable(@ReadOnly p0: Iterable<T>)
 }

compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.kt

@@ -7,11 +7,11 @@ public interface LoadIterableWithPropagation {
     public interface LoadIterable<T> {
         Mutable
         public fun getIterable(): MutableIterable<T>?
-        public fun setIterable([Mutable] p0: MutableIterable<T>?)
+        public fun setIterable(@Mutable p0: MutableIterable<T>?)
 
         ReadOnly
         public fun getReadOnlyIterable(): Iterable<T>?
-        public fun setReadOnlyIterable([ReadOnly] p0: Iterable<T>?)
+        public fun setReadOnlyIterable(@ReadOnly p0: Iterable<T>?)
     }
 
     public open class LoadIterableImpl<T> : LoadIterable<T> {

compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt

@@ -4,15 +4,15 @@ import kotlin.platform.*
 
 annotation class A(val s: String)
 
-[platformName("bar")]
+@platformName("bar")
 A("1")
 fun foo() = "foo"
 
 A("2")
 var v: Int = 1
-    [platformName("vget")]
+    @platformName("vget")
-    [A("3")]
+    @A("3")
     get
-    [platformName("vset")]
+    @platformName("vset")
-    [A("4")]
+    @A("4")
     set

compiler/testData/renderer/Classes.kt

@@ -3,8 +3,8 @@ package rendererTest
 annotation class TheAnnotation
 annotation class AnotherAnnotation
 
-[TheAnnotation]
+@TheAnnotation
-public open class TheClass<out T : Int, X> [AnotherAnnotation] () {
+public open class TheClass<out T : Int, X> @AnotherAnnotation constructor() {
   private val privateVal: Int = 5
 
   val shouldBeFinal: Int = 5
@@ -14,7 +14,7 @@ public open class TheClass<out T : Int, X> [AnotherAnnotation] () {
 
   protected abstract fun foo() {}
 
-  [TheAnnotation] private constructor()
+  @TheAnnotation private constructor()
 
   private class Inner {}
 }

compiler/testData/renderer/FunctionTypes.kt

@@ -5,18 +5,18 @@ var v4: Function1<Int, String>
 var v4: (() -> Int, (String) -> Unit) -> String
 var v5: Int.() -> Int
 var v6 : Int.(String, Int) -> Unit
-var v7 : [extension] Function2<Int, String, Boolean>
+var v7 : @extension Function2<Int, String, Boolean>
 
 class F: Function0<Unit>
 var v8: F
 
-class EF: [extension] Function1<String, Unit>
+class EF: @extension Function1<String, Unit>
 var v9: EF
 
 class GF<T>: Function0<T>
 var v10: GF<Any>
 
-class GEF<A, B>: [extension] Function1<A, B>
+class GEF<A, B>: @extension Function1<A, B>
 var v11: GEF<Any, Any>
 
 //internal var v1: () -> kotlin.Unit defined in root package

compiler/testData/repl/regressions/kt6843.repl

@@ -1,4 +1,4 @@
->>> [data] class Person(val name: String)
+>>> @[data] class Person(val name: String)
 >>> var x: String? = "hello"
 >>> val y = x?.let { Person(it) }
 >>> y

compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve

@@ -10,7 +10,7 @@ package m
 fun test() {
     ~x~val x = 2
 
-    [`zzz`zzz] fun local(
+    @[`zzz`zzz] fun local(
             `zzz`zzz i: Int = `x`x,
             j: Int = 3,
             s: String = "$`x`x",

compiler/testData/resolveAnnotations/testFile.kt

@@ -1,24 +1,24 @@
-[file: ANNOTATION]
+@file:ANNOTATION
 
 package test
 
 import test.MyEnum.*
 
-ANNOTATION class MyClass [ANNOTATION]([ANNOTATION] param: Int, [ANNOTATION] val consProp: Int) {
+ANNOTATION class MyClass @ANNOTATION constructor(@ANNOTATION param: Int, @ANNOTATION val consProp: Int) {
     ANNOTATION companion object {
     }
 
     ANNOTATION var prop: Int = 1
-        [ANNOTATION] get
+        @ANNOTATION get
-        [ANNOTATION] set([ANNOTATION] param) = $prop = param
+        @ANNOTATION set(@ANNOTATION param) = $prop = param
-    ANNOTATION fun foo([ANNOTATION] param: Int) {
+    ANNOTATION fun foo(@ANNOTATION param: Int) {
-        [ANNOTATION] class LocalClass { }
+        @ANNOTATION class LocalClass { }
 
-        [ANNOTATION] object LocalObject { }
+        @ANNOTATION object LocalObject { }
 
-        [ANNOTATION] fun localFun() {}
+        @ANNOTATION fun localFun() {}
 
-        [ANNOTATION] var localVar: Int = 1
+        @ANNOTATION var localVar: Int = 1
     }
 
     ANNOTATION class InnerClass {
@@ -30,13 +30,13 @@ ANNOTATION object MyObject {
 }
 
 ANNOTATION var topProp: Int = 1
-    [ANNOTATION] get
+    @ANNOTATION get
-    [ANNOTATION] set([ANNOTATION] param) = $topProp = param
+    @ANNOTATION set(@ANNOTATION param) = $topProp = param
 
-ANNOTATION fun topFoo([ANNOTATION] param: Int) {
+ANNOTATION fun topFoo(@ANNOTATION param: Int) {
 }
 
-val funLiteral = {([ANNOTATION] a: Int) -> a }
+val funLiteral = {(@ANNOTATION a: Int) -> a }
 
 
 annotation class AnnString(a: String)

compiler/testData/serialization/builtinsSerializer/annotationTargets.kt

@@ -16,7 +16,7 @@ anno("extension property")
 val Double.p2: Double get() = null
 
 anno("top level class")
-class C1 [anno("constructor")] () {
+class C1 @anno("constructor") constructor() {
     anno("member function")
     fun f3(anno("member function parameter") p: Int) {}
 

compiler/testData/serialization/local/annotationsInLocalClass.kt

@@ -4,7 +4,7 @@ class A {
     annotation class Ann(val info: String)
 
     fun foo() {
-        [Ann("class")] class Local {
+        @Ann("class") class Local {
             Ann("fun") fun foo(): Local = this
             Ann("val") val x = foo()
 

compiler/testData/writeFlags/function/deprecatedFlag/emptyGetter.kt

@@ -1,6 +1,6 @@
 class MyClass() {
     val test = ""
-        [deprecated("")] get
+        @deprecated("") get
 }
 
 // TESTED_OBJECT_KIND: function

compiler/testData/writeFlags/function/deprecatedFlag/emptySetter.kt

@@ -1,6 +1,6 @@
 class MyClass() {
     var test = ""
-        [deprecated("")] set
+        @deprecated("") set
 }
 
 // TESTED_OBJECT_KIND: function

compiler/testData/writeFlags/function/deprecatedFlag/getter.kt

@@ -1,6 +1,6 @@
 class MyClass() {
     val test: Int
-        [deprecated("")] get(): Int { return 0 }
+        @deprecated("") get(): Int { return 0 }
 }
 
 

compiler/testData/writeFlags/function/deprecatedFlag/setter.kt

@@ -1,6 +1,6 @@
 class MyClass() {
     var test = 1
-        [deprecated("")] set(i: Int) { test = i }
+        @deprecated("") set(i: Int) { test = i }
 }
 
 

compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java

@@ -54,7 +54,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testPropField() throws Exception {
-        ClassLoader loader = loadFileGetClassLoader("[Deprecated] var x = 0");
+        ClassLoader loader = loadFileGetClassLoader("@[Deprecated] var x = 0");
         Class<?> packageClass = getPackageClass(loader);
         assertNull(packageClass.getDeclaredMethod("getX").getAnnotation(Deprecated.class));
         assertNull(packageClass.getDeclaredMethod("setX", int.class).getAnnotation(Deprecated.class));
@@ -66,7 +66,7 @@ public class AnnotationGenTest extends CodegenTestCase {
 
     public void testPropGetter() throws Exception {
         ClassLoader loader = loadFileGetClassLoader("var x = 0\n" +
-                 "[Deprecated] get");
+                 "@[Deprecated] get");
         Class<?> packageClass = getPackageClass(loader);
         assertNotNull(packageClass.getDeclaredMethod("getX").getAnnotation(Deprecated.class));
         assertNull(packageClass.getDeclaredMethod("setX", int.class).getAnnotation(Deprecated.class));
@@ -78,7 +78,7 @@ public class AnnotationGenTest extends CodegenTestCase {
 
     public void testPropSetter() throws Exception {
         ClassLoader loader = loadFileGetClassLoader("var x = 0\n" +
-                 "[Deprecated] set");
+                 "@[Deprecated] set");
         Class<?> packageClass = getPackageClass(loader);
         assertNull(packageClass.getDeclaredMethod("getX").getAnnotation(Deprecated.class));
         assertNotNull(packageClass.getDeclaredMethod("setX", int.class).getAnnotation(Deprecated.class));
@@ -89,7 +89,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testAnnotationForParamInTopLevelFunction() throws Exception {
-        ClassLoader loader = loadFileGetClassLoader("fun x([Deprecated] i: Int) {}");
+        ClassLoader loader = loadFileGetClassLoader("fun x(@[Deprecated] i: Int) {}");
         Class<?> packageClass = getPackageClass(loader);
         Method packageClassMethod = packageClass.getMethod("x", int.class);
         assertNotNull(packageClassMethod);
@@ -101,7 +101,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testAnnotationForParamInInstanceFunction() throws NoSuchFieldException, NoSuchMethodException {
-        loadText("class A() { fun x([Deprecated] i: Int) {}}");
+        loadText("class A() { fun x(@[Deprecated] i: Int) {}}");
         Class<?> aClass = generateClass("A");
         Method x = aClass.getMethod("x", int.class);
         assertNotNull(x);
@@ -111,7 +111,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testAnnotationForParamInInstanceExtensionFunction() throws NoSuchFieldException, NoSuchMethodException {
-        loadText("class A() { fun String.x([Deprecated] i: Int) {}}");
+        loadText("class A() { fun String.x(@[Deprecated] i: Int) {}}");
         Class<?> aClass = generateClass("A");
         Method x = aClass.getMethod("x", String.class, int.class);
         assertNotNull(x);
@@ -121,7 +121,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testParamInConstructor() throws NoSuchFieldException, NoSuchMethodException {
-        loadText("class A ([Deprecated] x: Int) {}");
+        loadText("class A (@[Deprecated] x: Int) {}");
         Class<?> aClass = generateClass("A");
         Constructor constructor = aClass.getDeclaredConstructor(int.class);
         assertNotNull(constructor);
@@ -131,7 +131,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testParamInEnumConstructor() throws NoSuchFieldException, NoSuchMethodException {
-        loadText("enum class E([Deprecated] p: String)");
+        loadText("enum class E(@[Deprecated] p: String)");
         Class<?> klass = generateClass("E");
         Constructor constructor = klass.getDeclaredConstructor(String.class, int.class, String.class);
         assertNotNull(constructor);
@@ -141,7 +141,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testParamInInnerConstructor() throws NoSuchFieldException, NoSuchMethodException {
-        loadText("class Outer { inner class Inner([Deprecated] x: Int) }");
+        loadText("class Outer { inner class Inner(@[Deprecated] x: Int) }");
         Class<?> outer = generateClass("Outer");
         Class<?> inner = outer.getDeclaredClasses()[0];
         Constructor constructor = inner.getDeclaredConstructor(outer, int.class);
@@ -152,7 +152,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testPropFieldInConstructor() throws NoSuchFieldException, NoSuchMethodException {
-        loadText("class A ([Deprecated] var x: Int) {}");
+        loadText("class A (@[Deprecated] var x: Int) {}");
         Class<?> aClass = generateClass("A");
         Constructor constructor = aClass.getDeclaredConstructor(int.class);
         assertNotNull(constructor);
@@ -199,7 +199,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     } 
 
     public void testConstructor() throws NoSuchFieldException, NoSuchMethodException {
-        loadText("class A [Deprecated] () {}");
+        loadText("class A @[Deprecated] () {}");
         Class<?> aClass = generateClass("A");
         Constructor x = aClass.getDeclaredConstructor();
         Deprecated annotation = (Deprecated) x.getAnnotation(Deprecated.class);
@@ -207,7 +207,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testMethod() throws Exception {
-        ClassLoader loader = loadFileGetClassLoader("[Deprecated] fun x () {}");
+        ClassLoader loader = loadFileGetClassLoader("@[Deprecated] fun x () {}");
 
         Class<?> packageClass = getPackageClass(loader);
         Method packageClassMethod = packageClass.getDeclaredMethod("x");
@@ -220,7 +220,7 @@ public class AnnotationGenTest extends CodegenTestCase {
     }
 
     public void testClass() throws NoSuchFieldException, NoSuchMethodException {
-        loadText("[Deprecated] class A () {}");
+        loadText("@[Deprecated] class A () {}");
         Class aClass = generateClass("A");
         Deprecated annotation = (Deprecated) aClass.getAnnotation(Deprecated.class);
         assertNotNull(annotation);

compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt

@@ -168,7 +168,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
     private fun addRuntimeRetentionToKotlinSource(text: String): String {
         return text.replace(
                 "annotation class",
-                "[java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)] annotation class"
+                "@[java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)] annotation class"
         )
     }
 

idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt

@@ -1,7 +1,7 @@
 annotation class Hello
 val v = 1
 
-[<caret>] fun some() {}
+@[<caret>] fun some() {}
 
 // INVOCATION_COUNT: 0
 // EXIST: Hello

idea/idea-completion/testData/basic/common/annotations/NoParameterAnnotationAutoPopup2.kt

@@ -1,4 +1,4 @@
-fun foo([inlineOptions] i<caret>) { }
+fun foo(@inlineOptions i<caret>) { }
 
 // INVOCATION_COUNT: 0
 // NUMBER: 0

idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt

@@ -1,7 +1,7 @@
 annotation class Hello
 val v = 1
 
-fun foo([<caret>) { }
+fun foo(@[<caret>) { }
 
 // INVOCATION_COUNT: 1
 // EXIST: Hello

idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt

@@ -1,7 +1,7 @@
 annotation class iHello
 val v = 1
 
-fun foo([i<caret>) { }
+fun foo(@[i<caret>) { }
 
 // INVOCATION_COUNT: 1
 // EXIST: iHello

idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt

@@ -1,6 +1,6 @@
 val v = 1
 
-fun foo([i<caret>) { }
+fun foo(@[i<caret>) { }
 
 // INVOCATION_COUNT: 0
 // EXIST: inlineOptions

idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt

@@ -1,6 +1,6 @@
 val v = 1
 
-fun foo([volatile i<caret>) { }
+fun foo(@[volatile i<caret>) { }
 
 // INVOCATION_COUNT: 0
 // EXIST: inlineOptions

idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt

@@ -1,7 +1,7 @@
 annotation class Hello
 val v = 1
 
-[<caret>]
+@[<caret>]
 
 // INVOCATION_COUNT: 0
 // EXIST: Hello