Implement parsing annotations and modifiers starting with '@'

compiler/testData/psi/newLabels/oldSyntaxExpressions.txt

@@ -12,38 +12,39 @@ JetFile: oldSyntaxExpressions.kt
     BLOCK
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n    ')
-      LABELED_EXPRESSION
-        PsiErrorElement:Label must be named
+      ANNOTATED_EXPRESSION
+        ANNOTATION_ENTRY
           PsiElement(AT)('@')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('loop1')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        <empty list>
-      PsiWhiteSpace(' ')
-      FOR
-        PsiElement(for)('for')
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('loop1')
         PsiWhiteSpace(' ')
-        PsiElement(LPAR)('(')
-        VALUE_PARAMETER
-          PsiElement(IDENTIFIER)('i')
-        PsiWhiteSpace(' ')
-        PsiElement(in)('in')
-        PsiWhiteSpace(' ')
-        LOOP_RANGE
-          BINARY_EXPRESSION
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('1')
-            OPERATION_REFERENCE
-              PsiElement(RANGE)('..')
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('100')
-        PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        BODY
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace(' ')
-            PsiElement(RBRACE)('}')
+        FOR
+          PsiElement(for)('for')
+          PsiWhiteSpace(' ')
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            PsiElement(IDENTIFIER)('i')
+          PsiWhiteSpace(' ')
+          PsiElement(in)('in')
+          PsiWhiteSpace(' ')
+          LOOP_RANGE
+            BINARY_EXPRESSION
+              INTEGER_CONSTANT
+                PsiElement(INTEGER_LITERAL)('1')
+              OPERATION_REFERENCE
+                PsiElement(RANGE)('..')
+              INTEGER_CONSTANT
+                PsiElement(INTEGER_LITERAL)('100')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          BODY
+            BLOCK
+              PsiElement(LBRACE)('{')
+              PsiWhiteSpace(' ')
+              PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n\n    ')
       DOT_QUALIFIED_EXPRESSION
         REFERENCE_EXPRESSION
@@ -74,17 +75,18 @@ JetFile: oldSyntaxExpressions.kt
         PsiWhiteSpace(' ')
         PARENTHESIZED
           PsiElement(LPAR)('(')
-          LABELED_EXPRESSION
-            PsiErrorElement:Label must be named
+          ANNOTATED_EXPRESSION
+            ANNOTATION_ENTRY
               PsiElement(AT)('@')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('f')
-          PsiErrorElement:Expecting ')'
-            <empty list>
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(INTEGER_LITERAL)('3')
-        PsiElement(RPAR)(')')
+              CONSTRUCTOR_CALLEE
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('f')
+            PsiWhiteSpace(' ')
+            INTEGER_CONSTANT
+              PsiElement(INTEGER_LITERAL)('3')
+          PsiElement(RPAR)(')')
       PsiWhiteSpace('\n\n    ')
       PROPERTY
         PsiElement(val)('val')

compiler/testData/psi/newLabels/recovery.txt

@@ -23,8 +23,8 @@ JetFile: recovery.kt
         OPERATION_REFERENCE
           PsiElement(IDENTIFIER)('c')
         PsiWhiteSpace(' ')
-        LABELED_EXPRESSION
-          PsiErrorElement:Label must be named
+        ANNOTATED_EXPRESSION
+          PsiErrorElement:Expected annotation identifier after '@'
             PsiElement(AT)('@')
           PsiWhiteSpace(' ')
           FUNCTION_LITERAL_EXPRESSION
@@ -123,19 +123,22 @@ JetFile: recovery.kt
             RETURN
               PsiElement(return)('return')
             PsiWhiteSpace('\n        ')
-            LABELED_EXPRESSION
-              PsiErrorElement:Label must be named
+            ANNOTATED_EXPRESSION
+              ANNOTATION_ENTRY
                 PsiElement(AT)('@')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('loop2')
-            PsiWhiteSpace(' ')
-            PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-              PsiElement(INTEGER_LITERAL)('4')
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('loop2')
+              PsiWhiteSpace(' ')
+              INTEGER_CONSTANT
+                PsiElement(INTEGER_LITERAL)('4')
           PsiWhiteSpace('\n    ')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n\n    ')
-      LABELED_EXPRESSION
-        PsiErrorElement:Label must be named
+      ANNOTATED_EXPRESSION
+        PsiErrorElement:Expected annotation identifier after '@'
           PsiElement(AT)('@')
         PsiWhiteSpace(' ')
         WHILE
@@ -230,8 +233,8 @@ JetFile: recovery.kt
             OPERATION_REFERENCE
               PsiElement(IDENTIFIER)('l3')
             PsiWhiteSpace(' ')
-            LABELED_EXPRESSION
-              PsiErrorElement:Label must be named
+            ANNOTATED_EXPRESSION
+              PsiErrorElement:Expected annotation identifier after '@'
                 PsiElement(AT)('@')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION

compiler/testData/psi/newLabels/spaceBeforeLabelReference.txt

@@ -143,14 +143,17 @@ JetFile: spaceBeforeLabelReference.kt
         PsiElement(return)('return')
       PsiComment(EOL_COMMENT)('//')
       PsiWhiteSpace('\n')
-      LABELED_EXPRESSION
-        PsiErrorElement:Label must be named
+      ANNOTATED_EXPRESSION
+        ANNOTATION_ENTRY
           PsiElement(AT)('@')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('l7')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(INTEGER_LITERAL)('4')
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('l7')
+        PsiWhiteSpace(' ')
+        INTEGER_CONSTANT
+          PsiElement(INTEGER_LITERAL)('4')
       PsiWhiteSpace('\n\n    ')
       PROPERTY
         PsiElement(val)('val')