Report syntax error on unescaped annotation

Also adjust parser testData

compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java

@@ -462,6 +462,7 @@ public class JetParsing extends AbstractJetParsing {
                 // modifier advanced
             }
             else if (annotationParsingMode.allowShortAnnotations && at(IDENTIFIER)) {
+                error("Use '@' symbol before annotations");
                 parseAnnotation(annotationParsingMode);
             }
             else {
@@ -532,11 +533,11 @@ public class JetParsing extends AbstractJetParsing {
 
     /*
      * annotation
-     *   : annotationPrefix? unescapedAnnotation
+     *   : "@" (annotationUseSiteTarget ":")? unescapedAnnotation
      *   ;
      *
      * annotationList
-     *   : annotationPrefix "[" unescapedAnnotation+ "]"
+     *   : "@" (annotationUseSiteTarget ":")? "[" unescapedAnnotation+ "]"
      *   ;
      *
      *   annotationUseSiteTarget
@@ -548,10 +549,6 @@ public class JetParsing extends AbstractJetParsing {
      *   : "param"
      *   : "sparam"
      *   ;
-     *
-     *  annotationPrefix:
-     *   : ("@" (annotationUseSiteTarget ":")?)
-     *   ;
      */
     private boolean parseAnnotationOrList(AnnotationParsingMode mode) {
         if (at(AT)) {
@@ -697,7 +694,7 @@ public class JetParsing extends AbstractJetParsing {
 
     /*
      * annotation
-     *   : annotationPrefix? unescapedAnnotation
+     *   : "@" (annotationUseSiteTarget ":")? unescapedAnnotation
      *   ;
      *
      * unescapedAnnotation

compiler/testData/psi/DynamicSoftKeyword.txt

@@ -5,6 +5,8 @@ JetFile: DynamicSoftKeyword.kt
     <empty list>
   CLASS
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE

compiler/testData/psi/EnumOldConstructorSyntax.txt

@@ -36,6 +36,8 @@ JetFile: EnumOldConstructorSyntax.kt
       PsiWhiteSpace(' ')
       PROPERTY
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE

compiler/testData/psi/EnumWithAnnotationKeyword.txt

@@ -29,6 +29,8 @@ JetFile: EnumWithAnnotationKeyword.kt
       PsiElement(enum)('enum')
       PsiWhiteSpace(' ')
       PsiElement(annotation)('annotation')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE

compiler/testData/psi/FileStart_ERR.txt

@@ -9,6 +9,8 @@ JetFile: FileStart_ERR.kt
     PsiElement(package)('package')
   PsiWhiteSpace(' ')
   MODIFIER_LIST
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
@@ -19,6 +21,8 @@ JetFile: FileStart_ERR.kt
             PsiElement(DOT)('.')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     PsiWhiteSpace('\n')
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
@@ -26,6 +30,8 @@ JetFile: FileStart_ERR.kt
           USER_TYPE
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('import')
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     PsiWhiteSpace(' ')
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE

compiler/testData/psi/InterfaceWithEnumKeyword.txt

@@ -20,6 +20,8 @@ JetFile: InterfaceWithEnumKeyword.kt
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n    ')
       MODIFIER_LIST
+        PsiErrorElement:Use '@' symbol before annotations
+          <empty list>
         ANNOTATION_ENTRY
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
@@ -45,6 +47,8 @@ JetFile: InterfaceWithEnumKeyword.kt
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n    ')
       MODIFIER_LIST
+        PsiErrorElement:Use '@' symbol before annotations
+          <empty list>
         ANNOTATION_ENTRY
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE

compiler/testData/psi/NonTypeBeforeDotInBaseClass.txt

@@ -30,6 +30,8 @@ JetFile: NonTypeBeforeDotInBaseClass.kt
         PsiElement(DOT)('.')
       FUN
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE

compiler/testData/psi/ParameterNameMising.txt

@@ -73,6 +73,8 @@ JetFile: ParameterNameMising.kt
       PsiElement(LPAR)('(')
       VALUE_PARAMETER
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE

compiler/testData/psi/ParameterType.kt

@@ -2,8 +2,8 @@ fun test1(a) {}
 fun test2(a = 4) {}
 fun test3(c: Int) {}
 
-fun test4(ann(parameter) a) {}
+fun test4(@ann(parameter) a) {}
-fun test5(ann a) {}
+fun test5(@ann a) {}
 
 fun test() {
     try {

compiler/testData/psi/ParameterType.txt

@@ -65,6 +65,7 @@ JetFile: ParameterType.kt
       VALUE_PARAMETER
         MODIFIER_LIST
           ANNOTATION_ENTRY
+            PsiElement(AT)('@')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
@@ -93,6 +94,7 @@ JetFile: ParameterType.kt
       VALUE_PARAMETER
         MODIFIER_LIST
           ANNOTATION_ENTRY
+            PsiElement(AT)('@')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE

compiler/testData/psi/ParameterType_ERR.txt

@@ -34,6 +34,8 @@ JetFile: ParameterType_ERR.kt
       PsiErrorElement:Expecting ')'
         PsiElement(LPAR)('(')
   MODIFIER_LIST
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
@@ -66,6 +68,8 @@ JetFile: ParameterType_ERR.kt
       PsiErrorElement:Expecting ')'
         PsiElement(LPAR)('(')
   MODIFIER_LIST
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE

compiler/testData/psi/Properties_ERR.txt

@@ -187,6 +187,8 @@ JetFile: Properties_ERR.kt
   PsiWhiteSpace(' ')
   PROPERTY
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE

compiler/testData/psi/RootPackage.txt

@@ -22,6 +22,8 @@ JetFile: RootPackage.kt
   PsiWhiteSpace(' ')
   FUN
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE

compiler/testData/psi/SimpleClassMembers_ERR.txt

@@ -32,6 +32,8 @@ JetFile: SimpleClassMembers_ERR.kt
           PsiElement(LBRACE)('{')
           PsiWhiteSpace('\n    ')
           MODIFIER_LIST
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE

compiler/testData/psi/SimpleModifiers.txt

@@ -42,6 +42,8 @@ JetFile: SimpleModifiers.kt
       PsiElement(in)('in')
       PsiWhiteSpace('\n')
       PsiElement(out)('out')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace('\n')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -84,6 +86,8 @@ JetFile: SimpleModifiers.kt
           PsiElement(in)('in')
           PsiWhiteSpace('\n        ')
           PsiElement(out)('out')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace('\n        ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE

compiler/testData/psi/SoftKeywords.txt

@@ -55,6 +55,8 @@ JetFile: SoftKeywords.kt
       PsiElement(in)('in')
       PsiWhiteSpace('\n')
       PsiElement(out)('out')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace('\n')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE

compiler/testData/psi/annotation/Annotations.txt

@@ -160,6 +160,8 @@ JetFile: Annotations.kt
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace('\n')
       PsiElement(out)('out')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace('\n')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -322,6 +324,8 @@ JetFile: Annotations.kt
           PsiElement(in)('in')
           PsiWhiteSpace('\n')
           PsiElement(out)('out')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace('\n')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE

compiler/testData/psi/annotation/Annotations_ERR.txt

@@ -198,6 +198,8 @@ JetFile: Annotations_ERR.kt
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace('\n')
       PsiElement(out)('out')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace('\n')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -277,6 +279,8 @@ JetFile: Annotations_ERR.kt
           PsiElement(in)('in')
           PsiWhiteSpace('\n')
           PsiElement(out)('out')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace('\n')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE

compiler/testData/psi/annotation/ShortAnnotations.txt

@@ -1,12 +1,16 @@
 JetFile: ShortAnnotations.kt
   PACKAGE_DIRECTIVE
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -20,6 +24,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -41,6 +47,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -58,12 +66,16 @@ JetFile: ShortAnnotations.kt
   PsiWhiteSpace('\n\n')
   CLASS
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -77,6 +89,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -98,6 +112,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -112,12 +128,16 @@ JetFile: ShortAnnotations.kt
   PsiWhiteSpace('\n')
   OBJECT_DECLARATION
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -131,6 +151,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -152,6 +174,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -167,12 +191,16 @@ JetFile: ShortAnnotations.kt
   PsiWhiteSpace('\n')
   FUN
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -186,6 +214,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -207,6 +237,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -228,12 +260,16 @@ JetFile: ShortAnnotations.kt
   PsiWhiteSpace('\n')
   PROPERTY
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -247,6 +283,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -268,6 +306,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -294,12 +334,16 @@ JetFile: ShortAnnotations.kt
   PsiWhiteSpace('\n')
   PROPERTY
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -313,6 +357,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -334,6 +380,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -360,12 +408,16 @@ JetFile: ShortAnnotations.kt
   PsiWhiteSpace('\n')
   TYPEDEF
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -379,6 +431,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -400,6 +454,8 @@ JetFile: ShortAnnotations.kt
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
           PsiElement(RPAR)(')')
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
@@ -429,12 +485,16 @@ JetFile: ShortAnnotations.kt
       PsiWhiteSpace('\n  ')
       OBJECT_DECLARATION
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -448,6 +508,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -469,6 +531,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -487,12 +551,16 @@ JetFile: ShortAnnotations.kt
       PsiWhiteSpace('\n  ')
       CLASS
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -506,6 +574,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -527,6 +597,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -541,12 +613,16 @@ JetFile: ShortAnnotations.kt
       PsiWhiteSpace('\n  ')
       OBJECT_DECLARATION
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -560,6 +636,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -581,6 +659,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -596,12 +676,16 @@ JetFile: ShortAnnotations.kt
       PsiWhiteSpace('\n  ')
       FUN
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -615,6 +699,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -636,6 +722,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -657,12 +745,16 @@ JetFile: ShortAnnotations.kt
       PsiWhiteSpace('\n  ')
       PROPERTY
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -676,6 +768,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -697,6 +791,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -723,12 +819,16 @@ JetFile: ShortAnnotations.kt
       PsiWhiteSpace('\n  ')
       PROPERTY
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -742,6 +842,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -763,6 +865,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -789,12 +893,16 @@ JetFile: ShortAnnotations.kt
       PsiWhiteSpace('\n  ')
       TYPEDEF
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -808,6 +916,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -829,6 +939,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -850,12 +962,16 @@ JetFile: ShortAnnotations.kt
       PsiWhiteSpace('\n\n  ')
       ANONYMOUS_INITIALIZER
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -869,6 +985,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -890,6 +1008,8 @@ JetFile: ShortAnnotations.kt
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
               PsiElement(RPAR)(')')
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
@@ -923,12 +1043,16 @@ JetFile: ShortAnnotations.kt
         PsiElement(LPAR)('(')
         PROPERTY
           MODIFIER_LIST
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
                   USER_TYPE
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('foo')
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
@@ -942,6 +1066,8 @@ JetFile: ShortAnnotations.kt
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
                 PsiElement(RPAR)(')')
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
@@ -963,6 +1089,8 @@ JetFile: ShortAnnotations.kt
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
                 PsiElement(RPAR)(')')
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE

compiler/testData/psi/annotation/at/declarationsJustAtTyped.kt

@@ -1,4 +1,4 @@
-private @ @[Ann1(1)] Ann3("2") class A(
+private @ @[Ann1(1)] @Ann3("2") class A(
         @ private val x: Int,
         @ private var y: Int,
         @ open z: Int

compiler/testData/psi/annotation/at/declarationsJustAtTyped.txt

@@ -28,6 +28,7 @@ JetFile: declarationsJustAtTyped.kt
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
+        PsiElement(AT)('@')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE

compiler/testData/psi/annotation/at/validDeclarations.kt

@@ -1,4 +1,4 @@
-private @open @[Ann1(1)] @Ann2("1") Ann3("2") class A(
+private @open @[Ann1(1)] @Ann2("1") @Ann3("2") class A(
         @Volatile(1) private val x: @AnnType("3") @open Int,
         @private var y: Int,
         @open z: Int

compiler/testData/psi/annotation/at/validDeclarations.txt

@@ -50,6 +50,7 @@ JetFile: validDeclarations.kt
           PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
+        PsiElement(AT)('@')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE

compiler/testData/psi/annotation/forParameters.txt

@@ -78,6 +78,8 @@ JetFile: forParameters.kt
               PsiElement(AT)('@')
             PsiWhiteSpace(' ')
             PsiElement(in)('in')
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
@@ -189,6 +191,8 @@ JetFile: forParameters.kt
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
           MODIFIER_LIST
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
@@ -221,6 +225,8 @@ JetFile: forParameters.kt
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
           MODIFIER_LIST
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
@@ -259,6 +265,8 @@ JetFile: forParameters.kt
         PsiElement(LPAR)('(')
         MULTI_VARIABLE_DECLARATION
           MODIFIER_LIST
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
@@ -276,6 +284,8 @@ JetFile: forParameters.kt
           PsiWhiteSpace(' ')
           MULTI_VARIABLE_DECLARATION_ENTRY
             MODIFIER_LIST
+              PsiErrorElement:Use '@' symbol before annotations
+                <empty list>
               ANNOTATION_ENTRY
                 CONSTRUCTOR_CALLEE
                   TYPE_REFERENCE
@@ -309,6 +319,8 @@ JetFile: forParameters.kt
         PsiElement(LPAR)('(')
         MULTI_VARIABLE_DECLARATION
           MODIFIER_LIST
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
@@ -323,6 +335,8 @@ JetFile: forParameters.kt
           PsiWhiteSpace(' ')
           MULTI_VARIABLE_DECLARATION_ENTRY
             MODIFIER_LIST
+              PsiErrorElement:Use '@' symbol before annotations
+                <empty list>
               ANNOTATION_ENTRY
                 CONSTRUCTOR_CALLEE
                   TYPE_REFERENCE
@@ -356,6 +370,8 @@ JetFile: forParameters.kt
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
           MODIFIER_LIST
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
@@ -390,6 +406,8 @@ JetFile: forParameters.kt
         PsiElement(LPAR)('(')
         MULTI_VARIABLE_DECLARATION
           MODIFIER_LIST
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
@@ -406,6 +424,8 @@ JetFile: forParameters.kt
           PsiWhiteSpace(' ')
           MULTI_VARIABLE_DECLARATION_ENTRY
             MODIFIER_LIST
+              PsiErrorElement:Use '@' symbol before annotations
+                <empty list>
               ANNOTATION_ENTRY
                 CONSTRUCTOR_CALLEE
                   TYPE_REFERENCE
@@ -440,6 +460,8 @@ JetFile: forParameters.kt
         VALUE_PARAMETER
           MODIFIER_LIST
             PsiElement(private)('private')
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
@@ -476,6 +498,8 @@ JetFile: forParameters.kt
         MULTI_VARIABLE_DECLARATION
           MODIFIER_LIST
             PsiElement(private)('private')
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE
@@ -493,6 +517,8 @@ JetFile: forParameters.kt
           PsiWhiteSpace(' ')
           MULTI_VARIABLE_DECLARATION_ENTRY
             MODIFIER_LIST
+              PsiErrorElement:Use '@' symbol before annotations
+                <empty list>
               ANNOTATION_ENTRY
                 CONSTRUCTOR_CALLEE
                   TYPE_REFERENCE

compiler/testData/psi/annotation/modifiersMigration/oldUsages.txt

@@ -58,6 +58,8 @@ JetFile: oldUsages.kt
       PsiWhiteSpace('\n\n    ')
       FUN
         MODIFIER_LIST
+          PsiErrorElement:Use '@' symbol before annotations
+            <empty list>
           ANNOTATION_ENTRY
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE

compiler/testData/psi/annotation/options/java.kt

@@ -5,6 +5,6 @@ annotation
 class my
 
 annotation 
-Retention(RetentionPolicy.RUNTIME) 
+@Retention(RetentionPolicy.RUNTIME)
-Target(ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR) 
+@Target(ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR)
 class my1

compiler/testData/psi/annotation/options/java.txt

@@ -61,6 +61,7 @@ JetFile: java.kt
       PsiElement(annotation)('annotation')
       PsiWhiteSpace(' \n')
       ANNOTATION_ENTRY
+        PsiElement(AT)('@')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
@@ -76,8 +77,9 @@ JetFile: java.kt
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('RUNTIME')
           PsiElement(RPAR)(')')
-      PsiWhiteSpace(' \n')
+      PsiWhiteSpace('\n')
       ANNOTATION_ENTRY
+        PsiElement(AT)('@')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
@@ -102,7 +104,7 @@ JetFile: java.kt
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('CONSTRUCTOR')
           PsiElement(RPAR)(')')
-    PsiWhiteSpace(' \n')
+    PsiWhiteSpace('\n')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('my1')

compiler/testData/psi/annotation/targeted/onFile/withoutPackageWithSimpleAnnotation.kt

@@ -1,4 +1,4 @@
 @file:foo
-foo bar
+@foo @bar
 @file: baz
 fun foo() {}

compiler/testData/psi/annotation/targeted/onFile/withoutPackageWithSimpleAnnotation.txt

@@ -18,6 +18,7 @@ JetFile: withoutPackageWithSimpleAnnotation.kt
   FUN
     MODIFIER_LIST
       ANNOTATION_ENTRY
+        PsiElement(AT)('@')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
@@ -25,6 +26,7 @@ JetFile: withoutPackageWithSimpleAnnotation.kt
                 PsiElement(IDENTIFIER)('foo')
       PsiWhiteSpace(' ')
       ANNOTATION_ENTRY
+        PsiElement(AT)('@')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE

compiler/testData/psi/annotation/targeted/onParam/targetExpected.txt

@@ -171,6 +171,8 @@ JetFile: targetExpected.kt
               PsiErrorElement:Expecting a list of annotations
                 <empty list>
               PsiElement(RBRACKET)(']')
+            PsiErrorElement:Use '@' symbol before annotations
+              <empty list>
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
               CONSTRUCTOR_CALLEE

compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt

@@ -290,6 +290,8 @@ JetFile: FunctionsWithFunctionReceivers.kt
     PsiElement(DOT)('.')
   FUN
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
@@ -434,6 +436,8 @@ JetFile: FunctionsWithFunctionReceivers.kt
   PsiWhiteSpace('\n')
   CLASS
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE

compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt

@@ -311,6 +311,8 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
       PsiElement(RBRACKET)(']')
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     PsiWhiteSpace(' ')
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
@@ -331,6 +333,8 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
   PsiErrorElement:Expecting a top level declaration
     PsiElement(LPAR)('(')
   MODIFIER_LIST
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
@@ -351,6 +355,8 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
     PsiElement(DOT)('.')
   FUN
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
@@ -436,6 +442,8 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
   PsiErrorElement:Expecting a top level declaration
     PsiElement(LBRACKET)('[')
   MODIFIER_LIST
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
@@ -450,6 +458,8 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
   PsiErrorElement:Expecting a top level declaration
     PsiElement(LPAR)('(')
   MODIFIER_LIST
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
@@ -474,6 +484,8 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
     PsiElement(DOT)('.')
   FUN
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
@@ -543,6 +555,8 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
   PsiWhiteSpace('\n')
   CLASS
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE

compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt

@@ -449,6 +449,8 @@ JetFile: PropertiesWithFunctionReceivers.kt
   PsiWhiteSpace('\n   ')
   FUN
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
@@ -526,6 +528,8 @@ JetFile: PropertiesWithFunctionReceivers.kt
   PsiWhiteSpace('\n   ')
   FUN
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE

compiler/testData/psi/greatSyntacticShift/functionTypes.txt

@@ -18,6 +18,8 @@ JetFile: functionTypes.kt
   PsiWhiteSpace(' ')
   FUN
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE

compiler/testData/psi/packages/PackageLeadingDotDoubleID.txt

@@ -10,6 +10,8 @@ JetFile: PackageLeadingDotDoubleID.kt
     <empty list>
   PsiWhiteSpace(' ')
   MODIFIER_LIST
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE

compiler/testData/psi/packages/PackageLongNameDoubleID.txt

@@ -8,6 +8,8 @@ JetFile: PackageLongNameDoubleID.kt
     <empty list>
   PsiWhiteSpace(' ')
   MODIFIER_LIST
+    PsiErrorElement:Use '@' symbol before annotations
+      <empty list>
     ANNOTATION_ENTRY
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE

compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.kt

@@ -1,19 +1,19 @@
 class Outer1 {
     class Nested1
 
-    private Ann constructor()
+    private @Ann constructor()
 }
 
 class Outer2 {
     class Nested2;
 
-    private Ann constructor()
+    private @Ann constructor()
 }
 
 class Outer3 {
     class Nested3
 
-    private Ann constructor() : super() {}
+    private @Ann constructor() : super() {}
 }
 
 class Outer4 {

compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.txt

@@ -21,6 +21,7 @@ JetFile: nestedClassAmbiguity.kt
             PsiElement(private)('private')
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
+              PsiElement(AT)('@')
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
                   USER_TYPE
@@ -53,6 +54,7 @@ JetFile: nestedClassAmbiguity.kt
           PsiElement(private)('private')
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
+            PsiElement(AT)('@')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
@@ -87,6 +89,7 @@ JetFile: nestedClassAmbiguity.kt
             PsiElement(private)('private')
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
+              PsiElement(AT)('@')
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
                   USER_TYPE

compiler/testData/psi/primaryConstructor/recovery.kt

@@ -13,6 +13,6 @@ class A3 Ann {
 class A4 constructor {}
 class A5 constructor : Base {}
 
-class A7 Ann(1) (x: Int)
+class A7 @Ann(1) (x: Int)
-class A8 Ann() {}
+class A8 @Ann() {}
-class A9 Ann() : Base()
+class A9 @Ann() : Base()

compiler/testData/psi/primaryConstructor/recovery.txt

@@ -57,6 +57,8 @@ JetFile: recovery.kt
     PsiWhiteSpace(' ')
     PRIMARY_CONSTRUCTOR
       MODIFIER_LIST
+        PsiErrorElement:Use '@' symbol before annotations
+          <empty list>
         ANNOTATION_ENTRY
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
@@ -86,6 +88,8 @@ JetFile: recovery.kt
   PsiWhiteSpace(' ')
   CLASS
     MODIFIER_LIST
+      PsiErrorElement:Use '@' symbol before annotations
+        <empty list>
       ANNOTATION_ENTRY
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
@@ -99,6 +103,8 @@ JetFile: recovery.kt
     PsiWhiteSpace(' ')
     PRIMARY_CONSTRUCTOR
       MODIFIER_LIST
+        PsiErrorElement:Use '@' symbol before annotations
+          <empty list>
         ANNOTATION_ENTRY
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
@@ -166,6 +172,7 @@ JetFile: recovery.kt
     PRIMARY_CONSTRUCTOR
       MODIFIER_LIST
         ANNOTATION_ENTRY
+          PsiElement(AT)('@')
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
               USER_TYPE
@@ -198,6 +205,7 @@ JetFile: recovery.kt
     PRIMARY_CONSTRUCTOR
       MODIFIER_LIST
         ANNOTATION_ENTRY
+          PsiElement(AT)('@')
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
               USER_TYPE
@@ -221,6 +229,7 @@ JetFile: recovery.kt
     PRIMARY_CONSTRUCTOR
       MODIFIER_LIST
         ANNOTATION_ENTRY
+          PsiElement(AT)('@')
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
               USER_TYPE

compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.kt

@@ -1,25 +1,30 @@
 class Outer1 {
     class Nested1
 
-    private Ann ()
+    private @Ann ()
 }
 
 class Outer2 {
-    class Nested2 private Ann
+    class Nested2 private @Ann
     fun foo() {}
 }
 
 class Outer3 {
-    class Nested3 private Ann {}
+    class Nested3 private @Ann {}
     fun foo()
 }
 
 class Outer4 {
-    class Nested3 private Ann() {}
+    class Nested3 private @Ann() {}
     fun foo()
 }
 
-class Outer4 {
+class Outer5 {
-    class Nested3 private Ann() : Base()
+    class Nested3 private @Ann() : Base()
     fun foo()
 }
+
+class Outer6 {
+    class Nested1
+    private Ann ()
+}

compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.txt

@@ -20,6 +20,7 @@ JetFile: recoveryNestedClassAmbiguity.kt
         PsiElement(private)('private')
         PsiWhiteSpace(' ')
         ANNOTATION_ENTRY
+          PsiElement(AT)('@')
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
               USER_TYPE
@@ -52,6 +53,7 @@ JetFile: recoveryNestedClassAmbiguity.kt
           PsiElement(private)('private')
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
+            PsiElement(AT)('@')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
@@ -89,6 +91,7 @@ JetFile: recoveryNestedClassAmbiguity.kt
             PsiElement(private)('private')
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
+              PsiElement(AT)('@')
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
                   USER_TYPE
@@ -129,6 +132,7 @@ JetFile: recoveryNestedClassAmbiguity.kt
             PsiElement(private)('private')
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
+              PsiElement(AT)('@')
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
                   USER_TYPE
@@ -157,7 +161,7 @@ JetFile: recoveryNestedClassAmbiguity.kt
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('Outer4')
+    PsiElement(IDENTIFIER)('Outer5')
     PsiWhiteSpace(' ')
     CLASS_BODY
       PsiElement(LBRACE)('{')
@@ -172,6 +176,7 @@ JetFile: recoveryNestedClassAmbiguity.kt
             PsiElement(private)('private')
             PsiWhiteSpace(' ')
             ANNOTATION_ENTRY
+              PsiElement(AT)('@')
               CONSTRUCTOR_CALLEE
                 TYPE_REFERENCE
                   USER_TYPE
@@ -205,3 +210,36 @@ JetFile: recoveryNestedClassAmbiguity.kt
           PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
       PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  CLASS
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('Outer6')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      CLASS
+        PsiElement(class)('class')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('Nested1')
+      PsiWhiteSpace('\n    ')
+      MODIFIER_LIST
+        PsiElement(private)('private')
+        PsiErrorElement:Use '@' symbol before annotations
+          <empty list>
+        PsiWhiteSpace(' ')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('Ann')
+          PsiWhiteSpace(' ')
+          VALUE_ARGUMENT_LIST
+            PsiElement(LPAR)('(')
+            PsiElement(RPAR)(')')
+      PsiErrorElement:Expecting member declaration
+        <empty list>
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/primaryConstructor/valid.kt

@@ -6,8 +6,10 @@ private constructor(y: Int) : Base1(), Base2 {
 }
 class A2 @private constructor(y: Int)
 
-class A3 Ann(1) private constructor(y: Int)
+class A3 @Ann(1) private constructor(y: Int)
 
-class A4 private Ann(1) constructor(y: Int)
+class A4 private @Ann(1) constructor(y: Int)
 
 class A5 @Ann private constructor() {}
+
+class A6 Ann() private constructor() {}

compiler/testData/psi/primaryConstructor/valid.txt

@@ -112,6 +112,7 @@ JetFile: valid.kt
     PRIMARY_CONSTRUCTOR
       MODIFIER_LIST
         ANNOTATION_ENTRY
+          PsiElement(AT)('@')
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
               USER_TYPE
@@ -149,6 +150,7 @@ JetFile: valid.kt
         PsiElement(private)('private')
         PsiWhiteSpace(' ')
         ANNOTATION_ENTRY
+          PsiElement(AT)('@')
           CONSTRUCTOR_CALLEE
             TYPE_REFERENCE
               USER_TYPE
@@ -199,3 +201,33 @@ JetFile: valid.kt
     CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  CLASS
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('A6')
+    PsiWhiteSpace(' ')
+    PRIMARY_CONSTRUCTOR
+      MODIFIER_LIST
+        PsiErrorElement:Use '@' symbol before annotations
+          <empty list>
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('Ann')
+          VALUE_ARGUMENT_LIST
+            PsiElement(LPAR)('(')
+            PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(private)('private')
+      PsiWhiteSpace(' ')
+      PsiElement(constructor)('constructor')
+      VALUE_PARAMETER_LIST
+        PsiElement(LPAR)('(')
+        PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
+      PsiElement(LBRACE)('{')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/recovery/PackageNewLineRecovery.kt

@@ -1,2 +1,2 @@
 package foo.bar.baz.buzz.
-test val a = 12
+@test val a = 12

compiler/testData/psi/recovery/PackageNewLineRecovery.txt

@@ -25,6 +25,7 @@ JetFile: PackageNewLineRecovery.kt
   PROPERTY
     MODIFIER_LIST
       ANNOTATION_ENTRY
+        PsiElement(AT)('@')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE

compiler/testData/psi/recovery/initRecovery.kt

@@ -3,7 +3,7 @@ class A {
 }
 
 class B {
-    Ann init
+    @Ann init
     val x = 1
     init
     fun foo() {}

compiler/testData/psi/recovery/initRecovery.txt

@@ -29,6 +29,7 @@ JetFile: initRecovery.kt
       ANONYMOUS_INITIALIZER
         MODIFIER_LIST
           ANNOTATION_ENTRY
+            PsiElement(AT)('@')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE

compiler/testData/psi/secondaryConstructors/basic.kt

@@ -3,15 +3,15 @@ class A {
 
     val x: Int
 
-    private annot constructor(x: Int) {}
+    private @annot constructor(x: Int) {}
 
     @constructor fun constructor() {}
 
-    annot protected constructor(x: Int, y: Int) : this(1,2) {}
+    @annot protected constructor(x: Int, y: Int) : this(1,2) {}
 
     @[constructor] public constructor() : super() {
         x = 1
     }
 }
 
-constructor class B
+@constructor class B

compiler/testData/psi/secondaryConstructors/basic.txt

@@ -40,6 +40,7 @@ JetFile: basic.kt
           PsiElement(private)('private')
           PsiWhiteSpace(' ')
           ANNOTATION_ENTRY
+            PsiElement(AT)('@')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
@@ -90,6 +91,7 @@ JetFile: basic.kt
       SECONDARY_CONSTRUCTOR
         MODIFIER_LIST
           ANNOTATION_ENTRY
+            PsiElement(AT)('@')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE
                 USER_TYPE
@@ -190,6 +192,7 @@ JetFile: basic.kt
   CLASS
     MODIFIER_LIST
       ANNOTATION_ENTRY
+        PsiElement(AT)('@')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE

grammar/src/attributes.grm

@@ -7,11 +7,11 @@ annotations
   ;
 
 annotation
-  : annotationPrefix? unescapedAnnotation
+  : "@" (annotationUseSiteTarget ":")? unescapedAnnotation
   ;
 
 annotationList
-  : annotationPrefix "[" unescapedAnnotation+ "]"
+  : "@" (annotationUseSiteTarget ":")? "[" unescapedAnnotation+ "]"
   ;
 
 annotationUseSiteTarget
@@ -24,10 +24,6 @@ annotationUseSiteTarget
   : "sparam"
   ;
 
-annotationPrefix:
-  : ("@" (annotationUseSiteTarget ":")?)
-  ;
-
 unescapedAnnotation
   : SimpleName{"."} typeArguments? valueArguments?
   ;