Closure parameters for constructor invocations

grammar/src/expressions.grm

@@ -174,12 +174,16 @@ prefixUnaryOperation
 
 postfixUnaryOperation
   : "++" : "--"
-  : typeArguments? valueArguments (label? functionLiteral)
+  : callSuffix
-  : typeArguments (label? functionLiteral)
   : arrayAccess
   : memberAccessOperation postfixUnaryOperation // TODO: Review
   ;
 
+callSuffix
+  : typeArguments? valueArguments (label? functionLiteral)
+  : typeArguments (label? functionLiteral)
+  ;
+
 memberAccessOperation
   : "." : "?." : "#" : "?"
   ;
@@ -221,7 +225,7 @@ expressions
   ;
 
 constructorInvocation
-  : userType valueArguments
+  : userType callSuffix
   ;
 
 arrayAccess

idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java

@@ -374,7 +374,10 @@ public class JetExpressionParsing extends AbstractJetParsing {
     }
 
     /*
-     * typeParameters? valueParameters? functionLiteral*
+     * callSuffix
+     *   : typeArguments? valueArguments (label? functionLiteral*)
+     *   : typeArguments (label? functionLiteral*)
+     *   ;
      */
     private boolean parseCallSuffix() {
         if (parseCallWithClosure()) {
@@ -1361,7 +1364,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
      * "new" constructorInvocation // identical to new functionCall
      *
      * constructorInvocation
-     *   : userType valueArguments
+     *   : userType callSuffix
      */
     private void parseNew() {
         assert _at(NEW_KEYWORD);
@@ -1370,7 +1373,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
         advance(); // NEW_KEYWORD
 
         myJetParsing.parseTypeRef();
-        parseValueArgumentList();
+        parseCallSuffix();
 
         creation.done(NEW);
     }

idea/testData/psi/examples/collections/List.jet

@@ -11,12 +11,11 @@ enum class List<out T>(theSize : Int) : IList<T> {
     get() = this == Nil
 
 
-  override fun iterator() = new IIterator() {
+  override fun iterator() = object IIterator() {
     private var current = List.this
 
-    override val hasNext {
+    override val hasNext
       get() = current == Nil
-    }
 
     override fun next() {
       val result = current.value

idea/testData/psi/examples/collections/List.txt

@@ -225,10 +225,11 @@ JetFile: List.jet
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
-          CALL_EXPRESSION
+          OBJECT_LITERAL
-            NEW
+            PsiElement(object)('object')
-              PsiElement(new)('new')
             PsiWhiteSpace(' ')
+            DELEGATION_SPECIFIER_LIST
+              DELEGATOR_SUPER_CALL
                 TYPE_REFERENCE
                   USER_TYPE
                     REFERENCE_EXPRESSION
@@ -237,10 +238,9 @@ JetFile: List.jet
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
-            FUNCTION_LITERAL
+            CLASS_BODY
               PsiElement(LBRACE)('{')
               PsiWhiteSpace('\n    ')
-              BODY
               PROPERTY
                 MODIFIER_LIST
                   PsiElement(private)('private')
@@ -258,7 +258,6 @@ JetFile: List.jet
                   THIS_EXPRESSION
                     PsiElement(this)('this')
               PsiWhiteSpace('\n\n    ')
-                CALL_EXPRESSION
               PROPERTY
                 MODIFIER_LIST
                   PsiElement(override)('override')
@@ -266,20 +265,12 @@ JetFile: List.jet
                 PsiElement(val)('val')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('hasNext')
-                  PsiWhiteSpace(' ')
-                  FUNCTION_LITERAL
-                    PsiElement(LBRACE)('{')
                 PsiWhiteSpace('\n      ')
-                    BODY
+                PROPERTY_ACCESSOR
-                      BINARY_EXPRESSION
+                  PsiElement(get)('get')
-                        CALL_EXPRESSION
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('get')
-                          VALUE_ARGUMENT_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
-                        OPERATION_REFERENCE
                   PsiElement(EQ)('=')
                   PsiWhiteSpace(' ')
                   BINARY_EXPRESSION
@@ -291,8 +282,6 @@ JetFile: List.jet
                     PsiWhiteSpace(' ')
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Nil')
-                    PsiWhiteSpace('\n    ')
-                    PsiElement(RBRACE)('}')
               PsiWhiteSpace('\n\n    ')
               FUN
                 MODIFIER_LIST