diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java index 92f6ba1315c..2b3399fb32e 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -1206,6 +1206,8 @@ public class JetParsing extends AbstractJetParsing { */ public void parseUserType() { PsiBuilder.Marker type = mark(); + boolean typeClosed = false; + if (at(NAMESPACE_KEYWORD)) { advance(); // NAMESPACE_KEYWORD expect(DOT, "Expecting '.'", TokenSet.create(IDENTIFIER)); @@ -1213,22 +1215,32 @@ public class JetParsing extends AbstractJetParsing { while (true) { expect(IDENTIFIER, "Type name expected", TokenSet.create(LT)); - parseTypeArgumentList(); + PsiBuilder.Marker argsMarker = parseTypeArgumentList(); - if (!at(DOT)) break; + if (!at(DOT)) { + // For recovery reasons, we allow to write Foo.Bar.X, but we need to place + // the last argument list next to the reference, not a its child + if (argsMarker != null) { + type.doneBefore(REFERENCE_EXPRESSION, argsMarker); + typeClosed = true; + } + break; + } type.done(REFERENCE_EXPRESSION); type = type.precede(); advance(); // DOT } - type.done(REFERENCE_EXPRESSION); + if (!typeClosed) { + type.done(REFERENCE_EXPRESSION); + } } /* * (optionalProjection type){","} */ - public void parseTypeArgumentList() { - if (!at(LT)) return; + public PsiBuilder.Marker parseTypeArgumentList() { + if (!at(LT)) return null; PsiBuilder.Marker list = mark(); @@ -1246,6 +1258,7 @@ public class JetParsing extends AbstractJetParsing { myBuilder.restoreNewlinesState(); list.done(TYPE_ARGUMENT_LIST); + return list; } /* diff --git a/idea/testData/psi/Attributes.txt b/idea/testData/psi/Attributes.txt index 5c88918f6eb..64d32f7eb29 100644 --- a/idea/testData/psi/Attributes.txt +++ b/idea/testData/psi/Attributes.txt @@ -43,17 +43,17 @@ JetFile: Attributes.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/Attributes_ERR.txt b/idea/testData/psi/Attributes_ERR.txt index 176193c3ef9..ec6327343dc 100644 --- a/idea/testData/psi/Attributes_ERR.txt +++ b/idea/testData/psi/Attributes_ERR.txt @@ -48,17 +48,17 @@ JetFile: Attributes_ERR.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/Constructors.txt b/idea/testData/psi/Constructors.txt index 27eb73d7dff..7e6d5da6e59 100644 --- a/idea/testData/psi/Constructors.txt +++ b/idea/testData/psi/Constructors.txt @@ -43,12 +43,12 @@ JetFile: Constructors.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -97,12 +97,12 @@ JetFile: Constructors.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/Enums.txt b/idea/testData/psi/Enums.txt index 1887baa6681..4abfcbd839f 100644 --- a/idea/testData/psi/Enums.txt +++ b/idea/testData/psi/Enums.txt @@ -129,12 +129,12 @@ JetFile: Enums.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Nothing') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Nothing') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -173,12 +173,12 @@ JetFile: Enums.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -188,12 +188,12 @@ JetFile: Enums.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiComment(BLOCK_COMMENT)('/*tail.size + 1*/') diff --git a/idea/testData/psi/FunctionTypes.txt b/idea/testData/psi/FunctionTypes.txt index 947542bab64..eed105453f9 100644 --- a/idea/testData/psi/FunctionTypes.txt +++ b/idea/testData/psi/FunctionTypes.txt @@ -589,12 +589,12 @@ JetFile: FunctionTypes.jet PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -776,12 +776,12 @@ JetFile: FunctionTypes.jet PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -966,12 +966,12 @@ JetFile: FunctionTypes.jet PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -1217,12 +1217,12 @@ JetFile: FunctionTypes.jet PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/Functions.txt b/idea/testData/psi/Functions.txt index 504fda22877..3667583de48 100644 --- a/idea/testData/psi/Functions.txt +++ b/idea/testData/psi/Functions.txt @@ -67,24 +67,24 @@ JetFile: Functions.jet PsiWhiteSpace(' ') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('A') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -269,24 +269,24 @@ JetFile: Functions.jet PsiWhiteSpace(' ') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('A') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -483,24 +483,24 @@ JetFile: Functions.jet PsiWhiteSpace(' ') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('A') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -652,24 +652,24 @@ JetFile: Functions.jet PsiWhiteSpace(' ') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('A') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') diff --git a/idea/testData/psi/Functions_ERR.txt b/idea/testData/psi/Functions_ERR.txt index 38db43471b7..2169cb66643 100644 --- a/idea/testData/psi/Functions_ERR.txt +++ b/idea/testData/psi/Functions_ERR.txt @@ -376,24 +376,24 @@ JetFile: Functions_ERR.jet PsiWhiteSpace(' ') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('A') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') diff --git a/idea/testData/psi/Properties.txt b/idea/testData/psi/Properties.txt index cd7f858c709..f46f33fcfb2 100644 --- a/idea/testData/psi/Properties.txt +++ b/idea/testData/psi/Properties.txt @@ -701,12 +701,12 @@ JetFile: Properties.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('lastIndex') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/SimpleClassMembers.txt b/idea/testData/psi/SimpleClassMembers.txt index 03da720ac06..85d6f724b57 100644 --- a/idea/testData/psi/SimpleClassMembers.txt +++ b/idea/testData/psi/SimpleClassMembers.txt @@ -121,12 +121,12 @@ JetFile: SimpleClassMembers.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -352,12 +352,12 @@ JetFile: SimpleClassMembers.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -433,12 +433,12 @@ JetFile: SimpleClassMembers.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -479,12 +479,12 @@ JetFile: SimpleClassMembers.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/SimpleClassMembers_ERR.txt b/idea/testData/psi/SimpleClassMembers_ERR.txt index 1ea83c5fdcb..7552c7cb9a9 100644 --- a/idea/testData/psi/SimpleClassMembers_ERR.txt +++ b/idea/testData/psi/SimpleClassMembers_ERR.txt @@ -113,13 +113,13 @@ JetFile: SimpleClassMembers_ERR.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiErrorElement:Expecting a '>' - + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiErrorElement:Expecting a '>' + VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -160,12 +160,12 @@ JetFile: SimpleClassMembers_ERR.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/SimpleExpressions.txt b/idea/testData/psi/SimpleExpressions.txt index 75782d4b1cb..1183854d261 100644 --- a/idea/testData/psi/SimpleExpressions.txt +++ b/idea/testData/psi/SimpleExpressions.txt @@ -360,12 +360,12 @@ JetFile: SimpleExpressions.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -410,12 +410,12 @@ JetFile: SimpleExpressions.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER diff --git a/idea/testData/psi/ThisType.txt b/idea/testData/psi/ThisType.txt index ab84c76f1a2..1580e10d402 100644 --- a/idea/testData/psi/ThisType.txt +++ b/idea/testData/psi/ThisType.txt @@ -14,12 +14,12 @@ JetFile: ThisType.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiElement(GT)('>') PRIMARY_CONSTRUCTOR_PARAMETERS_LIST PsiElement(LPAR)('(') @@ -41,12 +41,12 @@ JetFile: ThisType.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('bar') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -56,12 +56,12 @@ JetFile: ThisType.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -74,12 +74,12 @@ JetFile: ThisType.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -130,12 +130,12 @@ JetFile: ThisType.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/TypeAnnotations.txt b/idea/testData/psi/TypeAnnotations.txt index f7f091f892f..f20a0ec0113 100644 --- a/idea/testData/psi/TypeAnnotations.txt +++ b/idea/testData/psi/TypeAnnotations.txt @@ -62,23 +62,23 @@ JetFile: TypeAnnotations.jet PsiWhiteSpace(' ') REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('F') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - MODIFIER_LIST - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') \ No newline at end of file + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + MODIFIER_LIST + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') \ No newline at end of file diff --git a/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt b/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt index d6941686c4e..348e62e8262 100644 --- a/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt +++ b/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt @@ -163,15 +163,15 @@ JetFile: TypeExpressionAmbiguities_ERR.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') PsiWhiteSpace(' ') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') - PsiErrorElement:Expecting a '>' - + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') + PsiErrorElement:Expecting a '>' + PsiWhiteSpace('\n ') BINARY_WITH_TYPE REFERENCE_EXPRESSION @@ -182,15 +182,15 @@ JetFile: TypeExpressionAmbiguities_ERR.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') + PsiWhiteSpace(' ') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') PsiWhiteSpace(' ') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - PsiErrorElement:Expecting a '>' - + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + PsiErrorElement:Expecting a '>' + PsiWhiteSpace('\n ') BINARY_WITH_PATTERN REFERENCE_EXPRESSION @@ -201,14 +201,14 @@ JetFile: TypeExpressionAmbiguities_ERR.jet TYPE_PATTERN REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Foo') + PsiWhiteSpace(' ') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') PsiWhiteSpace(' ') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - PsiErrorElement:Expecting a '>' - + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + PsiErrorElement:Expecting a '>' + PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/TypeParametersBeforeName.txt b/idea/testData/psi/TypeParametersBeforeName.txt index 9e15d9ea36c..49dfc5482c1 100644 --- a/idea/testData/psi/TypeParametersBeforeName.txt +++ b/idea/testData/psi/TypeParametersBeforeName.txt @@ -134,12 +134,12 @@ JetFile: TypeParametersBeforeName.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n') @@ -155,11 +155,11 @@ JetFile: TypeParametersBeforeName.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') \ No newline at end of file diff --git a/idea/testData/psi/examples/BinaryTree.txt b/idea/testData/psi/examples/BinaryTree.txt index 8390e179d57..a75478e5e91 100644 --- a/idea/testData/psi/examples/BinaryTree.txt +++ b/idea/testData/psi/examples/BinaryTree.txt @@ -17,12 +17,12 @@ JetFile: BinaryTree.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableSet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -104,12 +104,12 @@ JetFile: BinaryTree.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('MatchableComparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n ') PROPERTY MODIFIER_LIST @@ -152,12 +152,12 @@ JetFile: BinaryTree.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -1761,12 +1761,12 @@ JetFile: BinaryTree.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -1795,12 +1795,12 @@ JetFile: BinaryTree.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/BitArith.txt b/idea/testData/psi/examples/BitArith.txt index 52992373142..f1501f43c65 100644 --- a/idea/testData/psi/examples/BitArith.txt +++ b/idea/testData/psi/examples/BitArith.txt @@ -511,12 +511,12 @@ JetFile: BitArith.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IComparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/Graph.txt b/idea/testData/psi/examples/Graph.txt index 5ce2be41f2d..c081e4d840d 100644 --- a/idea/testData/psi/examples/Graph.txt +++ b/idea/testData/psi/examples/Graph.txt @@ -107,23 +107,23 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('ArrayList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Edge') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(GT)('>') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Edge') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(GT)('>') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -148,18 +148,18 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('HashSet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -174,23 +174,23 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Edge') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(GT)('>') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Edge') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -208,23 +208,23 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('ISet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Edge') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(GT)('>') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Edge') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -386,12 +386,12 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -484,18 +484,18 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('HashSet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -547,12 +547,12 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -563,18 +563,18 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('ISet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -700,18 +700,18 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -722,18 +722,18 @@ JetFile: Graph.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('ISet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER diff --git a/idea/testData/psi/examples/PolymorphicClassObjects.txt b/idea/testData/psi/examples/PolymorphicClassObjects.txt index 6ac30c9c9c5..d59ac1b09e0 100644 --- a/idea/testData/psi/examples/PolymorphicClassObjects.txt +++ b/idea/testData/psi/examples/PolymorphicClassObjects.txt @@ -100,17 +100,17 @@ JetFile: PolymorphicClassObjects.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Builder') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('R') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('R') + PsiElement(GT)('>') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -167,17 +167,17 @@ JetFile: PolymorphicClassObjects.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Builder') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('R') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('R') + PsiElement(GT)('>') PsiWhiteSpace('\n\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -210,12 +210,12 @@ JetFile: PolymorphicClassObjects.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Iterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') TYPE_CONSTRAINT @@ -232,17 +232,17 @@ JetFile: PolymorphicClassObjects.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Buildable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(for)('for') PsiWhiteSpace(' ') @@ -292,12 +292,12 @@ JetFile: PolymorphicClassObjects.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('R') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('R') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/Queue.txt b/idea/testData/psi/examples/Queue.txt index c07c37bbb88..ca62c982412 100644 --- a/idea/testData/psi/examples/Queue.txt +++ b/idea/testData/psi/examples/Queue.txt @@ -17,12 +17,12 @@ JetFile: Queue.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -63,12 +63,12 @@ JetFile: Queue.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Item') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') PROPERTY @@ -84,12 +84,12 @@ JetFile: Queue.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Item') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -109,12 +109,12 @@ JetFile: Queue.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Item') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/Stack.txt b/idea/testData/psi/examples/Stack.txt index 99ed6f90f0a..f4154cba2e3 100644 --- a/idea/testData/psi/examples/Stack.txt +++ b/idea/testData/psi/examples/Stack.txt @@ -17,12 +17,12 @@ JetFile: Stack.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -43,12 +43,12 @@ JetFile: Stack.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('ArrayList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/examples/array/MutableArray.txt b/idea/testData/psi/examples/array/MutableArray.txt index 8f6089e24e6..241f3571a36 100644 --- a/idea/testData/psi/examples/array/MutableArray.txt +++ b/idea/testData/psi/examples/array/MutableArray.txt @@ -149,24 +149,24 @@ JetFile: MutableArray.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('ReadOnlyArray') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('WriteOnlyArray') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/ArrayList.txt b/idea/testData/psi/examples/collections/ArrayList.txt index 0db6dc82900..c362f5f0a6b 100644 --- a/idea/testData/psi/examples/collections/ArrayList.txt +++ b/idea/testData/psi/examples/collections/ArrayList.txt @@ -17,12 +17,12 @@ JetFile: ArrayList.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -91,12 +91,12 @@ JetFile: ArrayList.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -125,12 +125,12 @@ JetFile: ArrayList.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/collections/HashMap.txt b/idea/testData/psi/examples/collections/HashMap.txt index bb7f2b5d75d..1bda6ee46f8 100644 --- a/idea/testData/psi/examples/collections/HashMap.txt +++ b/idea/testData/psi/examples/collections/HashMap.txt @@ -459,12 +459,12 @@ JetFile: HashMap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -577,12 +577,12 @@ JetFile: HashMap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -715,17 +715,17 @@ JetFile: HashMap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMap') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -861,12 +861,12 @@ JetFile: HashMap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -876,17 +876,17 @@ JetFile: HashMap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMap') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -913,12 +913,12 @@ JetFile: HashMap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('JavaObjectHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/examples/collections/IIterable.txt b/idea/testData/psi/examples/collections/IIterable.txt index 16318ecb115..dd93f2fd892 100644 --- a/idea/testData/psi/examples/collections/IIterable.txt +++ b/idea/testData/psi/examples/collections/IIterable.txt @@ -34,11 +34,11 @@ JetFile: IIterable.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/collections/IIterator.txt b/idea/testData/psi/examples/collections/IIterator.txt index 76458603ae3..6800977fe14 100644 --- a/idea/testData/psi/examples/collections/IIterator.txt +++ b/idea/testData/psi/examples/collections/IIterator.txt @@ -62,15 +62,15 @@ JetFile: IIterator.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('MutableArray') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - MODIFIER_LIST - PsiElement(in)('in') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + MODIFIER_LIST + PsiElement(in)('in') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -129,15 +129,15 @@ JetFile: IIterator.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('MutableArray') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - MODIFIER_LIST - PsiElement(in)('in') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + MODIFIER_LIST + PsiElement(in)('in') + PsiWhiteSpace(' ') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER diff --git a/idea/testData/psi/examples/collections/IList.txt b/idea/testData/psi/examples/collections/IList.txt index c45d4ae225e..843652a0499 100644 --- a/idea/testData/psi/examples/collections/IList.txt +++ b/idea/testData/psi/examples/collections/IList.txt @@ -23,12 +23,12 @@ JetFile: IList.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS diff --git a/idea/testData/psi/examples/collections/IMutableIterable.txt b/idea/testData/psi/examples/collections/IMutableIterable.txt index e12bb401875..c6a6994a482 100644 --- a/idea/testData/psi/examples/collections/IMutableIterable.txt +++ b/idea/testData/psi/examples/collections/IMutableIterable.txt @@ -23,12 +23,12 @@ JetFile: IMutableIterable.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -48,11 +48,11 @@ JetFile: IMutableIterable.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/collections/IMutableIterator.txt b/idea/testData/psi/examples/collections/IMutableIterator.txt index 5d5041d2987..dca05efb3d3 100644 --- a/idea/testData/psi/examples/collections/IMutableIterator.txt +++ b/idea/testData/psi/examples/collections/IMutableIterator.txt @@ -23,12 +23,12 @@ JetFile: IMutableIterator.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/IMutableList.txt b/idea/testData/psi/examples/collections/IMutableList.txt index 525826a3e0b..71ae5bbc954 100644 --- a/idea/testData/psi/examples/collections/IMutableList.txt +++ b/idea/testData/psi/examples/collections/IMutableList.txt @@ -20,24 +20,24 @@ JetFile: IMutableList.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -143,11 +143,11 @@ JetFile: IMutableList.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/collections/IMutableSet.txt b/idea/testData/psi/examples/collections/IMutableSet.txt index c681cda21b6..9df9cdc5073 100644 --- a/idea/testData/psi/examples/collections/IMutableSet.txt +++ b/idea/testData/psi/examples/collections/IMutableSet.txt @@ -20,24 +20,24 @@ JetFile: IMutableSet.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('ISet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/ISet.txt b/idea/testData/psi/examples/collections/ISet.txt index c5c4b2f3078..977669fae46 100644 --- a/idea/testData/psi/examples/collections/ISet.txt +++ b/idea/testData/psi/examples/collections/ISet.txt @@ -20,12 +20,12 @@ JetFile: ISet.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS diff --git a/idea/testData/psi/examples/collections/LinkedList.txt b/idea/testData/psi/examples/collections/LinkedList.txt index 6128f7942dd..127107f35b9 100644 --- a/idea/testData/psi/examples/collections/LinkedList.txt +++ b/idea/testData/psi/examples/collections/LinkedList.txt @@ -17,12 +17,12 @@ JetFile: LinkedList.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -863,11 +863,11 @@ JetFile: LinkedList.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/collections/List.txt b/idea/testData/psi/examples/collections/List.txt index 75b180d1b16..58f8b04b6a5 100644 --- a/idea/testData/psi/examples/collections/List.txt +++ b/idea/testData/psi/examples/collections/List.txt @@ -34,12 +34,12 @@ JetFile: List.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -56,12 +56,12 @@ JetFile: List.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Nothing') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Nothing') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -100,12 +100,12 @@ JetFile: List.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -115,12 +115,12 @@ JetFile: List.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/examples/io/IOSamples.txt b/idea/testData/psi/examples/io/IOSamples.txt index 0c4a21b00e9..e2aa08f7e03 100644 --- a/idea/testData/psi/examples/io/IOSamples.txt +++ b/idea/testData/psi/examples/io/IOSamples.txt @@ -130,12 +130,12 @@ JetFile: IOSamples.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -146,12 +146,12 @@ JetFile: IOSamples.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IAdder') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -202,12 +202,12 @@ JetFile: IOSamples.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Byte') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Byte') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS @@ -481,12 +481,12 @@ JetFile: IOSamples.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IAdder') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Byte') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Byte') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS diff --git a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt index c83071fee18..c6f44fcc9ef 100644 --- a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt +++ b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt @@ -17,12 +17,12 @@ JetFile: BinaryHeap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IPriorityQueue') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -40,12 +40,12 @@ JetFile: BinaryHeap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n ') PROPERTY MODIFIER_LIST @@ -60,12 +60,12 @@ JetFile: BinaryHeap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') @@ -79,12 +79,12 @@ JetFile: BinaryHeap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -95,12 +95,12 @@ JetFile: BinaryHeap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -216,12 +216,12 @@ JetFile: BinaryHeap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -300,12 +300,12 @@ JetFile: BinaryHeap.jet TYPE_PATTERN REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IComparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION @@ -1167,12 +1167,12 @@ JetFile: BinaryHeap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('swap') TYPE_PARAMETER_LIST @@ -1262,12 +1262,12 @@ JetFile: BinaryHeap.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('lastIndex') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt index ff709e64b65..6137e139c91 100644 --- a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt +++ b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt @@ -21,12 +21,12 @@ JetFile: PriorityQueueAsPushPop.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IPriorityQueue') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -36,12 +36,12 @@ JetFile: PriorityQueueAsPushPop.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/util/Comparison.txt b/idea/testData/psi/examples/util/Comparison.txt index cbc26efab4c..92207eedd44 100644 --- a/idea/testData/psi/examples/util/Comparison.txt +++ b/idea/testData/psi/examples/util/Comparison.txt @@ -54,12 +54,12 @@ JetFile: Comparison.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('IComparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(GT)('>') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -154,12 +154,12 @@ JetFile: Comparison.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Comparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Object') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiElement(DOT)('.') REFERENCE_EXPRESSION @@ -176,12 +176,12 @@ JetFile: Comparison.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Comparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Object') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') CLASS @@ -272,12 +272,12 @@ JetFile: Comparison.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -285,12 +285,12 @@ JetFile: Comparison.jet TYPE_REFERENCE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('MatchableComparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ')