diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java index 320cc56daa4..8c723f7f3fe 100644 --- a/idea/src/org/jetbrains/jet/JetNodeTypes.java +++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java @@ -90,7 +90,6 @@ public interface JetNodeTypes { JetNodeType LOOP_PARAMETER = new JetNodeType("LOOP_PARAMETER", JetParameter.class); // TODO: Do we need separate type? JetNodeType LOOP_RANGE = new JetNodeType("LOOP_RANGE"); //TODO: discuss, this can be omitted JetNodeType BODY = new JetNodeType("BODY"); //TODO: discuss, this can be omitted - JetNodeType RECEIVER_TYPE = new JetNodeType("RECEIVER_TYPE"); JetNodeType BLOCK = new JetNodeType("BLOCK", JetBlockExpression.class); JetNodeType FUNCTION_LITERAL = new JetNodeType("FUNCTION_LITERAL", JetFunctionLiteralExpression.class); JetNodeType ANNOTATED_EXPRESSION = new JetNodeType("ANNOTATED_EXPRESSION", JetAnnotatedExpression.class); diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index c4031388e24..b313e3fe8a2 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -596,9 +596,7 @@ public class JetExpressionParsing extends AbstractJetParsing { int lastDot = matchTokenStreamPredicate(new LastBefore(new At(DOT), new AtOffset(doubleArrowPos))); if (lastDot >= 0) { // There is a receiver type - PsiBuilder.Marker receiverType = mark(); createTruncatedBuilder(lastDot).parseTypeRef(); - receiverType.done(RECEIVER_TYPE); assert _at(DOT); advance(); // DOT; diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java index 46355cc3d00..a0d6f20ea08 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -1370,10 +1370,8 @@ public class JetParsing extends AbstractJetParsing { int lastLPar = findLastBefore(TokenSet.create(LPAR), TokenSet.create(RBRACE, COLON), false); if (lastLPar >= 0 && lastLPar > myBuilder.getCurrentOffset()) { - PsiBuilder.Marker receiverType = mark(); // TODO : -1 is a hack? createTruncatedBuilder(lastLPar - 1).parseTypeRef(); - receiverType.done(RECEIVER_TYPE); advance(); // DOT } diff --git a/idea/testData/psi/Decomposers.txt b/idea/testData/psi/Decomposers.txt index bcf41415905..0c1cac1bfba 100644 --- a/idea/testData/psi/Decomposers.txt +++ b/idea/testData/psi/Decomposers.txt @@ -26,16 +26,15 @@ JetFile: Decomposers.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/Decomposers_ERR.txt b/idea/testData/psi/Decomposers_ERR.txt index 0d1c7259966..ca6204eac9f 100644 --- a/idea/testData/psi/Decomposers_ERR.txt +++ b/idea/testData/psi/Decomposers_ERR.txt @@ -19,16 +19,15 @@ JetFile: Decomposers_ERR.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -146,16 +145,15 @@ JetFile: Decomposers_ERR.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/FunctionLiterals.txt b/idea/testData/psi/FunctionLiterals.txt index afba7ea97f0..ca314806003 100644 --- a/idea/testData/psi/FunctionLiterals.txt +++ b/idea/testData/psi/FunctionLiterals.txt @@ -300,10 +300,9 @@ JetFile: FunctionLiterals.jet PsiWhiteSpace('\n\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -320,10 +319,9 @@ JetFile: FunctionLiterals.jet PsiWhiteSpace('\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -346,10 +344,9 @@ JetFile: FunctionLiterals.jet PsiWhiteSpace('\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -378,10 +375,9 @@ JetFile: FunctionLiterals.jet PsiWhiteSpace('\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/FunctionLiterals_ERR.txt b/idea/testData/psi/FunctionLiterals_ERR.txt index 1931fa0d076..d62c9621d7d 100644 --- a/idea/testData/psi/FunctionLiterals_ERR.txt +++ b/idea/testData/psi/FunctionLiterals_ERR.txt @@ -218,10 +218,9 @@ JetFile: FunctionLiterals_ERR.jet PsiWhiteSpace('\n\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiErrorElement:Expecting '(' PsiElement(IDENTIFIER)('t') @@ -240,10 +239,9 @@ JetFile: FunctionLiterals_ERR.jet PsiWhiteSpace('\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiErrorElement:Expecting '(' PsiElement(IDENTIFIER)('t') @@ -287,10 +285,9 @@ JetFile: FunctionLiterals_ERR.jet PsiWhiteSpace('\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiErrorElement:To specify a receiver type, use the full notation: {ReceiverType.(parameters) [: ReturnType] => ...} PsiElement(IDENTIFIER)('a') diff --git a/idea/testData/psi/FunctionTypes.txt b/idea/testData/psi/FunctionTypes.txt index d8484cd9e53..926bf3e5998 100644 --- a/idea/testData/psi/FunctionTypes.txt +++ b/idea/testData/psi/FunctionTypes.txt @@ -509,10 +509,9 @@ JetFile: FunctionTypes.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -538,13 +537,107 @@ JetFile: FunctionTypes.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('S') + PsiElement(RPAR)(')') PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('T') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -570,30 +663,24 @@ JetFile: FunctionTypes.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -619,30 +706,27 @@ JetFile: FunctionTypes.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('S') - PsiElement(RPAR)(')') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') - VALUE_PARAMETER_LIST + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE PsiElement(LPAR)('(') PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -668,26 +752,44 @@ JetFile: FunctionTypes.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(DOT)('.') - VALUE_PARAMETER_LIST + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE PsiElement(LPAR)('(') PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -713,143 +815,28 @@ JetFile: FunctionTypes.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST + PsiElement(IDENTIFIER)('S') + PsiElement(RPAR)(')') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE PsiElement(LPAR)('(') PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('S') - PsiElement(RPAR)(')') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -882,10 +869,9 @@ JetFile: FunctionTypes.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -918,13 +904,12 @@ JetFile: FunctionTypes.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -957,30 +942,29 @@ JetFile: FunctionTypes.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -1013,37 +997,35 @@ JetFile: FunctionTypes.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('S') - PsiElement(RPAR)(')') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST + USER_TYPE + PsiElement(IDENTIFIER)('S') + PsiElement(RPAR)(')') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE PsiElement(LPAR)('(') PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -1076,33 +1058,31 @@ JetFile: FunctionTypes.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE PsiElement(LPAR)('(') PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -1135,36 +1115,34 @@ JetFile: FunctionTypes.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') - VALUE_PARAMETER_LIST + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE PsiElement(LPAR)('(') PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -1197,53 +1175,51 @@ JetFile: FunctionTypes.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(DOT)('.') - VALUE_PARAMETER_LIST + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE PsiElement(LPAR)('(') PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -1276,37 +1252,35 @@ JetFile: FunctionTypes.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - RECEIVER_TYPE + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('S') - PsiElement(RPAR)(')') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST + USER_TYPE + PsiElement(IDENTIFIER)('S') + PsiElement(RPAR)(')') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE PsiElement(LPAR)('(') PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') + PsiElement(RBRACE)('}') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/Functions.txt b/idea/testData/psi/Functions.txt index 6515268599a..84ad04068f6 100644 --- a/idea/testData/psi/Functions.txt +++ b/idea/testData/psi/Functions.txt @@ -54,23 +54,22 @@ JetFile: Functions.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -252,23 +251,22 @@ JetFile: Functions.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -462,23 +460,22 @@ JetFile: Functions.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -628,23 +625,22 @@ JetFile: Functions.jet PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/Functions_ERR.txt b/idea/testData/psi/Functions_ERR.txt index 47aab541de8..5875693b2ac 100644 --- a/idea/testData/psi/Functions_ERR.txt +++ b/idea/testData/psi/Functions_ERR.txt @@ -358,23 +358,22 @@ JetFile: Functions_ERR.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/LocalDeclarations.txt b/idea/testData/psi/LocalDeclarations.txt index 5b29857b89c..ebc823e6279 100644 --- a/idea/testData/psi/LocalDeclarations.txt +++ b/idea/testData/psi/LocalDeclarations.txt @@ -104,10 +104,9 @@ JetFile: LocalDeclarations.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/Properties.txt b/idea/testData/psi/Properties.txt index ce9c798c285..d00f6bd775a 100644 --- a/idea/testData/psi/Properties.txt +++ b/idea/testData/psi/Properties.txt @@ -70,13 +70,12 @@ JetFile: Properties.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -156,13 +155,12 @@ JetFile: Properties.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -209,13 +207,12 @@ JetFile: Properties.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -268,13 +265,12 @@ JetFile: Properties.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -346,13 +342,12 @@ JetFile: Properties.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -405,13 +400,12 @@ JetFile: Properties.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/Properties_ERR.txt b/idea/testData/psi/Properties_ERR.txt index 3bacaf64f14..c4cbd8750f9 100644 --- a/idea/testData/psi/Properties_ERR.txt +++ b/idea/testData/psi/Properties_ERR.txt @@ -131,13 +131,12 @@ JetFile: Properties_ERR.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -186,13 +185,12 @@ JetFile: Properties_ERR.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/examples/Builder.txt b/idea/testData/psi/examples/Builder.txt index 574b2b8c655..148d592d673 100644 --- a/idea/testData/psi/examples/Builder.txt +++ b/idea/testData/psi/examples/Builder.txt @@ -348,10 +348,9 @@ JetFile: Builder.jet FUNCTION_TYPE PsiElement(LBRACE)('{') PsiWhiteSpace(' ') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Library') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Library') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/examples/With.txt b/idea/testData/psi/examples/With.txt index 8e016aa9a85..35917c08e09 100644 --- a/idea/testData/psi/examples/With.txt +++ b/idea/testData/psi/examples/With.txt @@ -37,10 +37,9 @@ JetFile: With.jet TYPE_REFERENCE FUNCTION_TYPE PsiElement(LBRACE)('{') - RECEIVER_TYPE - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(')