Parse primary constructor into separate PSI element

compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java

@@ -38,6 +38,7 @@ public interface JetNodeTypes {
     IElementType ENUM_ENTRY            = JetStubElementTypes.ENUM_ENTRY;
     IElementType ANONYMOUS_INITIALIZER = JetStubElementTypes.ANONYMOUS_INITIALIZER;
     IElementType SECONDARY_CONSTRUCTOR  = JetStubElementTypes.SECONDARY_CONSTRUCTOR;
+    IElementType PRIMARY_CONSTRUCTOR    = JetStubElementTypes.PRIMARY_CONSTRUCTOR;
 
     IElementType TYPE_PARAMETER_LIST                 = JetStubElementTypes.TYPE_PARAMETER_LIST;
     IElementType TYPE_PARAMETER                      = JetStubElementTypes.TYPE_PARAMETER;
@@ -55,7 +56,6 @@ public interface JetNodeTypes {
     IElementType FILE_ANNOTATION_LIST               = JetStubElementTypes.FILE_ANNOTATION_LIST;
     IElementType IMPORT_DIRECTIVE                   = JetStubElementTypes.IMPORT_DIRECTIVE;
     IElementType MODIFIER_LIST                      = JetStubElementTypes.MODIFIER_LIST;
-    IElementType PRIMARY_CONSTRUCTOR_MODIFIER_LIST  = JetStubElementTypes.PRIMARY_CONSTRUCTOR_MODIFIER_LIST;
     IElementType ANNOTATION                         = JetStubElementTypes.ANNOTATION;
     IElementType ANNOTATION_ENTRY                   = JetStubElementTypes.ANNOTATION_ENTRY;
 

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

@@ -626,7 +626,8 @@ public class JetParsing extends AbstractJetParsing {
 
         OptionalMarker constructorModifiersMarker = new OptionalMarker(object);
         PsiBuilder.Marker beforeConstructorModifiers = mark();
-        boolean hasConstructorModifiers = parseModifierList(PRIMARY_CONSTRUCTOR_MODIFIER_LIST, REGULAR_ANNOTATIONS_ONLY_WITH_BRACKETS);
+        PsiBuilder.Marker primaryConstructorMarker = mark();
+        boolean hasConstructorModifiers = parseModifierList(MODIFIER_LIST, REGULAR_ANNOTATIONS_ONLY_WITH_BRACKETS);
 
         // Some modifiers found, but no parentheses following: class has already ended, and we are looking at something else
         if (hasConstructorModifiers && !atSet(LPAR, LBRACE, COLON)) {
@@ -640,14 +641,19 @@ public class JetParsing extends AbstractJetParsing {
 
         if (at(LPAR)) {
             parseValueParameterList(false, /* typeRequired  = */ true, TokenSet.create(COLON, LBRACE));
+            primaryConstructorMarker.done(PRIMARY_CONSTRUCTOR);
         }
         else if (hasConstructorModifiers) {
             // A comprehensive error message for cases like:
             //    class A private : Foo
             // or
             //    class A private {
+            primaryConstructorMarker.done(PRIMARY_CONSTRUCTOR);
             error("Expecting primary constructor parameter list");
         }
+        else {
+            primaryConstructorMarker.drop();
+        }
         constructorModifiersMarker.error("Constructors are not allowed for objects");
 
         if (at(COLON)) {

compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java

@@ -62,9 +62,15 @@ public class JetClass extends JetTypeParameterListOwnerStub<KotlinClassStub> imp
         return visitor.visitClass(this, data);
     }
 
+    @Nullable
+    public JetPrimaryConstructor getPrimaryConstructor() {
+        return getStubOrPsiChild(JetStubElementTypes.PRIMARY_CONSTRUCTOR);
+    }
+
     @Nullable
     public JetParameterList getPrimaryConstructorParameterList() {
-        return getStubOrPsiChild(JetStubElementTypes.VALUE_PARAMETER_LIST);
+        JetPrimaryConstructor primaryConstructor = getPrimaryConstructor();
+        return primaryConstructor != null ? primaryConstructor.getValueParameterList() : null;
     }
 
     @NotNull
@@ -89,22 +95,8 @@ public class JetClass extends JetTypeParameterListOwnerStub<KotlinClassStub> imp
 
     @Nullable
     public JetModifierList getPrimaryConstructorModifierList() {
-        return getStubOrPsiChild(JetStubElementTypes.PRIMARY_CONSTRUCTOR_MODIFIER_LIST);
+        JetPrimaryConstructor primaryConstructor = getPrimaryConstructor();
-    }
+        return primaryConstructor != null ? primaryConstructor.getModifierList() : null;
-
-    public void addPrimaryConstructorModifier(@NotNull JetModifierKeywordToken modifier) {
-        JetModifierList modifierList = getPrimaryConstructorModifierList();
-        if (modifierList != null) {
-            AddRemoveModifierPackage.addModifier(modifierList, modifier, JetTokens.PUBLIC_KEYWORD);
-        }
-        else {
-            if (modifier == JetTokens.PUBLIC_KEYWORD) return;
-
-            JetParameterList parameterList = getPrimaryConstructorParameterList();
-            assert parameterList != null;
-            JetModifierList newModifierList = new JetPsiFactory(getProject()).createModifierList(modifier);
-            addBefore(newModifierList, parameterList);
-        }
     }
 
     @Override

compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.psi;
+
+import com.intellij.lang.ASTNode;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
+import org.jetbrains.kotlin.lexer.JetTokens;
+import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage;
+import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub;
+import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
+
+import java.util.Collections;
+import java.util.List;
+
+public class JetPrimaryConstructor extends JetDeclarationStub<KotlinPlaceHolderStub<JetPrimaryConstructor>> {
+    public JetPrimaryConstructor(@NotNull ASTNode node) {
+        super(node);
+    }
+
+    public JetPrimaryConstructor(@NotNull KotlinPlaceHolderStub<JetPrimaryConstructor> stub) {
+        super(stub, JetStubElementTypes.PRIMARY_CONSTRUCTOR);
+    }
+
+    @Override
+    public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
+        return visitor.visitPrimaryConstructor(this, data);
+    }
+
+    @Nullable
+    public JetParameterList getValueParameterList() {
+        return getStubOrPsiChild(JetStubElementTypes.VALUE_PARAMETER_LIST);
+    }
+
+    @NotNull
+    public List<JetParameter> getValueParameters() {
+        JetParameterList list = getValueParameterList();
+        return list != null ? list.getParameters() : Collections.<JetParameter>emptyList();
+    }
+
+    @Override
+    public void addModifier(@NotNull JetModifierKeywordToken modifier) {
+        JetModifierList modifierList = getModifierList();
+        if (modifierList != null) {
+            AddRemoveModifierPackage.addModifier(modifierList, modifier, JetTokens.PUBLIC_KEYWORD);
+        }
+        else {
+            if (modifier == JetTokens.PUBLIC_KEYWORD) return;
+
+            JetParameterList parameterList = getValueParameterList();
+            assert parameterList != null;
+            JetPsiFactory psiFactory = new JetPsiFactory(getProject());
+            JetModifierList newModifierList = psiFactory.createModifierList(modifier);
+            addBefore(newModifierList, parameterList);
+        }
+    }
+
+    @Nullable
+    public JetClass getContainingClassOrNull() {
+        JetClassOrObject classOrObject = (JetClassOrObject) getParent();
+        return classOrObject instanceof JetClass ? (JetClass) classOrObject : null;
+    }
+
+    @NotNull
+    public JetClass getContainingClass() {
+        JetClass classOrNull = getContainingClassOrNull();
+        assert classOrNull != null : "This method should be called when parent is JetClass";
+        return classOrNull;
+    }
+}

compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructorModifierList.java

@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.psi;
-
-import com.intellij.lang.ASTNode;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub;
-import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
-
-public class JetPrimaryConstructorModifierList extends JetModifierList {
-    public JetPrimaryConstructorModifierList(@NotNull ASTNode node) {
-        super(node);
-    }
-
-    public JetPrimaryConstructorModifierList(@NotNull KotlinModifierListStub stub) {
-        super(stub, JetStubElementTypes.PRIMARY_CONSTRUCTOR_MODIFIER_LIST);
-    }
-}

compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitor.java

@@ -37,6 +37,10 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
         return visitJetElement(constructor, data);
     }
 
+    public R visitPrimaryConstructor(@NotNull JetPrimaryConstructor constructor, D data) {
+        return visitJetElement(constructor, data);
+    }
+
     public R visitNamedFunction(@NotNull JetNamedFunction function, D data) {
         return visitNamedDeclaration(function, data);
     }

compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoid.java

@@ -37,6 +37,10 @@ public class JetVisitorVoid extends JetVisitor<Void, Void> {
         super.visitSecondaryConstructor(constructor, null);
     }
 
+    public void visitPrimaryConstructor(@NotNull JetPrimaryConstructor constructor) {
+        super.visitPrimaryConstructor(constructor, null);
+    }
+
     public void visitNamedFunction(@NotNull JetNamedFunction function) {
         super.visitNamedFunction(function, null);
     }

compiler/frontend/src/org/jetbrains/kotlin/psi/JetVisitorVoidWithParameter.java

@@ -38,6 +38,10 @@ public class JetVisitorVoidWithParameter<P> extends JetVisitor<Void, P> {
         super.visitSecondaryConstructor(constructor, data);
     }
 
+    public void visitPrimaryConstructorVoid(@NotNull JetPrimaryConstructor constructor, P data) {
+        super.visitPrimaryConstructor(constructor, data);
+    }
+
     public void visitNamedFunctionVoid(@NotNull JetNamedFunction function, P data) {
         super.visitNamedFunction(function, data);
     }
@@ -441,6 +445,12 @@ public class JetVisitorVoidWithParameter<P> extends JetVisitor<Void, P> {
     	return null;
     }
 
+    @Override
+    public Void visitPrimaryConstructor(@NotNull JetPrimaryConstructor constructor, P data) {
+        visitPrimaryConstructorVoid(constructor, data);
+        return null;
+    }
+
     @Override
     public final Void visitNamedFunction(@NotNull JetNamedFunction function, P data) {
         visitNamedFunctionVoid(function, data);

compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java

@@ -35,6 +35,8 @@ public interface JetStubElementTypes {
             new JetPlaceHolderStubElementType<JetClassInitializer>("ANONYMOUS_INITIALIZER", JetClassInitializer.class);
     JetPlaceHolderStubElementType<JetSecondaryConstructor> SECONDARY_CONSTRUCTOR =
             new JetPlaceHolderStubElementType<JetSecondaryConstructor>("SECONDARY_CONSTRUCTOR", JetSecondaryConstructor.class);
+    JetPlaceHolderStubElementType<JetPrimaryConstructor> PRIMARY_CONSTRUCTOR =
+            new JetPlaceHolderStubElementType<JetPrimaryConstructor>("PRIMARY_CONSTRUCTOR", JetPrimaryConstructor.class);
 
     JetParameterElementType VALUE_PARAMETER = new JetParameterElementType("VALUE_PARAMETER");
     JetPlaceHolderStubElementType<JetParameterList> VALUE_PARAMETER_LIST =
@@ -65,9 +67,6 @@ public interface JetStubElementTypes {
     JetModifierListElementType<JetDeclarationModifierList> MODIFIER_LIST =
             new JetModifierListElementType<JetDeclarationModifierList>("MODIFIER_LIST", JetDeclarationModifierList.class);
 
-    JetModifierListElementType<JetPrimaryConstructorModifierList> PRIMARY_CONSTRUCTOR_MODIFIER_LIST =
-            new JetModifierListElementType<JetPrimaryConstructorModifierList>("PRIMARY_CONSTRUCTOR_MODIFIER_LIST", JetPrimaryConstructorModifierList.class);
-
     JetPlaceHolderStubElementType<JetTypeConstraintList> TYPE_CONSTRAINT_LIST =
             new JetPlaceHolderStubElementType<JetTypeConstraintList>("TYPE_CONSTRAINT_LIST", JetTypeConstraintList.class);
 

compiler/testData/psi/BabySteps.txt

@@ -17,6 +17,7 @@ JetFile: BabySteps.kt
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('a')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/BabySteps_ERR.txt

@@ -17,6 +17,7 @@ JetFile: BabySteps_ERR.kt
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('a')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/Constructors.txt

@@ -18,6 +18,7 @@ JetFile: Constructors.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -39,7 +40,8 @@ JetFile: Constructors.kt
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('foo')
     PsiWhiteSpace(' ')
-    PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+    PRIMARY_CONSTRUCTOR
+      MODIFIER_LIST
         PsiElement(private)('private')
       PsiWhiteSpace(' ')
       VALUE_PARAMETER_LIST
@@ -67,6 +69,7 @@ JetFile: Constructors.kt
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('T')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -93,7 +96,8 @@ JetFile: Constructors.kt
         PsiElement(IDENTIFIER)('T')
       PsiElement(GT)('>')
     PsiWhiteSpace(' ')
-    PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+    PRIMARY_CONSTRUCTOR
+      MODIFIER_LIST
         PsiElement(private)('private')
       PsiWhiteSpace(' ')
       VALUE_PARAMETER_LIST

compiler/testData/psi/DocCommentsBinding.txt

@@ -16,6 +16,7 @@ JetFile: DocCommentsBinding.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('A')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiWhiteSpace('\n        ')

compiler/testData/psi/DynamicSoftKeyword.txt

@@ -18,6 +18,7 @@ JetFile: DynamicSoftKeyword.kt
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('dynamic')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/Enums.txt

@@ -8,6 +8,7 @@ JetFile: Enums.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Color')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/ParameterType.txt

@@ -270,6 +270,7 @@ JetFile: ParameterType.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('A')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/ParameterType_ERR.txt

@@ -200,6 +200,7 @@ JetFile: ParameterType_ERR.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('A')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -212,6 +213,7 @@ JetFile: ParameterType_ERR.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('A')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/PrimaryConstructorModifiers_ERR.txt

@@ -17,7 +17,8 @@ JetFile: PrimaryConstructorModifiers_ERR.kt
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('AB')
     PsiWhiteSpace(' ')
-    PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+    PRIMARY_CONSTRUCTOR
+      MODIFIER_LIST
         PsiElement(private)('private')
     PsiErrorElement:Expecting primary constructor parameter list
       <empty list>
@@ -69,7 +70,8 @@ JetFile: PrimaryConstructorModifiers_ERR.kt
               PsiElement(IDENTIFIER)('A')
       PsiElement(GT)('>')
     PsiWhiteSpace(' ')
-    PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+    PRIMARY_CONSTRUCTOR
+      MODIFIER_LIST
         PsiElement(private)('private')
       PsiWhiteSpace(' ')
       VALUE_PARAMETER_LIST

compiler/testData/psi/PropertiesFollowedByInitializers.txt

@@ -5,6 +5,7 @@ JetFile: PropertiesFollowedByInitializers.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Foo')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -264,6 +265,7 @@ JetFile: PropertiesFollowedByInitializers.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('PublicVar')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -291,6 +293,7 @@ JetFile: PropertiesFollowedByInitializers.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('PublicVar')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -330,6 +333,7 @@ JetFile: PropertiesFollowedByInitializers.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('PublicVar')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -356,6 +360,7 @@ JetFile: PropertiesFollowedByInitializers.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('PublicVar')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -383,6 +388,7 @@ JetFile: PropertiesFollowedByInitializers.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('PublicVar')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')

compiler/testData/psi/SoftKeywords.txt

@@ -133,6 +133,7 @@ JetFile: SoftKeywords.kt
       PsiWhiteSpace('\n ')
       PsiElement(GT)('>')
     PsiWhiteSpace(' ')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -1004,6 +1005,7 @@ JetFile: SoftKeywords.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('F')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/ThisType.txt

@@ -24,6 +24,7 @@ JetFile: ThisType.kt
                     PsiElement(This)('This')
               PsiElement(GT)('>')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/TraitConstructor.txt

@@ -5,6 +5,7 @@ JetFile: TraitConstructor.kt
     PsiElement(trait)('trait')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('TestTrait')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -45,6 +46,7 @@ JetFile: TraitConstructor.kt
     PsiElement(trait)('trait')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('TestTrait')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')

compiler/testData/psi/annotation/TypeAnnotations.txt

@@ -5,6 +5,7 @@ JetFile: TypeAnnotations.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('F')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/examples/BinaryTree.txt

@@ -38,6 +38,7 @@ JetFile: BinaryTree.kt
         PsiElement(class)('class')
         PsiWhiteSpace(' ')
         PsiElement(IDENTIFIER)('TreeNode')
+        PRIMARY_CONSTRUCTOR
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             PsiWhiteSpace('\n    ')

compiler/testData/psi/examples/Color.txt

@@ -8,6 +8,7 @@ JetFile: Color.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Color')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/examples/Graph.txt

@@ -10,6 +10,7 @@ JetFile: Graph.kt
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('V')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -38,6 +39,7 @@ JetFile: Graph.kt
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('E')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/examples/Queue.txt

@@ -43,6 +43,7 @@ JetFile: Queue.kt
           TYPE_PARAMETER
             PsiElement(IDENTIFIER)('T')
           PsiElement(GT)('>')
+        PRIMARY_CONSTRUCTOR
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER

compiler/testData/psi/examples/UpdateOperation.txt

@@ -5,6 +5,7 @@ JetFile: UpdateOperation.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Pair')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/examples/collections/HashMap.txt

@@ -298,6 +298,7 @@ JetFile: HashMap.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('HashableWrapper')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
@@ -881,6 +882,7 @@ JetFile: HashMap.kt
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('V')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/examples/collections/LinkedList.txt

@@ -38,6 +38,7 @@ JetFile: LinkedList.kt
         PsiElement(class)('class')
         PsiWhiteSpace(' ')
         PsiElement(IDENTIFIER)('Item')
+        PRIMARY_CONSTRUCTOR
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             VALUE_PARAMETER

compiler/testData/psi/examples/io/IOSamples.txt

@@ -74,6 +74,7 @@ JetFile: IOSamples.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('JavaCloseableWrapper')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt

@@ -10,6 +10,7 @@ JetFile: PriorityQueueAsPushPop.kt
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('T')
       PsiElement(GT)('>')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/greatSyntacticShift/functionTypes.txt

@@ -40,6 +40,7 @@ JetFile: functionTypes.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('XXX')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')
@@ -694,6 +695,7 @@ JetFile: functionTypes.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('YYY')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         PsiElement(RPAR)(')')

compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.txt

@@ -5,6 +5,7 @@ JetFile: MissingCommaInConstructorValueParameterList.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Test')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.txt

@@ -5,6 +5,7 @@ JetFile: MissingCommaInValueParameterListWithValOrVar.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Test')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.txt

@@ -5,6 +5,7 @@ JetFile: ValueParameterNoTypeRecovery.kt
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Test')
+    PRIMARY_CONSTRUCTOR
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER

compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.txt

@@ -8,7 +8,8 @@ JetFile: ConstructorModifiers.kt
       PsiElement(IDENTIFIER)('Foo')
     PsiWhiteSpace(' ')
     PsiErrorElement:Constructors are not allowed for objects
-      PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+      PRIMARY_CONSTRUCTOR
+        MODIFIER_LIST
           PsiElement(private)('private')
         PsiWhiteSpace(' ')
         VALUE_PARAMETER_LIST
@@ -22,7 +23,8 @@ JetFile: ConstructorModifiers.kt
       PsiElement(IDENTIFIER)('Foo')
     PsiWhiteSpace(' ')
     PsiErrorElement:Constructors are not allowed for objects
-      PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+      PRIMARY_CONSTRUCTOR
+        MODIFIER_LIST
           PsiElement(private)('private')
         PsiWhiteSpace(' ')
         VALUE_PARAMETER_LIST
@@ -40,7 +42,8 @@ JetFile: ConstructorModifiers.kt
       PsiElement(IDENTIFIER)('Foo')
     PsiWhiteSpace(' ')
     PsiErrorElement:Constructors are not allowed for objects
-      PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+      PRIMARY_CONSTRUCTOR
+        MODIFIER_LIST
           PsiElement(private)('private')
         PsiWhiteSpace(' ')
         VALUE_PARAMETER_LIST
@@ -68,7 +71,8 @@ JetFile: ConstructorModifiers.kt
       PsiElement(IDENTIFIER)('Foo')
     PsiWhiteSpace(' ')
     PsiErrorElement:Constructors are not allowed for objects
-      PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+      PRIMARY_CONSTRUCTOR
+        MODIFIER_LIST
           ANNOTATION
             PsiElement(LBRACKET)('[')
             ANNOTATION_ENTRY

compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.txt

@@ -7,6 +7,7 @@ JetFile: EmptyParentheses.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
@@ -17,6 +18,7 @@ JetFile: EmptyParentheses.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
@@ -31,6 +33,7 @@ JetFile: EmptyParentheses.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')

compiler/testData/psi/recovery/objects/declarations/Everything.txt

@@ -18,7 +18,8 @@ JetFile: Everything.kt
         PsiElement(GT)('>')
     PsiWhiteSpace(' ')
     PsiErrorElement:Constructors are not allowed for objects
-      PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+      PRIMARY_CONSTRUCTOR
+        MODIFIER_LIST
           PsiElement(private)('private')
         PsiWhiteSpace(' ')
         VALUE_PARAMETER_LIST

compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.txt

@@ -7,6 +7,7 @@ JetFile: ParametersInParentheses.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           VALUE_PARAMETER
@@ -35,6 +36,7 @@ JetFile: ParametersInParentheses.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           VALUE_PARAMETER
@@ -67,6 +69,7 @@ JetFile: ParametersInParentheses.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           VALUE_PARAMETER

compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.txt

@@ -17,6 +17,7 @@ JetFile: TypeParametersAndParentheses.kt
           PsiElement(IDENTIFIER)('R')
         PsiElement(GT)('>')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
@@ -37,6 +38,7 @@ JetFile: TypeParametersAndParentheses.kt
           PsiElement(IDENTIFIER)('R')
         PsiElement(GT)('>')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           VALUE_PARAMETER
@@ -69,6 +71,7 @@ JetFile: TypeParametersAndParentheses.kt
           PsiElement(IDENTIFIER)('R')
         PsiElement(GT)('>')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')

compiler/testData/psi/recovery/objects/declarations/Where.txt

@@ -60,6 +60,7 @@ JetFile: Where.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
@@ -86,6 +87,7 @@ JetFile: Where.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
@@ -121,6 +123,7 @@ JetFile: Where.kt
     OBJECT_DECLARATION_NAME
       PsiElement(IDENTIFIER)('Foo')
     PsiErrorElement:Constructors are not allowed for objects
+      PRIMARY_CONSTRUCTOR
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')

compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.txt

@@ -16,6 +16,7 @@ JetFile: ConstructorModifiers.kt
           PsiElement(IDENTIFIER)('private')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
@@ -39,6 +40,7 @@ JetFile: ConstructorModifiers.kt
           PsiElement(IDENTIFIER)('private')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
@@ -69,7 +71,8 @@ JetFile: ConstructorModifiers.kt
         PsiElement(object)('object')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
-          PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+          PRIMARY_CONSTRUCTOR
+            MODIFIER_LIST
               ANNOTATION
                 PsiElement(LBRACKET)('[')
                 ANNOTATION_ENTRY
@@ -118,6 +121,7 @@ JetFile: ConstructorModifiers.kt
           PsiElement(IDENTIFIER)('private')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')

compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.txt

@@ -16,7 +16,8 @@ JetFile: ConstructorModifiersAndName.kt
           PsiElement(IDENTIFIER)('Name')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
-          PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+          PRIMARY_CONSTRUCTOR
+            MODIFIER_LIST
               PsiElement(private)('private')
             PsiWhiteSpace(' ')
             VALUE_PARAMETER_LIST
@@ -42,7 +43,8 @@ JetFile: ConstructorModifiersAndName.kt
           PsiElement(IDENTIFIER)('Name')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
-          PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+          PRIMARY_CONSTRUCTOR
+            MODIFIER_LIST
               PsiElement(private)('private')
             PsiWhiteSpace(' ')
             VALUE_PARAMETER_LIST
@@ -78,7 +80,8 @@ JetFile: ConstructorModifiersAndName.kt
           PsiElement(IDENTIFIER)('Name')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
-          PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+          PRIMARY_CONSTRUCTOR
+            MODIFIER_LIST
               ANNOTATION
                 PsiElement(LBRACKET)('[')
                 ANNOTATION_ENTRY
@@ -127,7 +130,8 @@ JetFile: ConstructorModifiersAndName.kt
           PsiElement(IDENTIFIER)('Name')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
-          PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+          PRIMARY_CONSTRUCTOR
+            MODIFIER_LIST
               PsiElement(private)('private')
             PsiWhiteSpace(' ')
             VALUE_PARAMETER_LIST

compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.txt

@@ -12,6 +12,7 @@ JetFile: EmptyParentheses.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
@@ -31,6 +32,7 @@ JetFile: EmptyParentheses.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
@@ -60,6 +62,7 @@ JetFile: EmptyParentheses.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')

compiler/testData/psi/recovery/objects/expressions/Everything.txt

@@ -23,7 +23,8 @@ JetFile: Everything.kt
             PsiElement(GT)('>')
         PsiWhiteSpace(' ')
         PsiErrorElement:Constructors are not allowed for objects
-          PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+          PRIMARY_CONSTRUCTOR
+            MODIFIER_LIST
               PsiElement(private)('private')
             PsiWhiteSpace(' ')
             VALUE_PARAMETER_LIST

compiler/testData/psi/recovery/objects/expressions/InFunction.txt

@@ -27,6 +27,7 @@ JetFile: InFunction.kt
               PsiElement(IDENTIFIER)('private')
             PsiWhiteSpace(' ')
             PsiErrorElement:Constructors are not allowed for objects
+              PRIMARY_CONSTRUCTOR
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
@@ -49,6 +50,7 @@ JetFile: InFunction.kt
               PsiElement(IDENTIFIER)('private')
             PsiWhiteSpace(' ')
             PsiErrorElement:Constructors are not allowed for objects
+              PRIMARY_CONSTRUCTOR
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
@@ -77,7 +79,8 @@ JetFile: InFunction.kt
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             PsiErrorElement:Constructors are not allowed for objects
-              PRIMARY_CONSTRUCTOR_MODIFIER_LIST
+              PRIMARY_CONSTRUCTOR
+                MODIFIER_LIST
                   ANNOTATION
                     PsiElement(LBRACKET)('[')
                     ANNOTATION_ENTRY
@@ -125,6 +128,7 @@ JetFile: InFunction.kt
               PsiElement(IDENTIFIER)('private')
             PsiWhiteSpace(' ')
             PsiErrorElement:Constructors are not allowed for objects
+              PRIMARY_CONSTRUCTOR
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')

compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.txt

@@ -12,6 +12,7 @@ JetFile: ParametersInParentheses.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               VALUE_PARAMETER
@@ -49,6 +50,7 @@ JetFile: ParametersInParentheses.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               VALUE_PARAMETER
@@ -96,6 +98,7 @@ JetFile: ParametersInParentheses.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               VALUE_PARAMETER

compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.txt

@@ -22,6 +22,7 @@ JetFile: TypeParametersAndParentheses.kt
               PsiElement(IDENTIFIER)('R')
             PsiElement(GT)('>')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               VALUE_PARAMETER
@@ -59,6 +60,7 @@ JetFile: TypeParametersAndParentheses.kt
               PsiElement(IDENTIFIER)('R')
             PsiElement(GT)('>')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
@@ -98,6 +100,7 @@ JetFile: TypeParametersAndParentheses.kt
               PsiElement(IDENTIFIER)('R')
             PsiElement(GT)('>')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')

compiler/testData/psi/recovery/objects/expressions/TypeParameterss.txt

@@ -72,6 +72,7 @@ JetFile: TypeParameterss.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               VALUE_PARAMETER

compiler/testData/psi/recovery/objects/expressions/Where.txt

@@ -86,6 +86,7 @@ JetFile: Where.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
@@ -121,6 +122,7 @@ JetFile: Where.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
@@ -165,6 +167,7 @@ JetFile: Where.kt
       OBJECT_DECLARATION
         PsiElement(object)('object')
         PsiErrorElement:Constructors are not allowed for objects
+          PRIMARY_CONSTRUCTOR
             VALUE_PARAMETER_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')