diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java index 4f007d4f90d..d9931788a9f 100644 --- a/idea/src/org/jetbrains/jet/JetNodeTypes.java +++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java @@ -47,7 +47,6 @@ public interface JetNodeTypes { JetNodeType TYPE_ARGUMENT_LIST = new JetNodeType("TYPE_ARGUMENT_LIST", JetTypeArgumentList.class); JetNodeType VALUE_ARGUMENT_LIST = new JetNodeType("VALUE_ARGUMENT_LIST", JetArgumentList.class); JetNodeType VALUE_ARGUMENT = new JetNodeType("VALUE_ARGUMENT", JetArgument.class); - JetNodeType NAMED_ARGUMENT = new JetNodeType("NAMED_ARGUMENT"); JetNodeType TYPE_REFERENCE = new JetNodeType("TYPE_REFERENCE", JetTypeReference.class); JetNodeType LABELED_TUPLE_ENTRY = new JetNodeType("LABELED_TUPLE_ENTRY"); JetNodeType TUPLE_TYPE = new JetNodeType("TUPLE_TYPE"); diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index b2088f3b510..c4031388e24 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -1122,15 +1122,13 @@ public class JetExpressionParsing extends AbstractJetParsing { */ private void parseValueArgument() { PsiBuilder.Marker argument = mark(); - JetNodeType type = VALUE_ARGUMENT; if (at(IDENTIFIER) && lookahead(1) == EQ) { advance(); // IDENTIFIER advance(); // EQ - type = NAMED_ARGUMENT; } if (at(OUT_KEYWORD) || at(REF_KEYWORD)) advance(); // REF or OUT parseExpression(); - argument.done(type); + argument.done(VALUE_ARGUMENT); } /* diff --git a/idea/testData/psi/BabySteps.txt b/idea/testData/psi/BabySteps.txt index e4c2d7a1586..8d8b1da6c14 100644 --- a/idea/testData/psi/BabySteps.txt +++ b/idea/testData/psi/BabySteps.txt @@ -43,7 +43,7 @@ JetFile: BabySteps.jet PsiElement(IDENTIFIER)('foo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') - NAMED_ARGUMENT + VALUE_ARGUMENT PsiElement(IDENTIFIER)('d') PsiElement(EQ)('=') INTEGER_CONSTANT diff --git a/idea/testData/psi/BabySteps_ERR.txt b/idea/testData/psi/BabySteps_ERR.txt index c91a4a2c7d0..87b402adde7 100644 --- a/idea/testData/psi/BabySteps_ERR.txt +++ b/idea/testData/psi/BabySteps_ERR.txt @@ -43,7 +43,7 @@ JetFile: BabySteps_ERR.jet PsiElement(IDENTIFIER)('foo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') - NAMED_ARGUMENT + VALUE_ARGUMENT PsiElement(IDENTIFIER)('d') PsiElement(EQ)('=') INTEGER_CONSTANT diff --git a/idea/testData/psi/examples/UpdateOperation.txt b/idea/testData/psi/examples/UpdateOperation.txt index d1d7f182b18..f5b8277e2ae 100644 --- a/idea/testData/psi/examples/UpdateOperation.txt +++ b/idea/testData/psi/examples/UpdateOperation.txt @@ -168,7 +168,7 @@ JetFile: UpdateOperation.jet PsiElement(IDENTIFIER)('p') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - NAMED_ARGUMENT + VALUE_ARGUMENT PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -198,7 +198,7 @@ JetFile: UpdateOperation.jet PsiElement(IDENTIFIER)('p1') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - NAMED_ARGUMENT + VALUE_ARGUMENT PsiElement(IDENTIFIER)('y') PsiWhiteSpace(' ') PsiElement(EQ)('=')