diff --git a/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.log.expected b/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.log.expected
index cdf8ebedd06..55348522df3 100644
--- a/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.log.expected
+++ b/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.log.expected
@@ -3,13 +3,7 @@ Buildfile: [TestData]/build.xml
 
 build:
   [kotlinc] Compiling [[TestData]] => [[Temp]]
-  [kotlinc] [TestData]/incorrectKotlinCode.kt:1:1: error: use '@' symbol before annotations
-  [kotlinc] xxxx
-  [kotlinc] ^
-  [kotlinc] [TestData]/incorrectKotlinCode.kt:1:5: error: expecting a top level declaration
-  [kotlinc] xxxx
-  [kotlinc]     ^
-  [kotlinc] [TestData]/incorrectKotlinCode.kt:1:1: error: unresolved reference: xxxx
+  [kotlinc] [TestData]/incorrectKotlinCode.kt:1:1: error: expecting a top level declaration
   [kotlinc] xxxx
   [kotlinc] ^
 
diff --git a/compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve b/compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve
index 70b4be2390c..12a188295b5 100644
--- a/compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve
+++ b/compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve
@@ -11,7 +11,7 @@ fun test() {
     ~x~val x = 2
 
     @[`zzz`zzz] fun local(
-            `zzz`zzz i: Int = `x`x,
+            @`zzz`zzz i: Int = `x`x,
             j: Int = 3,
             s: String = "$`x`x",
             k: Int = `y`y,
diff --git a/compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve b/compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve
index 90951704e97..75c5b7b073a 100644
--- a/compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve
+++ b/compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve
@@ -1,4 +1,4 @@
-`!null`first object Foo {}
+@`!null`first object Foo {}
 
-`!null`second(`!null`aa, `!null`asdf) object More {
+@`!null`second(`!null`aa, `!null`asdf) object More {
 }
\ No newline at end of file
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.kt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.kt
index 8d52103fcb3..e3e0800967e 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.kt
@@ -7,4 +7,4 @@ class A(x: Double) {
     }
 }
 
-<caret>A(1.0)
+val v = <caret>A(1.0)
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt
index 99052480fd9..b6acc3b6866 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt
@@ -7,7 +7,7 @@ class A(x: Double) {
     }
 }
 
-<caret>A(1.0)
+val v = <caret>A(1.0)
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.kt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.kt
index b4bbd5e3e74..de40f1f4548 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.kt
@@ -7,4 +7,4 @@ class A(x: Double) {
     }
 }
 
-<caret>A("abc")
+val v = <caret>A("abc")
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.txt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.txt
index 92fe8d431d1..c358618204d 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.txt
@@ -7,7 +7,7 @@ class A(x: Double) {
     }
 }
 
-<caret>A("abc")
+val v = <caret>A("abc")
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.kt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.kt
index 9f64c20e398..d6416687e74 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.kt
@@ -7,4 +7,4 @@ class A() {
     }
 }
 
-<caret>A()
+val v = <caret>A()
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.txt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.txt
index 4f2af293051..2c642dc93fc 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.txt
@@ -7,7 +7,7 @@ class A() {
     }
 }
 
-<caret>A()
+val v = <caret>A()
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.kt b/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.kt
index 7204614b36a..67f43b7ad31 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.kt
@@ -1,3 +1,3 @@
 class A
 
-<caret>A()
+val v = <caret>A()
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.txt b/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.txt
index d1345693f85..e74736878be 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.txt
@@ -1,6 +1,6 @@
 class A
 
-<caret>A()
+val v = <caret>A()
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload1.kt b/compiler/testData/resolvedCalls/secondaryConstructors/overload1.kt
index 8f894342eaf..e5ba8e0f144 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload1.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload1.kt
@@ -7,4 +7,4 @@ class A {
     }
 }
 
-<caret>A("abc")
+val v = <caret>A("abc")
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload1.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overload1.txt
index b930a56c468..163b727f931 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload1.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload1.txt
@@ -7,7 +7,7 @@ class A {
     }
 }
 
-<caret>A("abc")
+val v = <caret>A("abc")
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload2.kt b/compiler/testData/resolvedCalls/secondaryConstructors/overload2.kt
index d04297c8ee5..7f1517014a7 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload2.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload2.kt
@@ -7,4 +7,4 @@ class A {
     }
 }
 
-<caret>A(1)
+val v = <caret>A(1)
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload2.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overload2.txt
index 7e6ee5836b1..3fbbe42311b 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload2.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload2.txt
@@ -7,7 +7,7 @@ class A {
     }
 }
 
-<caret>A(1)
+val v = <caret>A(1)
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload3.kt b/compiler/testData/resolvedCalls/secondaryConstructors/overload3.kt
index 040cde48bf1..fbadf2aff7b 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload3.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload3.kt
@@ -7,4 +7,4 @@ class A {
     }
 }
 
-<caret>A(1, "abc")
+val v = <caret>A(1, "abc")
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload3.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overload3.txt
index ddb9e735fe3..ed35b5327c1 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload3.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload3.txt
@@ -7,7 +7,7 @@ class A {
     }
 }
 
-<caret>A(1, "abc")
+val v = <caret>A(1, "abc")
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.kt b/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.kt
index ebd6b3b83c9..2a38e23c87b 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.kt
@@ -7,4 +7,4 @@ class A {
     }
 }
 
-<caret>A(1.0)
+val v = <caret>A(1.0)
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.txt
index 3869001c058..a4d6ff4517a 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.txt
@@ -7,7 +7,7 @@ class A {
     }
 }
 
-<caret>A(1.0)
+val v = <caret>A(1.0)
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.kt b/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.kt
index ab59e1be087..b064f50a0e2 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.kt
@@ -7,4 +7,4 @@ class A {
     }
 }
 
-<caret>A(x=1.0)
+val v = <caret>A(x=1.0)
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.txt
index e1e724073d8..96b9457a86d 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.txt
@@ -7,7 +7,7 @@ class A {
     }
 }
 
-<caret>A(x=1.0)
+val v = <caret>A(x=1.0)
 
 
 Resolved call:
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/simple.kt b/compiler/testData/resolvedCalls/secondaryConstructors/simple.kt
index 3b761f875a5..b1eb3a1b22f 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/simple.kt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/simple.kt
@@ -4,4 +4,4 @@ class A {
     }
 }
 
-<caret>A(1)
+val v = <caret>A(1)
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/simple.txt b/compiler/testData/resolvedCalls/secondaryConstructors/simple.txt
index 61b13118859..43e62d9f828 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/simple.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/simple.txt
@@ -4,7 +4,7 @@ class A {
     }
 }
 
-<caret>A(1)
+val v = <caret>A(1)
 
 
 Resolved call:
diff --git a/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt b/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt
index 9da09b18d57..eb6c80e06ad 100644
--- a/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt
+++ b/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt
@@ -1,5 +1,5 @@
 class A {
-    pl<caret>
+    @pl<caret>
 }
 
 // ELEMENT: platformStatic
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt.after b/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt.after
index 83b4ee6ab89..119077b86cd 100644
--- a/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/PlatformStaticInClass.kt.after
@@ -1,7 +1,7 @@
 import kotlin.platform.platformStatic
 
 class A {
-    platformStatic<caret>
+    @platformStatic<caret>
 }
 
 // ELEMENT: platformStatic
\ No newline at end of file
diff --git a/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt b/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt
index 4684a5f72f6..2552910f224 100644
--- a/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt
+++ b/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt
@@ -1,6 +1,6 @@
 class A {
     companion object {
-        pl<caret>
+        @pl<caret>
     }
 }
 
diff --git a/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt.after b/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt.after
index 09fd0ec89be..740d6dc28b8 100644
--- a/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/PlatformStaticInCompanionObject.kt.after
@@ -2,7 +2,7 @@ import kotlin.platform.platformStatic
 
 class A {
     companion object {
-        platformStatic<caret>
+        @platformStatic<caret>
     }
 }
 
diff --git a/idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt b/idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt
index 9b78414d9cd..38ad239f716 100644
--- a/idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt
+++ b/idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt
@@ -8,7 +8,7 @@ class Foo {
         fun f() {
         }
 
-        platformStatic fun s() {
+        @platformStatic fun s() {
         }
 
         val CONST = 42
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.1.kt
index 8511a3a9e92..ed5ab0ab361 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.1.kt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.1.kt
@@ -2,7 +2,7 @@ package client
 
 import server.X
 
-X("")
+@X("")
 class Client {
 
 }
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
index de2bf1483e7..64eca9b6d4d 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
@@ -1,2 +1,2 @@
-Annotation (5: 1) X("")
+Annotation (5: 2) @X("")
 Usage in import (3: 15) import server.X
diff --git a/idea/testData/formatter/AnonymousInitializers.after.kt b/idea/testData/formatter/AnonymousInitializers.after.kt
index 06561d45d08..c4ab4258c36 100644
--- a/idea/testData/formatter/AnonymousInitializers.after.kt
+++ b/idea/testData/formatter/AnonymousInitializers.after.kt
@@ -16,10 +16,10 @@ class A {
 
     }
 
-    Ann init {
+    @Ann init {
     }
 
-    Ann init {
+    @Ann init {
     }
 
 
diff --git a/idea/testData/formatter/AnonymousInitializers.kt b/idea/testData/formatter/AnonymousInitializers.kt
index c920d3686cc..439b1b7c6d0 100644
--- a/idea/testData/formatter/AnonymousInitializers.kt
+++ b/idea/testData/formatter/AnonymousInitializers.kt
@@ -9,8 +9,8 @@ class A {
     fun foo2() {
 
     }
-    Ann    init       {}
-    Ann    init {}
+    @Ann    init       {}
+    @Ann    init {}
 
 
     fun foo3() {
diff --git a/idea/testData/formatter/SpacesInDeclarations.after.kt b/idea/testData/formatter/SpacesInDeclarations.after.kt
index 2eb489b2a1d..caeaa3d3f67 100644
--- a/idea/testData/formatter/SpacesInDeclarations.after.kt
+++ b/idea/testData/formatter/SpacesInDeclarations.after.kt
@@ -64,7 +64,7 @@ annotation class A1
 
 annotation class A2
 
-private @[A1 A2 A1] A1 A2 @[A1 A2 A2] @[A1] val fooProp1 = 1
+private @[A1 A2 A1] @A1 @A2 @[A1 A2 A2] @[A1] val fooProp1 = 1
 
 private @[
 
@@ -72,7 +72,7 @@ private @[
 A1
 
 
-A2 A1] A1 A2 @[A1
+A2 A1] @A1 @A2 @[A1
 A2
 
 
@@ -80,9 +80,9 @@ A2
 
 ] @[A1] val fooProp1 = 1
 
-private A1
+private @A1
 
-A2 val
+@A2 val
         fooProp2 = 1
 
 
diff --git a/idea/testData/formatter/SpacesInDeclarations.kt b/idea/testData/formatter/SpacesInDeclarations.kt
index 083753fccc1..755c6313162 100644
--- a/idea/testData/formatter/SpacesInDeclarations.kt
+++ b/idea/testData/formatter/SpacesInDeclarations.kt
@@ -61,7 +61,7 @@ public       var         varWithAccessors2:    Int
 annotation class A1
 annotation class A2
 
-private  @[   A1   A2   A1 ]   A1    A2  @[   A1  A2   A2     ]   @[A1] val     fooProp1   = 1
+private  @[   A1   A2   A1 ]   @A1    @A2  @[   A1  A2   A2     ]   @[A1] val     fooProp1   = 1
 
 private  @[
 
@@ -69,7 +69,7 @@ private  @[
 A1
 
 
-A2   A1 ]   A1    A2  @[A1
+A2   A1 ]   @A1    @A2  @[A1
 A2
 
 
@@ -79,9 +79,9 @@ A2
 
 ]   @[A1] val     fooProp1   = 1
 
-private  A1
+private  @A1
 
-A2    val
+@A2    val
         fooProp2   = 1
 
 
diff --git a/idea/testData/hierarchy/class/type/CaretAtAnnotation/main.kt b/idea/testData/hierarchy/class/type/CaretAtAnnotation/main.kt
index fd39b1e3d55..be15239dcc7 100644
--- a/idea/testData/hierarchy/class/type/CaretAtAnnotation/main.kt
+++ b/idea/testData/hierarchy/class/type/CaretAtAnnotation/main.kt
@@ -1,4 +1,4 @@
-<caret>A class MyClass
+@<caret>A class MyClass
 
 annotation class A
 
diff --git a/idea/testData/inspections/unusedSymbol/function/withNativeAnnotation.kt b/idea/testData/inspections/unusedSymbol/function/withNativeAnnotation.kt
index 68080d24dc6..9fde38ae09a 100644
--- a/idea/testData/inspections/unusedSymbol/function/withNativeAnnotation.kt
+++ b/idea/testData/inspections/unusedSymbol/function/withNativeAnnotation.kt
@@ -1,7 +1,7 @@
 annotation class native
 
-native fun withNativeAnnotation() {
+@native fun withNativeAnnotation() {
 
 }
 
-native class WithNativeAnnotation
+@native class WithNativeAnnotation
diff --git a/idea/testData/inspections/unusedSymbol/object/unusedButEntryPointMain.kt b/idea/testData/inspections/unusedSymbol/object/unusedButEntryPointMain.kt
index dc1e35e255c..494a26506a8 100644
--- a/idea/testData/inspections/unusedSymbol/object/unusedButEntryPointMain.kt
+++ b/idea/testData/inspections/unusedSymbol/object/unusedButEntryPointMain.kt
@@ -5,7 +5,7 @@ package entryPoint
 import kotlin.platform.platformStatic
 
 object EntryPoint {
-    platformStatic public fun main(args: Array<String>) {
+    @platformStatic public fun main(args: Array<String>) {
 
     }
 }
diff --git a/idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt b/idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt
index 8943cc7b812..a70ddb03007 100644
--- a/idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt
+++ b/idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt
@@ -4,7 +4,7 @@ annotation class X(val s: String)
 
 class A(val n: Int) {
     val t = 1
-    internal X("1") fun <T : Number> T.<caret>foo(): Boolean = toInt() - n > 1
+    internal @X("1") fun <T : Number> T.<caret>foo(): Boolean = toInt() - n > 1
     val u = 2
 }
 
diff --git a/idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt.after b/idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt.after
index bdcc5214ac3..b30130646ea 100644
--- a/idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt.after
+++ b/idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt.after
@@ -4,7 +4,7 @@ annotation class X(val s: String)
 
 class A(val n: Int) {
     val t = 1
-    internal X("1") val <T : Number> T.foo: Boolean
+    internal @X("1") val <T : Number> T.foo: Boolean
         get() = toInt() - n > 1
     val u = 2
 }
diff --git a/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt b/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt
index 4fff0dab6af..0e7795be56f 100644
--- a/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt
+++ b/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt
@@ -3,7 +3,7 @@
 annotation class X(val s: String)
 
 class A(val n: Int) {
-    internal X("1") val <T : Number> T.<caret>foo: Boolean
+    internal @X("1") val <T : Number> T.<caret>foo: Boolean
         get() = toInt() - n > 1
 }
 
diff --git a/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after b/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after
index 9fa0cbe7a6a..b2de30cf0d8 100644
--- a/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after
+++ b/idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt.after
@@ -3,7 +3,7 @@
 annotation class X(val s: String)
 
 class A(val n: Int) {
-    internal X("1") fun <T : Number> T.getFoo(): Boolean = toInt() - n > 1
+    internal @X("1") fun <T : Number> T.getFoo(): Boolean = toInt() - n > 1
 }
 
 fun test() {
diff --git a/idea/testData/parameterInfo/functionCall/Deprecated.kt b/idea/testData/parameterInfo/functionCall/Deprecated.kt
index 3a3fe08e216..aa135cae330 100644
--- a/idea/testData/parameterInfo/functionCall/Deprecated.kt
+++ b/idea/testData/parameterInfo/functionCall/Deprecated.kt
@@ -1,4 +1,4 @@
-Deprecated("") fun f(x: Int) = 2
+@Deprecated("") fun f(x: Int) = 2
 fun f(x: Int, y: Boolean) = 3
 
 fun d(x: Int) {
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt
index a4a81a65367..8cd03d119f2 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt
@@ -1,5 +1,5 @@
 // "Create annotation 'foo'" "true"
 
-<caret>foo(1, "2") fun test() {
+@<caret>foo(1, "2") fun test() {
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt.after b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt.after
index 9f5247765e0..49df91992c6 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt.after
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"
 
-foo(1, "2") fun test() {
+@foo(1, "2") fun test() {
 
 }
 
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.after.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.after.kt
index 7ee99cb9255..15c7ce8101b 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.after.kt
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-J.foo(1, "2") fun test() {
+@J.foo(1, "2") fun test() {
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.Main.kt
index 8c58fc7056d..55251c58c19 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-J.<caret>foo(1, "2") fun test() {
+@J.<caret>foo(1, "2") fun test() {
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.after.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.after.kt
index ee5ade7c445..8723466937c 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.after.kt
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-J.foo(count = 1, name = "2") fun test() {
+@J.foo(count = 1, name = "2") fun test() {
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.Main.kt
index 9faf18920f6..8666ec93f85 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create annotation 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
-J.<caret>foo(count = 1, name = "2") fun test() {
+@J.<caret>foo(count = 1, name = "2") fun test() {
 
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.after.kt b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.after.kt
index 0da25dd836f..23be77ae202 100644
--- a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.after.kt
+++ b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.after.kt
@@ -3,4 +3,4 @@
 // ERROR: Only named arguments are available for Java annotations
 // ERROR: Only named arguments are available for Java annotations
 
-Ann(1, /*abc*/arg1 = "abc", arg2 = arrayOf(Int::class, Array<Int>::class), arg3 = String::class) class A
+@Ann(1, /*abc*/arg1 = "abc", arg2 = arrayOf(Int::class, Array<Int>::class), arg3 = String::class) class A
diff --git a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.before.Main.kt b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.before.Main.kt
index ff1defdbbec..350f7356e9f 100644
--- a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.before.Main.kt
+++ b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.before.Main.kt
@@ -3,4 +3,4 @@
 // ERROR: Only named arguments are available for Java annotations
 // ERROR: Only named arguments are available for Java annotations
 
-Ann(1, /*abc*/"abc", arrayOf(Int::class, Array<Int>::class)<caret>, arg3 = String::class) class A
+@Ann(1, /*abc*/"abc", arrayOf(Int::class, Array<Int>::class)<caret>, arg3 = String::class) class A
diff --git a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.after.kt b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.after.kt
index f61d35ce744..ca6bd972eff 100644
--- a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.after.kt
+++ b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.after.kt
@@ -3,4 +3,4 @@
 // ERROR: Only named arguments are available for Java annotations
 // ERROR: No value passed for parameter arg2
 
-Ann(1, arg1 = "abc") class A
+@Ann(1, arg1 = "abc") class A
diff --git a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.before.Main.kt b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.before.Main.kt
index a9fd154e246..17df989e016 100644
--- a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.before.Main.kt
+++ b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.before.Main.kt
@@ -3,4 +3,4 @@
 // ERROR: Only named arguments are available for Java annotations
 // ERROR: No value passed for parameter arg2
 
-Ann(1, "abc"<caret>) class A
+@Ann(1, "abc"<caret>) class A
diff --git a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt
index b434a3f8194..98244586768 100644
--- a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt
+++ b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.after.kt
@@ -3,4 +3,4 @@
 // ERROR: Only named arguments are available for Java annotations
 // ERROR: An integer literal does not conform to the expected type kotlin.String
 
-Ann(1, arg1 = 2) class A
+@Ann(1, arg1 = 2) class A
diff --git a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt
index 39265d29b13..ef5c0ed5153 100644
--- a/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt
+++ b/idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt
@@ -3,4 +3,4 @@
 // ERROR: Only named arguments are available for Java annotations
 // ERROR: An integer literal does not conform to the expected type kotlin.String
 
-Ann(1, 2<caret>) class A
+@Ann(1, 2<caret>) class A
diff --git a/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.after.kt b/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.after.kt
index 327d2eb2bf5..72638b3397a 100644
--- a/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.after.kt
+++ b/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.after.kt
@@ -34,7 +34,7 @@ fun run(block: () -> Unit) = block()
 
 annotation class ann
 
-notLabelAnnotation class A {
+@notLabelAnnotation class A {
     fun foo() {
         loop@
         for (i in 1..100) {
diff --git a/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt b/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt
index 3147a9ffc96..78305d4bce7 100644
--- a/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt
+++ b/idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt
@@ -34,7 +34,7 @@ fun run(block: () -> Unit) = block()
 
 annotation class ann
 
-notLabelAnnotation class A {
+@notLabelAnnotation class A {
     fun foo() {
         @loop<caret>
         for (i in 1..100) {
diff --git a/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt
index 0acbd653c58..ec56b84303e 100644
--- a/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt
+++ b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt
@@ -1,5 +1,5 @@
 // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
 
-ann fun foo(): String?<caret>? = null
+@ann fun foo(): String?<caret>? = null
 
 annotation class ann
\ No newline at end of file
diff --git a/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt.after b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt.after
index 69937479c6f..7a45e83b162 100644
--- a/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt.after
+++ b/idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt.after
@@ -1,6 +1,6 @@
 // "Suppress 'REDUNDANT_NULLABLE' for fun foo" "true"
 
 @Suppress("REDUNDANT_NULLABLE")
-ann fun foo(): String?<caret>? = null
+@ann fun foo(): String?<caret>? = null
 
 annotation class ann
\ No newline at end of file
diff --git a/idea/testData/refactoring/introduceVariable/InsideOfInitializerAnnotation.kt b/idea/testData/refactoring/introduceVariable/InsideOfInitializerAnnotation.kt
index ace8099d55b..9bf08f1b7fe 100644
--- a/idea/testData/refactoring/introduceVariable/InsideOfInitializerAnnotation.kt
+++ b/idea/testData/refactoring/introduceVariable/InsideOfInitializerAnnotation.kt
@@ -1,4 +1,4 @@
 class C {
-    deprecated(<selection>""</selection>)
+    @deprecated(<selection>""</selection>)
     init {}
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/renameKotlinStaticMethod/after/RenameKotlinStaticMethod.kt b/idea/testData/refactoring/rename/renameKotlinStaticMethod/after/RenameKotlinStaticMethod.kt
index d67dfdb49dd..b35e5961021 100644
--- a/idea/testData/refactoring/rename/renameKotlinStaticMethod/after/RenameKotlinStaticMethod.kt
+++ b/idea/testData/refactoring/rename/renameKotlinStaticMethod/after/RenameKotlinStaticMethod.kt
@@ -2,6 +2,6 @@ package testing.rename
 
 public open class C {
     companion object {
-        JvmStatic fun second() {}
+        @JvmStatic fun second() {}
     }
 }
diff --git a/idea/testData/refactoring/rename/renameKotlinStaticMethod/before/RenameKotlinStaticMethod.kt b/idea/testData/refactoring/rename/renameKotlinStaticMethod/before/RenameKotlinStaticMethod.kt
index 0bb349d9eda..8bb26538f07 100644
--- a/idea/testData/refactoring/rename/renameKotlinStaticMethod/before/RenameKotlinStaticMethod.kt
+++ b/idea/testData/refactoring/rename/renameKotlinStaticMethod/before/RenameKotlinStaticMethod.kt
@@ -2,6 +2,6 @@ package testing.rename
 
 public open class C {
     companion object {
-        JvmStatic fun first() {}
+        @JvmStatic fun first() {}
     }
 }
diff --git a/idea/testData/resolve/references/AnnotationForClass.kt b/idea/testData/resolve/references/AnnotationForClass.kt
index e3cf0f84c9f..8bef90835f8 100644
--- a/idea/testData/resolve/references/AnnotationForClass.kt
+++ b/idea/testData/resolve/references/AnnotationForClass.kt
@@ -2,6 +2,6 @@ package test
 
 annotation class Annotation
 
-<caret>Annotation class Some
+@<caret>Annotation class Some
 
 // REF: (test).Annotation
diff --git a/idea/testData/resolve/references/JavaAnnotationParameter.kt b/idea/testData/resolve/references/JavaAnnotationParameter.kt
index aebfbbf6e24..a740785f725 100644
--- a/idea/testData/resolve/references/JavaAnnotationParameter.kt
+++ b/idea/testData/resolve/references/JavaAnnotationParameter.kt
@@ -1,4 +1,4 @@
-java.lang.annotation.Retention(va<caret>lue = java.lang.annotation.RetentionPolicy.RUNTIME)
+@java.lang.annotation.Retention(va<caret>lue = java.lang.annotation.RetentionPolicy.RUNTIME)
 annotation class Anno()
 
 // REF: (in java.lang.annotation.Retention).value()
\ No newline at end of file
diff --git a/idea/testData/resolve/references/JavaEnumEntry.kt b/idea/testData/resolve/references/JavaEnumEntry.kt
index f5ded613ce2..1be2153ec09 100644
--- a/idea/testData/resolve/references/JavaEnumEntry.kt
+++ b/idea/testData/resolve/references/JavaEnumEntry.kt
@@ -1,4 +1,4 @@
-java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.R<caret>UNTIME)
+@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.R<caret>UNTIME)
 annotation class Anno()
 
 // REF: (in java.lang.annotation.RetentionPolicy).RUNTIME
\ No newline at end of file
diff --git a/idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt b/idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt
index 48764f817fc..ff149e9bc3b 100644
--- a/idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt
+++ b/idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt
@@ -2,7 +2,7 @@ package testing
 
 object Testing {
     companion object {
-        <caret>va
+        @<caret>va
     }
 }
 
diff --git a/idea/testData/run/ClassesAndObjects/module/src/test.kt b/idea/testData/run/ClassesAndObjects/module/src/test.kt
index 15f977dc01e..f1ea508617e 100644
--- a/idea/testData/run/ClassesAndObjects/module/src/test.kt
+++ b/idea/testData/run/ClassesAndObjects/module/src/test.kt
@@ -5,7 +5,7 @@ import kotlin.platform.platformStatic
 // RUN: q.Foo
 object Foo {
     // RUN: q.Foo
-    platformStatic fun main(s: Array<String>) {
+    @platformStatic fun main(s: Array<String>) {
         println("Foo")
     }
 
@@ -13,7 +13,7 @@ object Foo {
     class InnerFoo {
         companion object {
             // RUN: q.Foo.InnerFoo
-            platformStatic fun main(s: Array<String>) {
+            @platformStatic fun main(s: Array<String>) {
                 println("InnerFoo")
             }
         }
@@ -22,7 +22,7 @@ object Foo {
     // RUN: q.Foo
     class InnerFoo2 {
         // RUN: q.Foo
-        platformStatic fun main(s: Array<String>) {
+        @platformStatic fun main(s: Array<String>) {
             println("InnerFoo")
         }
     }
@@ -40,7 +40,7 @@ object Foo2 {
 class Bar {
     companion object {
         // RUN: q.Bar
-        platformStatic fun main(s: Array<String>) {
+        @platformStatic fun main(s: Array<String>) {
             println("Bar")
         }
     }
diff --git a/idea/testData/run/InJsModule/module/src/test.kt b/idea/testData/run/InJsModule/module/src/test.kt
index c342c11f91a..35437b584c2 100644
--- a/idea/testData/run/InJsModule/module/src/test.kt
+++ b/idea/testData/run/InJsModule/module/src/test.kt
@@ -1,6 +1,6 @@
 package q
 
-native
+@native
 class Foo {
     // RUN:
     fun foo(s: Array<String>) = noImpl
@@ -8,7 +8,7 @@ class Foo {
 
 
 // RUN:
-native
+@native
 fun main(s: Array<String>) {
     println("Top-level")
 }
\ No newline at end of file
diff --git a/idea/testData/run/MainInTest/module/src/mainInCompanion.kt b/idea/testData/run/MainInTest/module/src/mainInCompanion.kt
index bf2afdba0ee..fdbd8ab5eea 100644
--- a/idea/testData/run/MainInTest/module/src/mainInCompanion.kt
+++ b/idea/testData/run/MainInTest/module/src/mainInCompanion.kt
@@ -5,7 +5,7 @@ import kotlin.platform.platformStatic
 
 class A {
     companion object {
-        platformStatic
+        @platformStatic
         fun main(args: Array<String>) {
             // yes
         }
@@ -22,8 +22,8 @@ class B {
 
 class C {
     companion object {
-        platformStatic
-        platformName("main0")
+        @platformStatic
+        @platformName("main0")
         fun main(args: Array<String>) { // no
         }
     }
@@ -31,8 +31,8 @@ class C {
 
 class D {
     companion object {
-        platformStatic
-        platformName("main")
+        @platformStatic
+        @platformName("main")
         fun badName(args: Array<String>) { // yes
         }
     }
diff --git a/idea/testData/run/MainInTest/module/src/mainInPackageNamedInvalid.kt b/idea/testData/run/MainInTest/module/src/mainInPackageNamedInvalid.kt
index 2560c3b5aa9..7570afb130e 100644
--- a/idea/testData/run/MainInTest/module/src/mainInPackageNamedInvalid.kt
+++ b/idea/testData/run/MainInTest/module/src/mainInPackageNamedInvalid.kt
@@ -2,7 +2,7 @@ package pkg2
 
 import kotlin.platform.platformName
 
-platformName("aa")
+@platformName("aa")
 fun main(args: Array<String>) {
     // no
 }
diff --git a/idea/testData/run/MainInTest/module/src/mainInPackageNamedValid.kt b/idea/testData/run/MainInTest/module/src/mainInPackageNamedValid.kt
index 937f41dec23..0a968da931c 100644
--- a/idea/testData/run/MainInTest/module/src/mainInPackageNamedValid.kt
+++ b/idea/testData/run/MainInTest/module/src/mainInPackageNamedValid.kt
@@ -2,7 +2,7 @@ package pkg3
 
 import kotlin.platform.platformName
 
-platformName("main")
+@platformName("main")
 fun aaa(args: Array<String>) {
     // yes
 }
diff --git a/idea/testData/run/UpdateOnClassRename/module/src/Foo.kt b/idea/testData/run/UpdateOnClassRename/module/src/Foo.kt
index 80d6fcfffb5..71ada26293b 100644
--- a/idea/testData/run/UpdateOnClassRename/module/src/Foo.kt
+++ b/idea/testData/run/UpdateOnClassRename/module/src/Foo.kt
@@ -3,6 +3,6 @@ package renameTest
 import kotlin.platform.platformStatic
 
 object Foo {
-    platformStatic fun main(args: Array<String>) {
+    @platformStatic fun main(args: Array<String>) {
     }
 }
diff --git a/idea/testData/run/UpdateOnPackageRename/module/src/renameTest/Foo.kt b/idea/testData/run/UpdateOnPackageRename/module/src/renameTest/Foo.kt
index 80d6fcfffb5..71ada26293b 100644
--- a/idea/testData/run/UpdateOnPackageRename/module/src/renameTest/Foo.kt
+++ b/idea/testData/run/UpdateOnPackageRename/module/src/renameTest/Foo.kt
@@ -3,6 +3,6 @@ package renameTest
 import kotlin.platform.platformStatic
 
 object Foo {
-    platformStatic fun main(args: Array<String>) {
+    @platformStatic fun main(args: Array<String>) {
     }
 }
diff --git a/idea/testData/search/annotations/testAnnotationsOnClass.kt b/idea/testData/search/annotations/testAnnotationsOnClass.kt
index 8810fa13639..a3017064151 100644
--- a/idea/testData/search/annotations/testAnnotationsOnClass.kt
+++ b/idea/testData/search/annotations/testAnnotationsOnClass.kt
@@ -2,12 +2,12 @@
 
 @java.lang.Deprecated class TestClass2 {}
 
-java.lang.Deprecated class TestClass3 {}
+@java.lang.Deprecated class TestClass3 {}
 
-java.lang.Deprecated class TestClass4 {}
+@java.lang.Deprecated class TestClass4 {}
 
 class TestClass5 {
-    java.lang.Deprecated class innerTestClass5() {}
+    @java.lang.Deprecated class innerTestClass5() {}
 }
 
 // ANNOTATION: java.lang.Deprecated
diff --git a/idea/testData/search/annotations/testAnnotationsOnFunction.kt b/idea/testData/search/annotations/testAnnotationsOnFunction.kt
index 278d9cddb1b..bf3ce6a4157 100644
--- a/idea/testData/search/annotations/testAnnotationsOnFunction.kt
+++ b/idea/testData/search/annotations/testAnnotationsOnFunction.kt
@@ -1,29 +1,29 @@
-java.lang.Deprecated fun test1() {}
+@java.lang.Deprecated fun test1() {}
 
-java.lang.Deprecated fun test2() {}
+@java.lang.Deprecated fun test2() {}
 
 fun test3() {
-  java.lang.Deprecated fun test3inner() {}
+  @java.lang.Deprecated fun test3inner() {}
 }
 
 class Test4() {
-    java.lang.Deprecated fun test4() {}
+    @java.lang.Deprecated fun test4() {}
 }
 
 class Test5() {
     fun test5() {
-        java.lang.Deprecated fun test5inner() {}
+        @java.lang.Deprecated fun test5inner() {}
     }
 }
 
 class Test6() {
     companion object {
-        java.lang.Deprecated fun test6() {}
+        @java.lang.Deprecated fun test6() {}
     }
 }
 
 object Test7 {
-    java.lang.Deprecated fun test7() {}
+    @java.lang.Deprecated fun test7() {}
 }
 
 // ANNOTATION: java.lang.Deprecated
diff --git a/idea/testData/search/annotations/testAnnotationsWithParameters.kt b/idea/testData/search/annotations/testAnnotationsWithParameters.kt
index 72163d7bca5..41db3089509 100644
--- a/idea/testData/search/annotations/testAnnotationsWithParameters.kt
+++ b/idea/testData/search/annotations/testAnnotationsWithParameters.kt
@@ -1,8 +1,8 @@
-MyAnnotation("f", "s") fun test1() {}
+@MyAnnotation("f", "s") fun test1() {}
 
-MyAnnotation("f", "s") class Test1() {}
+@MyAnnotation("f", "s") class Test1() {}
 
-MyAnnotation("f", "s") val test3 = 1
+@MyAnnotation("f", "s") val test3 = 1
 
 annotation class MyAnnotation(val first: String, val second: String)
 
diff --git a/idea/testData/search/junit/testJunit4.kt b/idea/testData/search/junit/testJunit4.kt
index be61f64ba61..00cd59c5950 100644
--- a/idea/testData/search/junit/testJunit4.kt
+++ b/idea/testData/search/junit/testJunit4.kt
@@ -3,11 +3,11 @@ import org.junit.Test
 class MyTestClass {
     @org.junit.Test fun test1() {}
 
-    org.junit.Test fun test2() {}
+    @org.junit.Test fun test2() {}
 
     @Test fun test3() {}
 
-    Test fun test4() {}
+    @Test fun test4() {}
 
     @Deprecated @org.junit.Test fun test5() {}
 
diff --git a/idea/testData/search/junit/testJunit4Alias.kt b/idea/testData/search/junit/testJunit4Alias.kt
index 5c0652f6285..72bad36d173 100644
--- a/idea/testData/search/junit/testJunit4Alias.kt
+++ b/idea/testData/search/junit/testJunit4Alias.kt
@@ -2,11 +2,11 @@ import org.junit.Test as test
 import org.junit.Test
 
 class MyTestClass {
-    test fun test1() {}
+    @test fun test1() {}
 
     @Deprecated @test fun test2() {}
 
-    Test fun test3() {}
+    @Test fun test3() {}
 }
 
 // ANNOTATION: org.junit.Test
diff --git a/idea/testData/search/junit/testJunit4FancyAlias.kt b/idea/testData/search/junit/testJunit4FancyAlias.kt
index 3532d23a35d..ffbae7f2bdd 100644
--- a/idea/testData/search/junit/testJunit4FancyAlias.kt
+++ b/idea/testData/search/junit/testJunit4FancyAlias.kt
@@ -2,11 +2,11 @@ import org.junit.Test as unittest
 import org.junit.Test
 
 class MyTestClass {
-    unittest fun test1() {}
+    @unittest fun test1() {}
 
     @Deprecated @unittest fun test2() {}
 
-    Test fun test3() {}
+    @Test fun test3() {}
 }
 
 // ANNOTATION: org.junit.Test
diff --git a/idea/testData/stubs/AnnotationOnClass.kt b/idea/testData/stubs/AnnotationOnClass.kt
index df38f557cc0..52828db1c1e 100644
--- a/idea/testData/stubs/AnnotationOnClass.kt
+++ b/idea/testData/stubs/AnnotationOnClass.kt
@@ -1,2 +1,2 @@
-Deprecated class Test {
+@Deprecated class Test {
 }
\ No newline at end of file
diff --git a/idea/testData/stubs/AnnotationOnFunction.kt b/idea/testData/stubs/AnnotationOnFunction.kt
index 1e429e42bb6..6ed34d07d52 100644
--- a/idea/testData/stubs/AnnotationOnFunction.kt
+++ b/idea/testData/stubs/AnnotationOnFunction.kt
@@ -1,2 +1,2 @@
-Deprecated fun foo() {
+@Deprecated fun foo() {
 }
\ No newline at end of file
diff --git a/idea/testData/stubs/QualifiedAnnotationOnFunction.kt b/idea/testData/stubs/QualifiedAnnotationOnFunction.kt
index 4f6d6e65478..767dfcf853b 100644
--- a/idea/testData/stubs/QualifiedAnnotationOnFunction.kt
+++ b/idea/testData/stubs/QualifiedAnnotationOnFunction.kt
@@ -1,2 +1,2 @@
-java.lang.Deprecated fun foo() {
+@java.lang.Deprecated fun foo() {
 }
\ No newline at end of file
diff --git a/idea/testData/stubs/SecondaryConstructors.kt b/idea/testData/stubs/SecondaryConstructors.kt
index 7ee8627aeed..e3d0f241bac 100644
--- a/idea/testData/stubs/SecondaryConstructors.kt
+++ b/idea/testData/stubs/SecondaryConstructors.kt
@@ -4,7 +4,7 @@ class SecondaryConstructors(x: Boolean) {
     init {
     }
 
-    anno constructor(x: String) : this(x == "abc") {
+    @anno constructor(x: String) : this(x == "abc") {
     }
 
     init {
@@ -19,7 +19,7 @@ class SecondaryConstructors(x: Boolean) {
     }
 
     class Nested {
-        anno constructor(z: Int) {}
+        @anno constructor(z: Int) {}
         internal constructor() {}
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt b/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt
index 789f48fafc9..f710045a1fd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt
@@ -269,7 +269,7 @@ class C(param1: String = "", param2: Int = 0) {
     public fun testAnnotationEntry() {
         val file = myFixture.configureByText("Test.kt", """
         annotation class A
-        A class B {}
+        @A class B {}
         """) as JetFile
 
         val klass = file.getDeclarations()[1] as JetClass