Parser: allow function types as receiver type for function

compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java

@@ -930,26 +930,10 @@ public class JetParsing extends AbstractJetParsing {
 
         myBuilder.disableJoiningComplexTokens();
 
-        // TODO: extract constant
-        int lastDot = matchTokenStreamPredicate(new LastBefore(
-                new AtSet(DOT, SAFE_ACCESS),
-                new AbstractTokenStreamPredicate() {
-                    @Override
-                    public boolean matching(boolean topLevel) {
-                        if (topLevel && (at(EQ) || at(COLON))) return true;
-                        if (topLevel && at(IDENTIFIER)) {
-                            IElementType lookahead = lookahead(1);
-                            return lookahead != LT && lookahead != DOT && lookahead != SAFE_ACCESS && lookahead != QUEST;
-                        }
-                        return false;
-                    }
-                }));
-
         PsiBuilder.Marker receiver = mark();
-        parseReceiverType("property", propertyNameFollow, lastDot);
+        boolean receiverTypeDeclared = parseReceiverType("property", propertyNameFollow);
 
         boolean multiDeclaration = at(LPAR);
-        boolean receiverTypeDeclared = lastDot != -1;
 
         errorIf(receiver, multiDeclaration && receiverTypeDeclared, "Receiver type is not allowed on a multi-declaration");
 
@@ -1155,12 +1139,11 @@ public class JetParsing extends AbstractJetParsing {
         }
 
         myBuilder.disableJoiningComplexTokens();
-        int lastDot = findLastBefore(RECEIVER_TYPE_TERMINATORS, TokenSet.create(LPAR), true);
 
         TokenSet functionNameFollow = TokenSet.create(LT, LPAR, COLON, EQ);
-        parseReceiverType("function", functionNameFollow, lastDot);
+        boolean receiverFound = parseReceiverType("function", functionNameFollow);
 
-        parseFunctionOrPropertyName(lastDot != -1, "function", functionNameFollow);
+        parseFunctionOrPropertyName(receiverFound, "function", functionNameFollow);
 
         myBuilder.restoreJoiningComplexTokensState();
 
@@ -1201,20 +1184,72 @@ public class JetParsing extends AbstractJetParsing {
     /*
      *   (type "." | annotations)?
      */
-    private void parseReceiverType(String title, TokenSet nameFollow, int lastDot) {
+    private boolean parseReceiverType(String title, TokenSet nameFollow) {
-        if (lastDot == -1) { // There's no explicit receiver type specified
+        PsiBuilder.Marker annotations = mark();
-            parseAnnotations(REGULAR_ANNOTATIONS_ONLY_WITH_BRACKETS);
+        boolean annotationsPresent = parseAnnotations(REGULAR_ANNOTATIONS_ONLY_WITH_BRACKETS);
-        }
+        int lastDot = lastDotAfterReceiver();
-        else {
+        boolean receiverPresent = lastDot != -1;
-            createTruncatedBuilder(lastDot).parseTypeRef();
+        if (annotationsPresent) {
-
+            if (receiverPresent) {
-            if (atSet(RECEIVER_TYPE_TERMINATORS)) {
+                annotations.rollbackTo();
-                advance(); // expectation
             }
             else {
-                errorWithRecovery("Expecting '.' before a " + title + " name", nameFollow);
+                annotations.error("Annotations are not allowed in this position");
             }
         }
+        else {
+            annotations.drop();
+        }
+
+        if (!receiverPresent) return false;
+
+        createTruncatedBuilder(lastDot).parseTypeRef();
+
+        if (atSet(RECEIVER_TYPE_TERMINATORS)) {
+            advance(); // expectation
+        }
+        else {
+            errorWithRecovery("Expecting '.' before a " + title + " name", nameFollow);
+        }
+        return true;
+    }
+
+    private int lastDotAfterReceiver() {
+        if (at(LPAR)) {
+            return matchTokenStreamPredicate(
+                    new FirstBefore(
+                            new AtSet(RECEIVER_TYPE_TERMINATORS),
+                            new AbstractTokenStreamPredicate() {
+                                @Override
+                                public boolean matching(boolean topLevel) {
+                                    if (topLevel && definitelyOutOfReceiver()) {
+                                        return true;
+                                    }
+                                    return topLevel && !at(QUEST) && !at(LPAR) && !at(RPAR);
+                                }
+                            }
+                    ));
+        }
+        else {
+            return matchTokenStreamPredicate(
+                    new LastBefore(
+                            new AtSet(RECEIVER_TYPE_TERMINATORS),
+                            new AbstractTokenStreamPredicate() {
+                                @Override
+                                public boolean matching(boolean topLevel) {
+                                    if (topLevel && (definitelyOutOfReceiver() || at(LPAR))) return true;
+                                    if (topLevel && at(IDENTIFIER)) {
+                                        IElementType lookahead = lookahead(1);
+                                        return lookahead != LT && lookahead != DOT && lookahead != SAFE_ACCESS && lookahead != QUEST;
+                                    }
+                                    return false;
+                                }
+                            }));
+        }
+    }
+
+    private boolean definitelyOutOfReceiver() {
+        return atSet(EQ, COLON, LBRACE, BY_KEYWORD) || atSet(TOPLEVEL_OBJECT_FIRST);
     }
 
     /*

compiler/testData/psi/Functions.txt

@@ -12,15 +12,16 @@ JetFile: Functions.kt
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    ANNOTATION
+    PsiErrorElement:Annotations are not allowed in this position
-      PsiElement(LBRACKET)('[')
+      ANNOTATION
-      ANNOTATION_ENTRY
+        PsiElement(LBRACKET)('[')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACKET)(']')
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
     VALUE_PARAMETER_LIST
@@ -168,15 +169,16 @@ JetFile: Functions.kt
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    ANNOTATION
+    PsiErrorElement:Annotations are not allowed in this position
-      PsiElement(LBRACKET)('[')
+      ANNOTATION
-      ANNOTATION_ENTRY
+        PsiElement(LBRACKET)('[')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACKET)(']')
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
     VALUE_PARAMETER_LIST
@@ -331,15 +333,16 @@ JetFile: Functions.kt
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    ANNOTATION
+    PsiErrorElement:Annotations are not allowed in this position
-      PsiElement(LBRACKET)('[')
+      ANNOTATION
-      ANNOTATION_ENTRY
+        PsiElement(LBRACKET)('[')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACKET)(']')
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
     VALUE_PARAMETER_LIST

compiler/testData/psi/Properties.txt

@@ -27,15 +27,16 @@ JetFile: Properties.kt
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
-    ANNOTATION
+    PsiErrorElement:Annotations are not allowed in this position
-      PsiElement(LBRACKET)('[')
+      ANNOTATION
-      ANNOTATION_ENTRY
+        PsiElement(LBRACKET)('[')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACKET)(']')
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
   PsiWhiteSpace('\n')
@@ -64,15 +65,16 @@ JetFile: Properties.kt
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
-    ANNOTATION
+    PsiErrorElement:Annotations are not allowed in this position
-      PsiElement(LBRACKET)('[')
+      ANNOTATION
-      ANNOTATION_ENTRY
+        PsiElement(LBRACKET)('[')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACKET)(']')
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
     PsiWhiteSpace(' ')

compiler/testData/psi/Properties_ERR.txt

@@ -43,23 +43,24 @@ JetFile: Properties_ERR.kt
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
-    ANNOTATION
+    PsiErrorElement:Annotations are not allowed in this position
-      PsiElement(LBRACKET)('[')
+      ANNOTATION
-      ANNOTATION_ENTRY
+        PsiElement(LBRACKET)('[')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+                REFERENCE_EXPRESSION
-      PsiWhiteSpace(' ')
+                  PsiElement(IDENTIFIER)('a')
-      ANNOTATION_ENTRY
+        PsiWhiteSpace(' ')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('foo')
+                REFERENCE_EXPRESSION
-      PsiErrorElement:Expecting ']' to close an list of annotation
+                  PsiElement(IDENTIFIER)('foo')
-        <empty list>
+        PsiErrorElement:Expecting ']' to close the annotation list
+          <empty list>
     PsiWhiteSpace(' ')
     PsiElement(EQ)('=')
     PsiWhiteSpace(' ')
@@ -84,15 +85,16 @@ JetFile: Properties_ERR.kt
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
-    ANNOTATION
+    PsiErrorElement:Annotations are not allowed in this position
-      PsiElement(LBRACKET)('[')
+      ANNOTATION
-      ANNOTATION_ENTRY
+        PsiElement(LBRACKET)('[')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACKET)(']')
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
     PsiWhiteSpace(' ')

compiler/testData/psi/TypeParametersBeforeName.txt

@@ -32,15 +32,16 @@ JetFile: TypeParametersBeforeName.kt
         PsiElement(IDENTIFIER)('B')
       PsiElement(GT)('>')
     PsiWhiteSpace(' ')
-    ANNOTATION
+    PsiErrorElement:Annotations are not allowed in this position
-      PsiElement(LBRACKET)('[')
+      ANNOTATION
-      ANNOTATION_ENTRY
+        PsiElement(LBRACKET)('[')
-        CONSTRUCTOR_CALLEE
+        ANNOTATION_ENTRY
-          TYPE_REFERENCE
+          CONSTRUCTOR_CALLEE
-            USER_TYPE
+            TYPE_REFERENCE
-              REFERENCE_EXPRESSION
+              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACKET)(']')
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
     VALUE_PARAMETER_LIST

compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt

@@ -1,12 +1,10 @@
-typealias f = {T<A, B>.T<x>.() : ()}
+typealias f = (((S).() -> S).() -> S)
-typealias f = {{(S).() : ()}.() : ()}
+typealias f = ((T.() -> S).() -> S)
-typealias f = {{T.() : ()}.() : ()}
+typealias f = ((T.T.() -> S).() -> S)
-typealias f = {{T.T.() : ()}.() : ()}
+typealias f = ((T<A, B>.T<x>.() -> S).() -> S)
-typealias f = {{T<A, B>.T<x>.() : ()}.() : ()}
+typealias f = (((S).() -> S).() -> S)
-typealias f = {{(S).() : ()}.() : ()}
 
-typealias f =  [a] {[a] {(S).() : ()}.() : ()}
+typealias f =  [a] ([a] ((S).() -> S).() -> S)
-typealias f = [a] {[a] {T.() : ()}.() : ()}
+typealias f = [a] ([a] (T.() -> S).() -> S)
-typealias f = [a] {[a] {T.T.() : ()}.() : ()}
+typealias f = [a] ([a] (T<A, B>.() -> S).() -> S)
-typealias f = [a] {[a] {T<A, B>.T<x>.() : ()}.() : ()}
+typealias f = [a] ([a] ((S).() -> S).() -> S)
-typealias f = [a] {[a] {(S).() : ()}.() : ()}

compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt

@@ -1,12 +1,11 @@
-fun {[a] T<T>.(A<B>) : ()}.foo()
+fun ([a] T<T>.(A<B>) -> Unit).foo()
-fun {[a] T<T>.(A<B>) : ()}.foo();
+fun ([a] T<T>.(A<B>) ->  C<D, E>).foo();
-fun {[a] T<T>.(A<B>) : ()}.foo() {}
+fun [a] ([a] T<T>.(A<B>) -> R).foo() {}
-fun [a] {[a] T<T>.(A<B>) : ()}.foo() {}
+fun <A, B> [a] ((B.(A ->B)) -> Unit).foo()
-fun <A, B> [a] {() : Unit}.foo()
+fun <A, B> [a] ((A, B) -> Unit).foo()
+fun ((T) -> G)?.foo()
+fun ((T) -> G)??.foo()
 
-// And tuples, too
+//--------------
-fun (A, B).foo() : Unit {}
+fun f<T>()
-
+a.b class C
-
-// Recovery
-fun fun [a] T<T>.(A<B>) : ().-()

compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt

@@ -5,251 +5,137 @@ JetFile: FunctionsWithFunctionReceivers.kt
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
+      PsiElement(LPAR)('(')
-        <empty list>
+      FUNCTION_TYPE
-    PsiErrorElement:Expecting '.' before a function name
+        FUNCTION_TYPE_RECEIVER
-      PsiElement(LBRACE)('{')
-    PsiErrorElement:Expecting function name
-      PsiElement(LBRACKET)('[')
-    PsiErrorElement:Expecting '('
-      <empty list>
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACKET)(']')
-  PsiWhiteSpace(' ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('T')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('T')
-              PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(DOT)('.')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('A')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('B')
-              PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(COLON)(':')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(DOT)('.')
-  FUN
-    MODIFIER_LIST
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
             USER_TYPE
               REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
+                PsiElement(IDENTIFIER)('T')
-        VALUE_ARGUMENT_LIST
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
           PsiElement(RPAR)(')')
-    PsiWhiteSpace('\n')
+        PsiWhiteSpace(' ')
-    PsiElement(fun)('fun')
+        PsiElement(ARROW)('->')
-    PsiWhiteSpace(' ')
+        PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      PsiErrorElement:Type expected
-        <empty list>
-    PsiErrorElement:Expecting '.' before a function name
-      PsiElement(LBRACE)('{')
-    PsiErrorElement:Expecting function name
-      PsiElement(LBRACKET)('[')
-    PsiErrorElement:Expecting '('
-      <empty list>
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
+              PsiElement(IDENTIFIER)('Unit')
-  PsiErrorElement:Expecting a top level declaration
+      PsiElement(RPAR)(')')
-    PsiElement(RBRACKET)(']')
-  PsiWhiteSpace(' ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('T')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('T')
-              PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
     PsiElement(DOT)('.')
-  PsiErrorElement:Expecting a top level declaration
+    PsiElement(IDENTIFIER)('foo')
-    PsiElement(LPAR)('(')
+    VALUE_PARAMETER_LIST
-  MODIFIER_LIST
+      PsiElement(LPAR)('(')
-    ANNOTATION_ENTRY
+      PsiElement(RPAR)(')')
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('A')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('B')
-              PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(COLON)(':')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(DOT)('.')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('foo')
-      VALUE_ARGUMENT_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(SEMICOLON)(';')
   PsiWhiteSpace('\n')
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
+      PsiElement(LPAR)('(')
-        <empty list>
+      FUNCTION_TYPE
-    PsiErrorElement:Expecting '.' before a function name
+        FUNCTION_TYPE_RECEIVER
-      PsiElement(LBRACE)('{')
+          TYPE_REFERENCE
-    PsiErrorElement:Expecting function name
+            ANNOTATION
-      PsiElement(LBRACKET)('[')
+              PsiElement(LBRACKET)('[')
-    PsiErrorElement:Expecting '('
+              ANNOTATION_ENTRY
-      <empty list>
+                CONSTRUCTOR_CALLEE
-  MODIFIER_LIST
+                  TYPE_REFERENCE
-    ANNOTATION_ENTRY
+                    USER_TYPE
-      CONSTRUCTOR_CALLEE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace('  ')
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
+              PsiElement(IDENTIFIER)('C')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACKET)(']')
-  PsiWhiteSpace(' ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('T')
             TYPE_ARGUMENT_LIST
               PsiElement(LT)('<')
               TYPE_PROJECTION
                 TYPE_REFERENCE
                   USER_TYPE
                     REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('T')
+                      PsiElement(IDENTIFIER)('D')
-              PsiElement(GT)('>')
+              PsiElement(COMMA)(',')
-  PsiErrorElement:Expecting a top level declaration
+              PsiWhiteSpace(' ')
-    PsiElement(DOT)('.')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('A')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
               TYPE_PROJECTION
                 TYPE_REFERENCE
                   USER_TYPE
                     REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('B')
+                      PsiElement(IDENTIFIER)('E')
               PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
+      PsiElement(RPAR)(')')
-    PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(COLON)(':')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiErrorElement:Expecting a top level declaration
     PsiElement(DOT)('.')
-  MODIFIER_LIST
+    PsiElement(IDENTIFIER)('foo')
-    ANNOTATION_ENTRY
+    VALUE_PARAMETER_LIST
-      CONSTRUCTOR_CALLEE
+      PsiElement(LPAR)('(')
-        TYPE_REFERENCE
+      PsiElement(RPAR)(')')
-          USER_TYPE
+    PsiElement(SEMICOLON)(';')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('foo')
-      VALUE_ARGUMENT_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n')
   FUN
     PsiElement(fun)('fun')
@@ -264,88 +150,66 @@ JetFile: FunctionsWithFunctionReceivers.kt
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
-      PsiErrorElement:Type expected
+      PsiWhiteSpace(' ')
-        <empty list>
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('R')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
     PsiWhiteSpace(' ')
-    PsiErrorElement:Expecting '.' before a function name
+    BLOCK
       PsiElement(LBRACE)('{')
-    PsiErrorElement:Expecting function name
+      PsiElement(RBRACE)('}')
-      PsiElement(LBRACKET)('[')
-    PsiErrorElement:Expecting '('
-      <empty list>
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACKET)(']')
-  PsiWhiteSpace(' ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('T')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('T')
-              PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(DOT)('.')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('A')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('B')
-              PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(COLON)(':')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(DOT)('.')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('foo')
-      VALUE_ARGUMENT_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n')
   FUN
     PsiElement(fun)('fun')
@@ -370,27 +234,53 @@ JetFile: FunctionsWithFunctionReceivers.kt
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
-      PsiErrorElement:Type expected
+      PsiWhiteSpace(' ')
-        <empty list>
+      FUNCTION_TYPE
-    PsiWhiteSpace(' ')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              PsiElement(LPAR)('(')
+              FUNCTION_TYPE
+                FUNCTION_TYPE_RECEIVER
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('B')
+                PsiElement(DOT)('.')
+                VALUE_PARAMETER_LIST
+                  PsiElement(LPAR)('(')
+                  VALUE_PARAMETER
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('A')
+                  PsiErrorElement:Expecting comma or ')'
+                    <empty list>
+                  PsiWhiteSpace(' ')
+                  PsiErrorElement:Expecting ')'
+                    PsiElement(ARROW)('->')
+                PsiErrorElement:Expecting '->' to specify return type of a function type
+                  <empty list>
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('B')
+              PsiElement(RPAR)(')')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
     PsiErrorElement:Expecting '.' before a function name
-      PsiElement(LBRACE)('{')
-    PsiErrorElement:Expecting function name
-      <empty list>
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
       PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
+    PsiErrorElement:Expecting function name
-    PsiElement(COLON)(':')
+      PsiElement(DOT)('.')
-    PsiWhiteSpace(' ')
+    PsiErrorElement:Expecting '('
-    TYPE_REFERENCE
+      <empty list>
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Unit')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(DOT)('.')
   FUN
     MODIFIER_LIST
       ANNOTATION_ENTRY
@@ -402,129 +292,151 @@ JetFile: FunctionsWithFunctionReceivers.kt
         VALUE_ARGUMENT_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
-    PsiWhiteSpace('\n\n')
-    PsiComment(EOL_COMMENT)('// And tuples, too')
     PsiWhiteSpace('\n')
     PsiElement(fun)('fun')
-    PsiErrorElement:Expecting function name or receiver type
-      <empty list>
     PsiWhiteSpace(' ')
-    VALUE_PARAMETER_LIST
+    TYPE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
+      PsiElement(LT)('<')
-      VALUE_PARAMETER
+      TYPE_PARAMETER
         PsiElement(IDENTIFIER)('A')
-        PsiErrorElement:Parameters must have type annotation
-          <empty list>
       PsiElement(COMMA)(',')
       PsiWhiteSpace(' ')
-      VALUE_PARAMETER
+      TYPE_PARAMETER
         PsiElement(IDENTIFIER)('B')
-        PsiErrorElement:Parameters must have type annotation
+      PsiElement(GT)('>')
-          <empty list>
+    PsiWhiteSpace(' ')
-      PsiElement(RPAR)(')')
+    TYPE_REFERENCE
-  PsiErrorElement:Expecting a top level declaration
+      ANNOTATION
-    PsiElement(DOT)('.')
+        PsiElement(LBRACKET)('[')
-  MODIFIER_LIST
+        ANNOTATION_ENTRY
-    ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
-      CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
-        TYPE_REFERENCE
+              USER_TYPE
-          USER_TYPE
+                REFERENCE_EXPRESSION
-            REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
-              PsiElement(IDENTIFIER)('foo')
+        PsiElement(RBRACKET)(']')
-      VALUE_ARGUMENT_LIST
+      PsiWhiteSpace(' ')
-        PsiElement(LPAR)('(')
+      PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
+      FUNCTION_TYPE
-  PsiWhiteSpace(' ')
+        VALUE_PARAMETER_LIST
-  PsiErrorElement:Expecting a top level declaration
+          PsiElement(LPAR)('(')
-    PsiElement(COLON)(':')
+          VALUE_PARAMETER
-  PsiWhiteSpace(' ')
+            TYPE_REFERENCE
-  MODIFIER_LIST
+              USER_TYPE
-    ANNOTATION_ENTRY
+                REFERENCE_EXPRESSION
-      CONSTRUCTOR_CALLEE
+                  PsiElement(IDENTIFIER)('A')
+          PsiElement(COMMA)(',')
+          PsiWhiteSpace(' ')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('B')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Unit')
-  PsiWhiteSpace(' ')
+      PsiElement(RPAR)(')')
-  PsiErrorElement:Expecting a top level declaration
+    PsiElement(DOT)('.')
-    PsiElement(LBRACE)('{')
+    PsiElement(IDENTIFIER)('foo')
-  PsiErrorElement:Expecting a top level declaration
+    VALUE_PARAMETER_LIST
-    PsiElement(RBRACE)('}')
+      PsiElement(LPAR)('(')
-  PsiWhiteSpace('\n\n\n')
+      PsiElement(RPAR)(')')
-  PsiComment(EOL_COMMENT)('// Recovery')
   PsiWhiteSpace('\n')
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
+      NULLABLE_TYPE
-        <empty list>
+        PsiElement(LPAR)('(')
-    PsiErrorElement:Expecting '.' before a function name
+        FUNCTION_TYPE
-      PsiElement(fun)('fun')
+          VALUE_PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            VALUE_PARAMETER
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('T')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(ARROW)('->')
+          PsiWhiteSpace(' ')
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('G')
+        PsiElement(RPAR)(')')
+        PsiElement(QUEST)('?')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    PsiErrorElement:Expecting function name
+    TYPE_REFERENCE
-      PsiElement(LBRACKET)('[')
+      NULLABLE_TYPE
-    PsiErrorElement:Expecting '('
+        NULLABLE_TYPE
-      <empty list>
+          PsiElement(LPAR)('(')
-  MODIFIER_LIST
+          FUNCTION_TYPE
-    ANNOTATION_ENTRY
+            VALUE_PARAMETER_LIST
-      CONSTRUCTOR_CALLEE
+              PsiElement(LPAR)('(')
-        TYPE_REFERENCE
+              VALUE_PARAMETER
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACKET)(']')
-  PsiWhiteSpace(' ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('T')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
                 TYPE_REFERENCE
                   USER_TYPE
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('T')
-              PsiElement(GT)('>')
+              PsiElement(RPAR)(')')
-  PsiErrorElement:Expecting a top level declaration
+            PsiWhiteSpace(' ')
+            PsiElement(ARROW)('->')
+            PsiWhiteSpace(' ')
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('G')
+          PsiElement(RPAR)(')')
+          PsiElement(QUEST)('?')
+        PsiElement(QUEST)('?')
     PsiElement(DOT)('.')
-  PsiErrorElement:Expecting a top level declaration
+    PsiElement(IDENTIFIER)('foo')
-    PsiElement(LPAR)('(')
+    VALUE_PARAMETER_LIST
-  MODIFIER_LIST
+      PsiElement(LPAR)('(')
-    ANNOTATION_ENTRY
+      PsiElement(RPAR)(')')
-      CONSTRUCTOR_CALLEE
+  PsiWhiteSpace('\n\n')
-        TYPE_REFERENCE
+  PsiComment(EOL_COMMENT)('//--------------')
-          USER_TYPE
+  PsiWhiteSpace('\n')
-            REFERENCE_EXPRESSION
+  FUN
-              PsiElement(IDENTIFIER)('A')
+    PsiElement(fun)('fun')
-            TYPE_ARGUMENT_LIST
+    PsiWhiteSpace(' ')
-              PsiElement(LT)('<')
+    PsiElement(IDENTIFIER)('f')
-              TYPE_PROJECTION
+    TYPE_PARAMETER_LIST
-                TYPE_REFERENCE
+      PsiElement(LT)('<')
-                  USER_TYPE
+      TYPE_PARAMETER
-                    REFERENCE_EXPRESSION
+        PsiElement(IDENTIFIER)('T')
-                      PsiElement(IDENTIFIER)('B')
+      PsiElement(GT)('>')
-              PsiElement(GT)('>')
+    VALUE_PARAMETER_LIST
-  PsiErrorElement:Expecting a top level declaration
+      PsiElement(LPAR)('(')
-    PsiElement(RPAR)(')')
+      PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
+  PsiWhiteSpace('\n')
-  PsiErrorElement:Expecting a top level declaration
+  CLASS
-    PsiElement(COLON)(':')
+    MODIFIER_LIST
-  PsiWhiteSpace(' ')
+      ANNOTATION_ENTRY
-  PsiErrorElement:Expecting a top level declaration
+        CONSTRUCTOR_CALLEE
-    PsiElement(LPAR)('(')
+          TYPE_REFERENCE
-  PsiErrorElement:Expecting a top level declaration
+            USER_TYPE
-    PsiElement(RPAR)(')')
+              USER_TYPE
-  PsiErrorElement:Expecting a top level declaration
+                REFERENCE_EXPRESSION
-    PsiElement(DOT)('.')
+                  PsiElement(IDENTIFIER)('a')
-  PsiErrorElement:Expecting a top level declaration
+              PsiElement(DOT)('.')
-    PsiElement(MINUS)('-')
+              REFERENCE_EXPRESSION
-  PsiErrorElement:Expecting a top level declaration
+                PsiElement(IDENTIFIER)('b')
-    PsiElement(LPAR)('(')
+    PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
+    PsiElement(class)('class')
-    PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('C')

compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.kt

@@ -0,0 +1,5 @@
+fun ([a] T<T>.(A<B>) -> Unit).foo()
+fun ([a] T<T>.(A<B>) ->  C<D, E>).foo();
+fun [a] ([a] T<T>.(A<B>) -> R).foo() {}
+fun <A, B> [a] (() -> Unit).foo()
+[a] fun <A, B> [a] ((A, B) -> Unit).foo()

compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.txt

@@ -0,0 +1,321 @@
+JetFile: FunctionsWithFunctionReceiversAnnotations.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace('  ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('C')
+            TYPE_ARGUMENT_LIST
+              PsiElement(LT)('<')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('D')
+              PsiElement(COMMA)(',')
+              PsiWhiteSpace(' ')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('E')
+              PsiElement(GT)('>')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiElement(SEMICOLON)(';')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('R')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('A')
+      PsiElement(COMMA)(',')
+      PsiWhiteSpace(' ')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('B')
+      PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+  PsiWhiteSpace('\n')
+  FUN
+    MODIFIER_LIST
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+    PsiWhiteSpace(' ')
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('A')
+      PsiElement(COMMA)(',')
+      PsiWhiteSpace(' ')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('B')
+      PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+          PsiElement(COMMA)(',')
+          PsiWhiteSpace(' ')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('B')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')

compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt

@@ -0,0 +1,28 @@
+fun ((T) -> G).foo<P> { }
+fun ((T) -> G).foo { }
+fun ((T) -> G).foo<P>
+fun ((T) -> G).foo = 0
+fun ((T) -> G)?.foo { }
+fun ((T) -> G)??.foo { }
+
+fun ([a] T<T>.(A<B>, C<D, E>) -> ).foo() {}
+fun fun [a] T<T>.(A<B>).foo()
+
+fun [a] (T<T>.(A<B>)).foo()
+fun [a] ((A<B>)-).foo()
+
+fun ((T)->G).foo<T>
+class C<T>.
+
+fun foo<c> {}
+c<t>.
+
+//-----------
+class A<X> {
+    fun foo<Y>() {
+    }
+}
+
+fun bar(a: A<String>) {
+    a.foo<Int>()
+}

compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt

@@ -0,0 +1,645 @@
+JetFile: FunctionsWithFunctionReceiversRecovery.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('P')
+      PsiElement(GT)('>')
+    PsiErrorElement:Expecting '('
+      <empty list>
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace(' ')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiErrorElement:Expecting '('
+      <empty list>
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace(' ')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('P')
+      PsiElement(GT)('>')
+    PsiErrorElement:Expecting '('
+      <empty list>
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiErrorElement:Expecting '('
+      <empty list>
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    INTEGER_CONSTANT
+      PsiElement(INTEGER_LITERAL)('0')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      NULLABLE_TYPE
+        PsiElement(LPAR)('(')
+        FUNCTION_TYPE
+          VALUE_PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            VALUE_PARAMETER
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('T')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(ARROW)('->')
+          PsiWhiteSpace(' ')
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('G')
+        PsiElement(RPAR)(')')
+        PsiElement(QUEST)('?')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiErrorElement:Expecting '('
+      <empty list>
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace(' ')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      NULLABLE_TYPE
+        NULLABLE_TYPE
+          PsiElement(LPAR)('(')
+          FUNCTION_TYPE
+            VALUE_PARAMETER_LIST
+              PsiElement(LPAR)('(')
+              VALUE_PARAMETER
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('T')
+              PsiElement(RPAR)(')')
+            PsiWhiteSpace(' ')
+            PsiElement(ARROW)('->')
+            PsiWhiteSpace(' ')
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('G')
+          PsiElement(RPAR)(')')
+          PsiElement(QUEST)('?')
+        PsiElement(QUEST)('?')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiErrorElement:Expecting '('
+      <empty list>
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace(' ')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(COMMA)(',')
+          PsiWhiteSpace(' ')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('C')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('D')
+                  PsiElement(COMMA)(',')
+                  PsiWhiteSpace(' ')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('E')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          PsiErrorElement:Type expected
+            <empty list>
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:Expecting function name or receiver type
+      PsiElement(fun)('fun')
+    PsiErrorElement:Expecting '('
+      <empty list>
+  PsiWhiteSpace(' ')
+  MODIFIER_LIST
+    ANNOTATION
+      PsiElement(LBRACKET)('[')
+      ANNOTATION_ENTRY
+        CONSTRUCTOR_CALLEE
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
+      PsiElement(RBRACKET)(']')
+    PsiWhiteSpace(' ')
+    ANNOTATION_ENTRY
+      CONSTRUCTOR_CALLEE
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('T')
+            TYPE_ARGUMENT_LIST
+              PsiElement(LT)('<')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('T')
+              PsiElement(GT)('>')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(DOT)('.')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(LPAR)('(')
+  MODIFIER_LIST
+    ANNOTATION_ENTRY
+      CONSTRUCTOR_CALLEE
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('A')
+            TYPE_ARGUMENT_LIST
+              PsiElement(LT)('<')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('B')
+              PsiElement(GT)('>')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(RPAR)(')')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(DOT)('.')
+  FUN
+    MODIFIER_LIST
+      ANNOTATION_ENTRY
+        CONSTRUCTOR_CALLEE
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('foo')
+        VALUE_ARGUMENT_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+    PsiWhiteSpace('\n\n')
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              FUNCTION_TYPE
+                FUNCTION_TYPE_RECEIVER
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                      TYPE_ARGUMENT_LIST
+                        PsiElement(LT)('<')
+                        TYPE_PROJECTION
+                          TYPE_REFERENCE
+                            USER_TYPE
+                              REFERENCE_EXPRESSION
+                                PsiElement(IDENTIFIER)('T')
+                        PsiElement(GT)('>')
+                PsiElement(DOT)('.')
+                VALUE_PARAMETER_LIST
+                  PsiElement(LPAR)('(')
+                  VALUE_PARAMETER
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('A')
+                        TYPE_ARGUMENT_LIST
+                          PsiElement(LT)('<')
+                          TYPE_PROJECTION
+                            TYPE_REFERENCE
+                              USER_TYPE
+                                REFERENCE_EXPRESSION
+                                  PsiElement(IDENTIFIER)('B')
+                          PsiElement(GT)('>')
+                  PsiElement(RPAR)(')')
+                PsiErrorElement:Expecting '->' to specify return type of a function type
+                  PsiElement(RPAR)(')')
+                TYPE_REFERENCE
+                  PsiErrorElement:Type expected
+                    PsiElement(DOT)('.')
+          PsiErrorElement:Expecting comma or ')'
+            <empty list>
+          PsiErrorElement:Expecting ')'
+            PsiElement(IDENTIFIER)('foo')
+        PsiErrorElement:Expecting '->' to specify return type of a function type
+          PsiElement(LPAR)('(')
+        TYPE_REFERENCE
+          PsiErrorElement:Type expected
+            PsiElement(RPAR)(')')
+    PsiWhiteSpace('\n')
+    PsiErrorElement:Expecting '.' before a function name
+      PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:Expecting function name
+      PsiElement(LBRACKET)('[')
+    PsiErrorElement:Expecting '('
+      <empty list>
+  MODIFIER_LIST
+    ANNOTATION_ENTRY
+      CONSTRUCTOR_CALLEE
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(RBRACKET)(']')
+  PsiWhiteSpace(' ')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(LPAR)('(')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(LPAR)('(')
+  MODIFIER_LIST
+    ANNOTATION_ENTRY
+      CONSTRUCTOR_CALLEE
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('A')
+            TYPE_ARGUMENT_LIST
+              PsiElement(LT)('<')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('B')
+              PsiElement(GT)('>')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(RPAR)(')')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(MINUS)('-')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(RPAR)(')')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(DOT)('.')
+  FUN
+    MODIFIER_LIST
+      ANNOTATION_ENTRY
+        CONSTRUCTOR_CALLEE
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('foo')
+        VALUE_ARGUMENT_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+    PsiWhiteSpace('\n\n')
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiElement(ARROW)('->')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('T')
+      PsiElement(GT)('>')
+    PsiErrorElement:Expecting '('
+      <empty list>
+  PsiWhiteSpace('\n')
+  CLASS
+    PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('C')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('T')
+      PsiElement(GT)('>')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(DOT)('.')
+  PsiWhiteSpace('\n\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('foo')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('c')
+      PsiElement(GT)('>')
+    PsiErrorElement:Expecting '('
+      <empty list>
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  MODIFIER_LIST
+    ANNOTATION_ENTRY
+      CONSTRUCTOR_CALLEE
+        TYPE_REFERENCE
+          USER_TYPE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('c')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('t')
+                PsiElement(GT)('>')
+            PsiElement(DOT)('.')
+            PsiWhiteSpace('\n\n')
+            PsiComment(EOL_COMMENT)('//-----------')
+            PsiWhiteSpace('\n')
+            PsiErrorElement:Expecting type name
+              PsiElement(class)('class')
+    PsiWhiteSpace(' ')
+    ANNOTATION_ENTRY
+      CONSTRUCTOR_CALLEE
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('A')
+            TYPE_ARGUMENT_LIST
+              PsiElement(LT)('<')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('X')
+              PsiElement(GT)('>')
+  PsiWhiteSpace(' ')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(LBRACE)('{')
+  PsiWhiteSpace('\n    ')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('foo')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('Y')
+      PsiElement(GT)('>')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  PsiErrorElement:Expecting a top level declaration
+    PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  FUN
+    PsiElement(fun)('fun')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('bar')
+    VALUE_PARAMETER_LIST
+      PsiElement(LPAR)('(')
+      VALUE_PARAMETER
+        PsiElement(IDENTIFIER)('a')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('A')
+            TYPE_ARGUMENT_LIST
+              PsiElement(LT)('<')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('String')
+              PsiElement(GT)('>')
+      PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
+    BLOCK
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace('\n    ')
+      DOT_QUALIFIED_EXPRESSION
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('a')
+        PsiElement(DOT)('.')
+        CALL_EXPRESSION
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('foo')
+          TYPE_ARGUMENT_LIST
+            PsiElement(LT)('<')
+            TYPE_PROJECTION
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('Int')
+            PsiElement(GT)('>')
+          VALUE_ARGUMENT_LIST
+            PsiElement(LPAR)('(')
+            PsiElement(RPAR)(')')
+      PsiWhiteSpace('\n')
+      PsiElement(RBRACE)('}')

compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt

@@ -1,34 +1,34 @@
-val {() : ()}.foo
+val ((Unit) -> Unit).foo
-val {foo.bar.() : ()}.foo
+val (foo.bar.() -> Unit).foo
 
-val {foo.bar.() : ()}.foo = foo
+val (foo.bar.() -> Unit).foo = foo
    get() {}
    set(it) {}
 
-val {foo.bar.() : ()}.foo = foo
+val (foo.bar.() -> Unit).foo = foo
    get() : Foo {}
    set(it) {}
 
 
-val {foo.bar.() : ()}.foo : bar = foo
+val (foo.bar.() -> Unit).foo : bar = foo
    [a] public get() {}
    open set(a : b) {}
 
 
-val {foo.bar.() : ()}.foo : bar = foo
+val (foo.bar.() -> Unit).foo : bar = foo
    open set(a : b) {}
 
 
-val {foo.bar.() : ()}.foo : bar = foo
+val (foo.bar.() -> Unit).foo : bar = foo
    [a] public get() {}
 
 // Error recovery:
 
-val {foo.bar.() : ()}.foo = foo
+val (foo.bar.() -> Unit).foo = foo
    set) {}
    dfget() {}
 
-val {foo.bar.() : ()}.foo = foo
+val (foo.bar.() -> Unit).foo = foo
    get(foo) {}
    set() {}
    set() {}

compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.txt

@@ -5,387 +5,389 @@ JetFile: PropertiesWithFunctionReceivers.kt
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
-        <empty list>
-    PsiErrorElement:Property getter or setter expected
-      PsiElement(LBRACE)('{')
       PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('Unit')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
       PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
+    PsiElement(DOT)('.')
-      PsiElement(COLON)(':')
+    PsiElement(IDENTIFIER)('foo')
-      PsiWhiteSpace(' ')
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-      PsiElement(RBRACE)('}')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('foo')
   PsiWhiteSpace('\n')
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
-        <empty list>
-    PsiErrorElement:Property getter or setter expected
-      PsiElement(LBRACE)('{')
-      PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('bar')
-      PsiElement(DOT)('.')
       PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            USER_TYPE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('foo')
+              PsiElement(DOT)('.')
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
       PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
+    PsiElement(DOT)('.')
-      PsiElement(COLON)(':')
+    PsiElement(IDENTIFIER)('foo')
-      PsiWhiteSpace(' ')
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-      PsiElement(RBRACE)('}')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('foo')
   PsiWhiteSpace('\n\n')
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
+      PsiElement(LPAR)('(')
-        <empty list>
+      FUNCTION_TYPE
-    PsiErrorElement:Property getter or setter expected
+        FUNCTION_TYPE_RECEIVER
-      PsiElement(LBRACE)('{')
+          TYPE_REFERENCE
+            USER_TYPE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('foo')
+              PsiElement(DOT)('.')
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
+    PsiWhiteSpace('\n   ')
-      PsiElement(IDENTIFIER)('bar')
+    PROPERTY_ACCESSOR
-      PsiElement(DOT)('.')
+      PsiElement(get)('get')
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n   ')
+    PROPERTY_ACCESSOR
+      PsiElement(set)('set')
+      PsiElement(LPAR)('(')
+      VALUE_PARAMETER_LIST
+        VALUE_PARAMETER
+          PsiElement(IDENTIFIER)('it')
+      PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            USER_TYPE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('foo')
+              PsiElement(DOT)('.')
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    REFERENCE_EXPRESSION
+      PsiElement(IDENTIFIER)('foo')
+    PsiWhiteSpace('\n   ')
+    PROPERTY_ACCESSOR
+      PsiElement(get)('get')
       PsiElement(LPAR)('(')
       PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
-      PsiElement(LPAR)('(')
+      TYPE_REFERENCE
-      PsiElement(RPAR)(')')
+        USER_TYPE
-      PsiElement(RBRACE)('}')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('foo')
-      PsiWhiteSpace(' ')
-      PsiElement(EQ)('=')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('foo')
-  PsiWhiteSpace('\n   ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('get')
-      VALUE_ARGUMENT_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n   ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('set')
-      VALUE_ARGUMENT_LIST
-        PsiElement(LPAR)('(')
-        VALUE_ARGUMENT
           REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('it')
+            PsiElement(IDENTIFIER)('Foo')
-        PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
-  PsiWhiteSpace(' ')
+      BLOCK
-  PsiErrorElement:Expecting a top level declaration
+        PsiElement(LBRACE)('{')
-    PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
-  PsiErrorElement:Expecting a top level declaration
+    PsiWhiteSpace('\n   ')
-    PsiElement(RBRACE)('}')
+    PROPERTY_ACCESSOR
-  PsiWhiteSpace('\n\n')
+      PsiElement(set)('set')
+      PsiElement(LPAR)('(')
+      VALUE_PARAMETER_LIST
+        VALUE_PARAMETER
+          PsiElement(IDENTIFIER)('it')
+      PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n\n')
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
-        <empty list>
-    PsiErrorElement:Property getter or setter expected
-      PsiElement(LBRACE)('{')
-      PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('bar')
-      PsiElement(DOT)('.')
       PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
+      FUNCTION_TYPE
-      PsiWhiteSpace(' ')
+        FUNCTION_TYPE_RECEIVER
-      PsiElement(COLON)(':')
+          TYPE_REFERENCE
-      PsiWhiteSpace(' ')
+            USER_TYPE
-      PsiElement(LPAR)('(')
+              USER_TYPE
-      PsiElement(RPAR)(')')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACE)('}')
+                  PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
+              PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('foo')
+              REFERENCE_EXPRESSION
-      PsiWhiteSpace(' ')
+                PsiElement(IDENTIFIER)('bar')
-      PsiElement(EQ)('=')
+        PsiElement(DOT)('.')
-      PsiWhiteSpace(' ')
+        VALUE_PARAMETER_LIST
-      PsiElement(IDENTIFIER)('foo')
+          PsiElement(LPAR)('(')
-  PsiWhiteSpace('\n   ')
+          PsiElement(RPAR)(')')
-  MODIFIER_LIST
+        PsiWhiteSpace(' ')
-    ANNOTATION_ENTRY
+        PsiElement(ARROW)('->')
-      CONSTRUCTOR_CALLEE
+        PsiWhiteSpace(' ')
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('get')
+              PsiElement(IDENTIFIER)('Unit')
-      VALUE_ARGUMENT_LIST
+      PsiElement(RPAR)(')')
-        PsiElement(LPAR)('(')
+    PsiElement(DOT)('.')
-        PsiElement(RPAR)(')')
+    PsiElement(IDENTIFIER)('foo')
-  PsiWhiteSpace(' ')
+    PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
     PsiElement(COLON)(':')
-  PsiWhiteSpace(' ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Foo')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n   ')
-  MODIFIER_LIST
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('set')
-      VALUE_ARGUMENT_LIST
-        PsiElement(LPAR)('(')
-        VALUE_ARGUMENT
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('it')
-        PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n\n')
-  PROPERTY
-    PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
+      USER_TYPE
-        <empty list>
+        REFERENCE_EXPRESSION
-    PsiErrorElement:Property getter or setter expected
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(LBRACE)('{')
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
+    PsiWhiteSpace('\n   ')
-      PsiElement(IDENTIFIER)('bar')
+    PROPERTY_ACCESSOR
-      PsiElement(DOT)('.')
+      MODIFIER_LIST
+        ANNOTATION
+          PsiElement(LBRACKET)('[')
+          ANNOTATION_ENTRY
+            CONSTRUCTOR_CALLEE
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
+          PsiElement(RBRACKET)(']')
+        PsiWhiteSpace(' ')
+        PsiElement(public)('public')
+      PsiWhiteSpace(' ')
+      PsiElement(get)('get')
       PsiElement(LPAR)('(')
       PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
-      PsiElement(COLON)(':')
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n   ')
+    PROPERTY_ACCESSOR
+      MODIFIER_LIST
+        PsiElement(open)('open')
       PsiWhiteSpace(' ')
+      PsiElement(set)('set')
       PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
+      VALUE_PARAMETER_LIST
-      PsiElement(RBRACE)('}')
+        VALUE_PARAMETER
-      PsiElement(DOT)('.')
+          PsiElement(IDENTIFIER)('a')
-      PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace(' ')
-      PsiWhiteSpace(' ')
+          PsiElement(COLON)(':')
-      PsiElement(COLON)(':')
+          PsiWhiteSpace(' ')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('bar')
-      PsiWhiteSpace(' ')
-      PsiElement(EQ)('=')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('foo')
-  PsiWhiteSpace('\n   ')
-  MODIFIER_LIST
-    ANNOTATION
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('a')
+                PsiElement(IDENTIFIER)('b')
-      PsiElement(RBRACKET)(']')
+      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
+      PsiWhiteSpace(' ')
-    PsiElement(public)('public')
+      BLOCK
-    PsiWhiteSpace(' ')
+        PsiElement(LBRACE)('{')
-    ANNOTATION_ENTRY
+        PsiElement(RBRACE)('}')
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('get')
-      VALUE_ARGUMENT_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n   ')
-  MODIFIER_LIST
-    PsiElement(open)('open')
-    PsiWhiteSpace(' ')
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('set')
-      VALUE_ARGUMENT_LIST
-        PsiElement(LPAR)('(')
-        VALUE_ARGUMENT
-          BINARY_WITH_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
-            PsiWhiteSpace(' ')
-            OPERATION_REFERENCE
-              PsiElement(COLON)(':')
-            PsiWhiteSpace(' ')
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('b')
-        PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n\n\n')
   PROPERTY
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
-        <empty list>
-    PsiErrorElement:Property getter or setter expected
-      PsiElement(LBRACE)('{')
-      PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('bar')
-      PsiElement(DOT)('.')
       PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
+      FUNCTION_TYPE
-      PsiWhiteSpace(' ')
+        FUNCTION_TYPE_RECEIVER
-      PsiElement(COLON)(':')
+          TYPE_REFERENCE
-      PsiWhiteSpace(' ')
+            USER_TYPE
-      PsiElement(LPAR)('(')
+              USER_TYPE
-      PsiElement(RPAR)(')')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACE)('}')
+                  PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
+              PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('foo')
+              REFERENCE_EXPRESSION
-      PsiWhiteSpace(' ')
+                PsiElement(IDENTIFIER)('bar')
-      PsiElement(COLON)(':')
+        PsiElement(DOT)('.')
-      PsiWhiteSpace(' ')
+        VALUE_PARAMETER_LIST
-      PsiElement(IDENTIFIER)('bar')
+          PsiElement(LPAR)('(')
-      PsiWhiteSpace(' ')
+          PsiElement(RPAR)(')')
-      PsiElement(EQ)('=')
+        PsiWhiteSpace(' ')
-      PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
-      PsiElement(IDENTIFIER)('foo')
+        PsiWhiteSpace(' ')
-  PsiWhiteSpace('\n   ')
-  MODIFIER_LIST
-    PsiElement(open)('open')
-    PsiWhiteSpace(' ')
-    ANNOTATION_ENTRY
-      CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('set')
+              PsiElement(IDENTIFIER)('Unit')
-      VALUE_ARGUMENT_LIST
+      PsiElement(RPAR)(')')
-        PsiElement(LPAR)('(')
+    PsiElement(DOT)('.')
-        VALUE_ARGUMENT
+    PsiElement(IDENTIFIER)('foo')
-          BINARY_WITH_TYPE
+    PsiWhiteSpace(' ')
-            REFERENCE_EXPRESSION
+    PsiElement(COLON)(':')
-              PsiElement(IDENTIFIER)('a')
-            PsiWhiteSpace(' ')
-            OPERATION_REFERENCE
-              PsiElement(COLON)(':')
-            PsiWhiteSpace(' ')
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('b')
-        PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LBRACE)('{')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n\n')
-  PROPERTY
-    PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
+      USER_TYPE
-        <empty list>
+        REFERENCE_EXPRESSION
-    PsiErrorElement:Property getter or setter expected
+          PsiElement(IDENTIFIER)('bar')
-      PsiElement(LBRACE)('{')
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    REFERENCE_EXPRESSION
       PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
+    PsiWhiteSpace('\n   ')
-      PsiElement(IDENTIFIER)('bar')
+    PROPERTY_ACCESSOR
-      PsiElement(DOT)('.')
+      MODIFIER_LIST
+        PsiElement(open)('open')
+      PsiWhiteSpace(' ')
+      PsiElement(set)('set')
       PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
+      VALUE_PARAMETER_LIST
-      PsiWhiteSpace(' ')
+        VALUE_PARAMETER
-      PsiElement(COLON)(':')
+          PsiElement(IDENTIFIER)('a')
-      PsiWhiteSpace(' ')
+          PsiWhiteSpace(' ')
-      PsiElement(LPAR)('(')
+          PsiElement(COLON)(':')
-      PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
-      PsiElement(RBRACE)('}')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('foo')
-      PsiWhiteSpace(' ')
-      PsiElement(COLON)(':')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('bar')
-      PsiWhiteSpace(' ')
-      PsiElement(EQ)('=')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('foo')
-  PsiWhiteSpace('\n   ')
-  MODIFIER_LIST
-    ANNOTATION
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
             USER_TYPE
               REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('a')
+                PsiElement(IDENTIFIER)('b')
-      PsiElement(RBRACKET)(']')
+      PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n\n\n')
+  PROPERTY
+    PsiElement(val)('val')
     PsiWhiteSpace(' ')
-    PsiElement(public)('public')
+    TYPE_REFERENCE
-    PsiWhiteSpace(' ')
+      PsiElement(LPAR)('(')
-    ANNOTATION_ENTRY
+      FUNCTION_TYPE
-      CONSTRUCTOR_CALLEE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            USER_TYPE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('foo')
+              PsiElement(DOT)('.')
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('bar')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('get')
+              PsiElement(IDENTIFIER)('Unit')
-      VALUE_ARGUMENT_LIST
+      PsiElement(RPAR)(')')
-        PsiElement(LPAR)('(')
+    PsiElement(DOT)('.')
-        PsiElement(RPAR)(')')
+    PsiElement(IDENTIFIER)('foo')
-  PsiWhiteSpace(' ')
+    PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
+    PsiElement(COLON)(':')
-    PsiElement(LBRACE)('{')
+    PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
+    TYPE_REFERENCE
-    PsiElement(RBRACE)('}')
+      USER_TYPE
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('bar')
+    PsiWhiteSpace(' ')
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    REFERENCE_EXPRESSION
+      PsiElement(IDENTIFIER)('foo')
+    PsiWhiteSpace('\n   ')
+    PROPERTY_ACCESSOR
+      MODIFIER_LIST
+        ANNOTATION
+          PsiElement(LBRACKET)('[')
+          ANNOTATION_ENTRY
+            CONSTRUCTOR_CALLEE
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
+          PsiElement(RBRACKET)(']')
+        PsiWhiteSpace(' ')
+        PsiElement(public)('public')
+      PsiWhiteSpace(' ')
+      PsiElement(get)('get')
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n\n')
   PsiComment(EOL_COMMENT)('// Error recovery:')
   PsiWhiteSpace('\n\n')
@@ -393,43 +395,53 @@ JetFile: PropertiesWithFunctionReceivers.kt
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
-        <empty list>
-    PsiErrorElement:Property getter or setter expected
-      PsiElement(LBRACE)('{')
-      PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('bar')
-      PsiElement(DOT)('.')
       PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
+      FUNCTION_TYPE
-      PsiWhiteSpace(' ')
+        FUNCTION_TYPE_RECEIVER
-      PsiElement(COLON)(':')
+          TYPE_REFERENCE
-      PsiWhiteSpace(' ')
+            USER_TYPE
-      PsiElement(LPAR)('(')
+              USER_TYPE
-      PsiElement(RPAR)(')')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACE)('}')
+                  PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
+              PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('foo')
+              REFERENCE_EXPRESSION
-      PsiWhiteSpace(' ')
+                PsiElement(IDENTIFIER)('bar')
-      PsiElement(EQ)('=')
+        PsiElement(DOT)('.')
-      PsiWhiteSpace(' ')
+        VALUE_PARAMETER_LIST
-      PsiElement(IDENTIFIER)('foo')
+          PsiElement(LPAR)('(')
-  PsiWhiteSpace('\n   ')
+          PsiElement(RPAR)(')')
-  MODIFIER_LIST
+        PsiWhiteSpace(' ')
-    ANNOTATION_ENTRY
+        PsiElement(ARROW)('->')
-      CONSTRUCTOR_CALLEE
+        PsiWhiteSpace(' ')
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('set')
+              PsiElement(IDENTIFIER)('Unit')
-  PsiErrorElement:Expecting a top level declaration
+      PsiElement(RPAR)(')')
-    PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
-  PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('foo')
-  PsiErrorElement:Expecting a top level declaration
+    PsiWhiteSpace(' ')
-    PsiElement(LBRACE)('{')
+    PsiElement(EQ)('=')
-  PsiErrorElement:Expecting a top level declaration
+    PsiWhiteSpace(' ')
-    PsiElement(RBRACE)('}')
+    REFERENCE_EXPRESSION
+      PsiElement(IDENTIFIER)('foo')
+    PsiWhiteSpace('\n   ')
+    PROPERTY_ACCESSOR
+      PsiElement(set)('set')
+      PsiErrorElement:Accessor body expected
+        PsiElement(RPAR)(')')
+      PsiErrorElement:Expecting '('
+        <empty list>
+      PsiWhiteSpace(' ')
+      VALUE_PARAMETER_LIST
+        VALUE_PARAMETER
+          PsiErrorElement:Expecting parameter name
+            <empty list>
+      PsiErrorElement:Expecting ')'
+        <empty list>
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n   ')
   MODIFIER_LIST
     ANNOTATION_ENTRY
@@ -451,63 +463,60 @@ JetFile: PropertiesWithFunctionReceivers.kt
     PsiElement(val)('val')
     PsiWhiteSpace(' ')
     TYPE_REFERENCE
-      PsiErrorElement:Type expected
-        <empty list>
-    PsiErrorElement:Property getter or setter expected
-      PsiElement(LBRACE)('{')
-      PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('bar')
-      PsiElement(DOT)('.')
       PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
+      FUNCTION_TYPE
-      PsiWhiteSpace(' ')
+        FUNCTION_TYPE_RECEIVER
-      PsiElement(COLON)(':')
+          TYPE_REFERENCE
-      PsiWhiteSpace(' ')
+            USER_TYPE
-      PsiElement(LPAR)('(')
+              USER_TYPE
-      PsiElement(RPAR)(')')
+                REFERENCE_EXPRESSION
-      PsiElement(RBRACE)('}')
+                  PsiElement(IDENTIFIER)('foo')
-      PsiElement(DOT)('.')
+              PsiElement(DOT)('.')
-      PsiElement(IDENTIFIER)('foo')
+              REFERENCE_EXPRESSION
-      PsiWhiteSpace(' ')
+                PsiElement(IDENTIFIER)('bar')
-      PsiElement(EQ)('=')
+        PsiElement(DOT)('.')
-      PsiWhiteSpace(' ')
+        VALUE_PARAMETER_LIST
-      PsiElement(IDENTIFIER)('foo')
+          PsiElement(LPAR)('(')
-  PsiWhiteSpace('\n   ')
+          PsiElement(RPAR)(')')
-  MODIFIER_LIST
+        PsiWhiteSpace(' ')
-    ANNOTATION_ENTRY
+        PsiElement(ARROW)('->')
-      CONSTRUCTOR_CALLEE
+        PsiWhiteSpace(' ')
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('get')
+              PsiElement(IDENTIFIER)('Unit')
-      VALUE_ARGUMENT_LIST
+      PsiElement(RPAR)(')')
-        PsiElement(LPAR)('(')
+    PsiElement(DOT)('.')
-        VALUE_ARGUMENT
+    PsiElement(IDENTIFIER)('foo')
-          REFERENCE_EXPRESSION
+    PsiWhiteSpace(' ')
-            PsiElement(IDENTIFIER)('foo')
+    PsiElement(EQ)('=')
-        PsiElement(RPAR)(')')
+    PsiWhiteSpace(' ')
-  PsiWhiteSpace(' ')
+    REFERENCE_EXPRESSION
-  PsiErrorElement:Expecting a top level declaration
+      PsiElement(IDENTIFIER)('foo')
-    PsiElement(LBRACE)('{')
+    PsiWhiteSpace('\n   ')
-  PsiErrorElement:Expecting a top level declaration
+    PROPERTY_ACCESSOR
-    PsiElement(RBRACE)('}')
+      PsiElement(get)('get')
-  PsiWhiteSpace('\n   ')
+      PsiElement(LPAR)('(')
-  MODIFIER_LIST
+      PsiErrorElement:Expecting ')'
-    ANNOTATION_ENTRY
+        PsiElement(IDENTIFIER)('foo')
-      CONSTRUCTOR_CALLEE
+      PsiElement(RPAR)(')')
-        TYPE_REFERENCE
+      PsiWhiteSpace(' ')
-          USER_TYPE
+      BLOCK
-            REFERENCE_EXPRESSION
+        PsiElement(LBRACE)('{')
-              PsiElement(IDENTIFIER)('set')
+        PsiElement(RBRACE)('}')
-      VALUE_ARGUMENT_LIST
+    PsiWhiteSpace('\n   ')
-        PsiElement(LPAR)('(')
+    PROPERTY_ACCESSOR
-        PsiElement(RPAR)(')')
+      PsiElement(set)('set')
-  PsiWhiteSpace(' ')
+      PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting a top level declaration
+      VALUE_PARAMETER_LIST
-    PsiElement(LBRACE)('{')
+        VALUE_PARAMETER
-  PsiErrorElement:Expecting a top level declaration
+          PsiErrorElement:Expecting parameter name
-    PsiElement(RBRACE)('}')
+            <empty list>
+      PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiElement(RBRACE)('}')
   PsiWhiteSpace('\n   ')
   MODIFIER_LIST
     ANNOTATION_ENTRY

compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.kt

@@ -0,0 +1,5 @@
+val ([a] T<T>.(A<B>) -> Unit).foo: P
+val ([a] T<T>.(A<B>) ->  C<D, E>).foo: P
+val [a] ([a] T<T>.(A<B>) -> R).foo: P
+val <A, B> [a] (() -> Unit).foo: P
+[a] val <A, B> [a] ((A, B) -> Unit).foo: P

compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.txt

@@ -0,0 +1,331 @@
+JetFile: PropertiesWithFunctionReceiversAnnotations.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      USER_TYPE
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('P')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace('  ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('C')
+            TYPE_ARGUMENT_LIST
+              PsiElement(LT)('<')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('D')
+              PsiElement(COMMA)(',')
+              PsiWhiteSpace(' ')
+              TYPE_PROJECTION
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('E')
+              PsiElement(GT)('>')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      USER_TYPE
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('P')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            ANNOTATION
+              PsiElement(LBRACKET)('[')
+              ANNOTATION_ENTRY
+                CONSTRUCTOR_CALLEE
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
+              PsiElement(RBRACKET)(']')
+            PsiWhiteSpace(' ')
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('R')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      USER_TYPE
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('P')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('A')
+      PsiElement(COMMA)(',')
+      PsiWhiteSpace(' ')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('B')
+      PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      USER_TYPE
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('P')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    MODIFIER_LIST
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+    PsiWhiteSpace(' ')
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_PARAMETER_LIST
+      PsiElement(LT)('<')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('A')
+      PsiElement(COMMA)(',')
+      PsiWhiteSpace(' ')
+      TYPE_PARAMETER
+        PsiElement(IDENTIFIER)('B')
+      PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+          PsiElement(COMMA)(',')
+          PsiWhiteSpace(' ')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('B')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Unit')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      USER_TYPE
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('P')

compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.kt

@@ -0,0 +1,14 @@
+val ((T) -> G).foo<P> { }
+val ((T) -> G).foo get{ }
+val ((T) -> G).foo<P>
+val ((T) -> G).foo: = 0
+val ((T) -> G)?.foo
+val ((T) -> G)??.foo
+
+val (T<T>.(A<B>, C<D, E>) -> ).foo {}
+val val [a] T<T>.(A<B>).foo()
+
+val [a] (T<T>.(A<B>)).foo()
+val [a] ((A<B>)-).foo()
+
+val c<T> by A.B

compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.txt

@@ -0,0 +1,424 @@
+JetFile: PropertiesWithFunctionReceiversRecovery.kt
+  PACKAGE_DIRECTIVE
+    <empty list>
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiErrorElement:Property getter or setter expected
+      PsiElement(LT)('<')
+      PsiElement(IDENTIFIER)('P')
+      PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
+      PsiElement(LBRACE)('{')
+      PsiWhiteSpace(' ')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiWhiteSpace(' ')
+    PROPERTY_ACCESSOR
+      PsiElement(get)('get')
+      PsiErrorElement:Accessor body expected
+        <empty list>
+      PsiErrorElement:Expecting '('
+        <empty list>
+      PsiErrorElement:Expecting ')'
+        <empty list>
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace(' ')
+        PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiErrorElement:Property getter or setter expected
+      PsiElement(LT)('<')
+      PsiElement(IDENTIFIER)('P')
+      PsiElement(GT)('>')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('T')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('G')
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiElement(COLON)(':')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiErrorElement:Type expected
+        <empty list>
+    PsiElement(EQ)('=')
+    PsiWhiteSpace(' ')
+    INTEGER_CONSTANT
+      PsiElement(INTEGER_LITERAL)('0')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      NULLABLE_TYPE
+        PsiElement(LPAR)('(')
+        FUNCTION_TYPE
+          VALUE_PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            VALUE_PARAMETER
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('T')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(ARROW)('->')
+          PsiWhiteSpace(' ')
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('G')
+        PsiElement(RPAR)(')')
+        PsiElement(QUEST)('?')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      NULLABLE_TYPE
+        NULLABLE_TYPE
+          PsiElement(LPAR)('(')
+          FUNCTION_TYPE
+            VALUE_PARAMETER_LIST
+              PsiElement(LPAR)('(')
+              VALUE_PARAMETER
+                TYPE_REFERENCE
+                  USER_TYPE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('T')
+              PsiElement(RPAR)(')')
+            PsiWhiteSpace(' ')
+            PsiElement(ARROW)('->')
+            PsiWhiteSpace(' ')
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('G')
+          PsiElement(RPAR)(')')
+          PsiElement(QUEST)('?')
+        PsiElement(QUEST)('?')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+  PsiWhiteSpace('\n\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      PsiElement(LPAR)('(')
+      FUNCTION_TYPE
+        FUNCTION_TYPE_RECEIVER
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('T')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_PROJECTION
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                PsiElement(GT)('>')
+        PsiElement(DOT)('.')
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('A')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
+          PsiElement(COMMA)(',')
+          PsiWhiteSpace(' ')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('C')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('D')
+                  PsiElement(COMMA)(',')
+                  PsiWhiteSpace(' ')
+                  TYPE_PROJECTION
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('E')
+                  PsiElement(GT)('>')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        PsiElement(ARROW)('->')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          PsiErrorElement:Type expected
+            <empty list>
+      PsiElement(RPAR)(')')
+    PsiElement(DOT)('.')
+    PsiElement(IDENTIFIER)('foo')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:Property getter or setter expected
+      PsiElement(LBRACE)('{')
+      PsiElement(RBRACE)('}')
+  PsiWhiteSpace('\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiErrorElement:Expecting property name or receiver type
+      <empty list>
+    PsiWhiteSpace(' ')
+    PsiErrorElement:Property getter or setter expected
+      PsiElement(val)('val')
+      PsiWhiteSpace(' ')
+      PsiElement(LBRACKET)('[')
+      PsiElement(IDENTIFIER)('a')
+      PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('T')
+      PsiElement(LT)('<')
+      PsiElement(IDENTIFIER)('T')
+      PsiElement(GT)('>')
+      PsiElement(DOT)('.')
+      PsiElement(LPAR)('(')
+      PsiElement(IDENTIFIER)('A')
+      PsiElement(LT)('<')
+      PsiElement(IDENTIFIER)('B')
+      PsiElement(GT)('>')
+      PsiElement(RPAR)(')')
+      PsiElement(DOT)('.')
+      PsiElement(IDENTIFIER)('foo')
+      PsiElement(LPAR)('(')
+      PsiElement(RPAR)(')')
+  PsiWhiteSpace('\n\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    TYPE_REFERENCE
+      ANNOTATION
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace(' ')
+      FUNCTION_TYPE
+        VALUE_PARAMETER_LIST
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER
+            TYPE_REFERENCE
+              FUNCTION_TYPE
+                FUNCTION_TYPE_RECEIVER
+                  TYPE_REFERENCE
+                    USER_TYPE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('T')
+                      TYPE_ARGUMENT_LIST
+                        PsiElement(LT)('<')
+                        TYPE_PROJECTION
+                          TYPE_REFERENCE
+                            USER_TYPE
+                              REFERENCE_EXPRESSION
+                                PsiElement(IDENTIFIER)('T')
+                        PsiElement(GT)('>')
+                PsiElement(DOT)('.')
+                VALUE_PARAMETER_LIST
+                  PsiElement(LPAR)('(')
+                  VALUE_PARAMETER
+                    TYPE_REFERENCE
+                      USER_TYPE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('A')
+                        TYPE_ARGUMENT_LIST
+                          PsiElement(LT)('<')
+                          TYPE_PROJECTION
+                            TYPE_REFERENCE
+                              USER_TYPE
+                                REFERENCE_EXPRESSION
+                                  PsiElement(IDENTIFIER)('B')
+                          PsiElement(GT)('>')
+                  PsiElement(RPAR)(')')
+                PsiErrorElement:Expecting '->' to specify return type of a function type
+                  PsiElement(RPAR)(')')
+                TYPE_REFERENCE
+                  PsiErrorElement:Type expected
+                    PsiElement(DOT)('.')
+          PsiErrorElement:Expecting comma or ')'
+            <empty list>
+          PsiErrorElement:Expecting ')'
+            PsiElement(IDENTIFIER)('foo')
+        PsiErrorElement:Expecting '->' to specify return type of a function type
+          PsiElement(LPAR)('(')
+        TYPE_REFERENCE
+          PsiErrorElement:Type expected
+            PsiElement(RPAR)(')')
+    PsiErrorElement:Expecting '.' before a property name
+      <empty list>
+  PsiWhiteSpace('\n')
+  MULTI_VARIABLE_DECLARATION
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    PsiErrorElement:Receiver type is not allowed on a multi-declaration
+      TYPE_REFERENCE
+        ANNOTATION
+          PsiElement(LBRACKET)('[')
+          ANNOTATION_ENTRY
+            CONSTRUCTOR_CALLEE
+              TYPE_REFERENCE
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
+          PsiElement(RBRACKET)(']')
+        PsiWhiteSpace(' ')
+        FUNCTION_TYPE
+          VALUE_PARAMETER_LIST
+            PsiElement(LPAR)('(')
+            VALUE_PARAMETER
+              TYPE_REFERENCE
+                PsiElement(LPAR)('(')
+                USER_TYPE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('A')
+                  TYPE_ARGUMENT_LIST
+                    PsiElement(LT)('<')
+                    TYPE_PROJECTION
+                      TYPE_REFERENCE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION
+                            PsiElement(IDENTIFIER)('B')
+                    PsiElement(GT)('>')
+                PsiElement(RPAR)(')')
+            PsiErrorElement:Expecting comma or ')'
+              <empty list>
+            PsiErrorElement:Expecting ')'
+              PsiElement(MINUS)('-')
+          PsiErrorElement:Expecting '->' to specify return type of a function type
+            PsiElement(RPAR)(')')
+          TYPE_REFERENCE
+            PsiErrorElement:Type expected
+              PsiElement(DOT)('.')
+      PsiErrorElement:Expecting '.' before a property name
+        PsiElement(IDENTIFIER)('foo')
+    PsiErrorElement:Multi-declarations are only allowed for local variables/values
+      PsiElement(LPAR)('(')
+      PsiErrorElement:Expecting a name
+        <empty list>
+      PsiElement(RPAR)(')')
+  PsiWhiteSpace('\n\n')
+  PROPERTY
+    PsiElement(val)('val')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('c')
+    PsiErrorElement:Property getter or setter expected
+      PsiElement(LT)('<')
+      PsiElement(IDENTIFIER)('T')
+      PsiElement(GT)('>')
+      PsiWhiteSpace(' ')
+      PsiElement(by)('by')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('A')
+      PsiElement(DOT)('.')
+      PsiElement(IDENTIFIER)('B')

compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java

@@ -905,11 +905,35 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 doParsingTest(fileName);
             }
 
+            @TestMetadata("FunctionsWithFunctionReceiversAnnotations.kt")
+            public void testFunctionsWithFunctionReceiversAnnotations() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.kt");
+                doParsingTest(fileName);
+            }
+
+            @TestMetadata("FunctionsWithFunctionReceiversRecovery.kt")
+            public void testFunctionsWithFunctionReceiversRecovery() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt");
+                doParsingTest(fileName);
+            }
+
             @TestMetadata("PropertiesWithFunctionReceivers.kt")
             public void testPropertiesWithFunctionReceivers() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt");
                 doParsingTest(fileName);
             }
+
+            @TestMetadata("PropertiesWithFunctionReceiversAnnotations.kt")
+            public void testPropertiesWithFunctionReceiversAnnotations() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.kt");
+                doParsingTest(fileName);
+            }
+
+            @TestMetadata("PropertiesWithFunctionReceiversRecovery.kt")
+            public void testPropertiesWithFunctionReceiversRecovery() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.kt");
+                doParsingTest(fileName);
+            }
         }
 
         @TestMetadata("compiler/testData/psi/greatSyntacticShift")