diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java index 5945303a815..f31c5d0d838 100644 --- a/idea/src/org/jetbrains/jet/JetNodeTypes.java +++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java @@ -27,7 +27,6 @@ public interface JetNodeTypes { JetNodeType TYPE_PARAMETER_LIST = new JetNodeType("TYPE_PARAMETER_LIST", JetTypeParameterList.class); JetNodeType TYPE_PARAMETER = new JetNodeType("TYPE_PARAMETER", JetTypeParameter.class); JetNodeType DELEGATION_SPECIFIER_LIST = new JetNodeType("DELEGATION_SPECIFIER_LIST"); - JetNodeType DELEGATION_SPECIFIER = new JetNodeType("DELEGATION_SPECIFIER"); JetNodeType DELEGATOR_BY = new JetNodeType("DELEGATOR_BY"); JetNodeType DELEGATOR_SUPER_CALL = new JetNodeType("DELEGATOR_SUPER_CALL"); JetNodeType DELEGATOR_SUPER_CLASS = new JetNodeType("DELEGATOR_SUPER_CLASS"); diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java index ea80263059e..c3dde5b9ad2 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -1005,10 +1005,8 @@ public class JetParsing extends AbstractJetParsing { * ; */ private void parseDelegationSpecifier() { - PsiBuilder.Marker specifier = mark(); - parseAttributeList(); - PsiBuilder.Marker delegator = mark(); + parseAttributeList(); parseTypeRef(); if (at(BY_KEYWORD)) { @@ -1023,8 +1021,6 @@ public class JetParsing extends AbstractJetParsing { else { delegator.done(DELEGATOR_SUPER_CLASS); } - - specifier.done(DELEGATION_SPECIFIER); } diff --git a/idea/testData/psi/BabySteps.txt b/idea/testData/psi/BabySteps.txt index a3f00b3f6ef..21f09525ab8 100644 --- a/idea/testData/psi/BabySteps.txt +++ b/idea/testData/psi/BabySteps.txt @@ -37,37 +37,34 @@ JetFile: BabySteps.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CALL - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - NAMED_ARGUMENT - PsiElement(IDENTIFIER)('d') - PsiElement(EQ)('=') - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('0') - PsiElement(RPAR)(')') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + NAMED_ARGUMENT + PsiElement(IDENTIFIER)('d') + PsiElement(EQ)('=') + INTEGER_CONSTANT + PsiElement(INTEGER_LITERAL)('0') + PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('x') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('bar') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('x') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('bar') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/BabySteps_ERR.txt b/idea/testData/psi/BabySteps_ERR.txt index 8ec37656257..d8dd07e7abe 100644 --- a/idea/testData/psi/BabySteps_ERR.txt +++ b/idea/testData/psi/BabySteps_ERR.txt @@ -37,39 +37,36 @@ JetFile: BabySteps_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CALL - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('foo') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - NAMED_ARGUMENT - PsiElement(IDENTIFIER)('d') - PsiElement(EQ)('=') - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('0') - PsiElement(RPAR)(')') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + NAMED_ARGUMENT + PsiElement(IDENTIFIER)('d') + PsiElement(EQ)('=') + INTEGER_CONSTANT + PsiElement(INTEGER_LITERAL)('0') + PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PsiErrorElement:Expecting a delegation specifier PsiElement(COMMA)(',') - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('x') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('bar') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('x') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('bar') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/ByCaluses.txt b/idea/testData/psi/ByCaluses.txt index c91eadf006f..a0a97eccc2a 100644 --- a/idea/testData/psi/ByCaluses.txt +++ b/idea/testData/psi/ByCaluses.txt @@ -10,15 +10,14 @@ JetFile: ByCaluses.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('a') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -45,30 +44,29 @@ JetFile: ByCaluses.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + BINARY_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') - PsiElement(by)('by') + PsiElement(PLUS)('+') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + CALL_EXPRESSION + PsiElement(IDENTIFIER)('b') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') PsiWhiteSpace(' ') - PsiElement(PLUS)('+') + PsiElement(MUL)('*') PsiWhiteSpace(' ') - BINARY_EXPRESSION - CALL_EXPRESSION - PsiElement(IDENTIFIER)('b') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(MUL)('*') - PsiWhiteSpace(' ') - INTEGER_CONSTANT - PsiElement(INTEGER_LITERAL)('5') + INTEGER_CONSTANT + PsiElement(INTEGER_LITERAL)('5') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -95,18 +93,17 @@ JetFile: ByCaluses.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - TUPLE - PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('a') - PsiElement(RPAR)(')') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + TUPLE + PsiElement(LPAR)('(') + PsiElement(IDENTIFIER)('a') + PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -133,16 +130,61 @@ JetFile: ByCaluses.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - TUPLE - PsiElement(LPAR)('(') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + TUPLE + PsiElement(LPAR)('(') + CALL_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiWhiteSpace(' ') + FUNCTION_LITERAL + PsiElement(LBRACE)('{') + BODY + + PsiElement(RBRACE)('}') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + CLASS_BODY + PsiElement(LBRACE)('{') + PsiWhiteSpace('\n ') + CONSTRUCTOR + PsiElement(this)('this') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + BLOCK + PsiElement(LBRACE)('{') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + CLASS + PsiElement(class)('class') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('A') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + DELEGATION_SPECIFIER_LIST + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + ARRAY_ACCESS_EXPRESSION + PsiElement(IDENTIFIER)('a') + INDICES + PsiElement(LBRACKET)('[') CALL_EXPRESSION PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') @@ -151,6 +193,53 @@ JetFile: ByCaluses.jet BODY PsiElement(RBRACE)('}') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + CLASS_BODY + PsiElement(LBRACE)('{') + PsiWhiteSpace('\n ') + CONSTRUCTOR + PsiElement(this)('this') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + BLOCK + PsiElement(LBRACE)('{') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + CLASS + PsiElement(class)('class') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('A') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + DELEGATION_SPECIFIER_LIST + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + CALL_EXPRESSION + PsiElement(IDENTIFIER)('a') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + VALUE_ARGUMENT + CALL_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiWhiteSpace(' ') + FUNCTION_LITERAL + PsiElement(LBRACE)('{') + BODY + + PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY @@ -178,18 +267,31 @@ JetFile: ByCaluses.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + OBJECT_LITERAL + PsiElement(object)('object') PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('a') - INDICES - PsiElement(LBRACKET)('[') + CLASS_BODY + PsiElement(LBRACE)('{') + PsiWhiteSpace('\n ') + FUN + PsiElement(fun)('fun') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + TYPE_PARAMETER_LIST + + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(EQ)('=') + PsiWhiteSpace(' ') CALL_EXPRESSION PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') @@ -198,117 +300,8 @@ JetFile: ByCaluses.jet BODY PsiElement(RBRACE)('}') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - CLASS_BODY - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - CONSTRUCTOR - PsiElement(this)('this') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - BLOCK - PsiElement(LBRACE)('{') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - CLASS - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - CALL_EXPRESSION - PsiElement(IDENTIFIER)('a') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - VALUE_ARGUMENT - CALL_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - FUNCTION_LITERAL - PsiElement(LBRACE)('{') - BODY - - PsiElement(RBRACE)('}') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - CLASS_BODY - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - CONSTRUCTOR - PsiElement(this)('this') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - BLOCK - PsiElement(LBRACE)('{') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - CLASS - PsiElement(class)('class') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('A') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('b') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - OBJECT_LITERAL - PsiElement(object)('object') - PsiWhiteSpace(' ') - CLASS_BODY - PsiElement(LBRACE)('{') - PsiWhiteSpace('\n ') - FUN - PsiElement(fun)('fun') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - TYPE_PARAMETER_LIST - - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - CALL_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - FUNCTION_LITERAL - PsiElement(LBRACE)('{') - BODY - - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + PsiElement(RBRACE)('}') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/SimpleClassMembers.txt b/idea/testData/psi/SimpleClassMembers.txt index 59a633c14a1..e736297ce33 100644 --- a/idea/testData/psi/SimpleClassMembers.txt +++ b/idea/testData/psi/SimpleClassMembers.txt @@ -207,11 +207,10 @@ JetFile: SimpleClassMembers.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Fooo') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Fooo') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -228,22 +227,20 @@ JetFile: SimpleClassMembers.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Fooo') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Fooo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Bar') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Bar') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -260,32 +257,29 @@ JetFile: SimpleClassMembers.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Fooo') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Fooo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Bar') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Bar') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CALL - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Goo') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Goo') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -562,11 +556,10 @@ JetFile: SimpleClassMembers.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Fooo') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Fooo') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -583,22 +576,20 @@ JetFile: SimpleClassMembers.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Fooo') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Fooo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Bar') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Bar') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -615,31 +606,28 @@ JetFile: SimpleClassMembers.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Fooo') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Fooo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Bar') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Bar') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CALL - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Goo') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Goo') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') PsiWhiteSpace('\n\n\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/SimpleExpressions.txt b/idea/testData/psi/SimpleExpressions.txt index de45b34ea3e..d1c0b487d99 100644 --- a/idea/testData/psi/SimpleExpressions.txt +++ b/idea/testData/psi/SimpleExpressions.txt @@ -430,11 +430,10 @@ JetFile: SimpleExpressions.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Foo') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Foo') CLASS_BODY PsiElement(LBRACE)('{') PsiElement(RBRACE)('}') diff --git a/idea/testData/psi/SoftKeywords.txt b/idea/testData/psi/SoftKeywords.txt index 7bd7f5fa95d..a1ef5107873 100644 --- a/idea/testData/psi/SoftKeywords.txt +++ b/idea/testData/psi/SoftKeywords.txt @@ -142,15 +142,14 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_BY - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiWhiteSpace(' ') - PsiElement(by)('by') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + DELEGATOR_BY + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiWhiteSpace(' ') + PsiElement(by)('by') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/AnonymousObjects.txt b/idea/testData/psi/examples/AnonymousObjects.txt index 64d90fd6661..80a4fa6efca 100644 --- a/idea/testData/psi/examples/AnonymousObjects.txt +++ b/idea/testData/psi/examples/AnonymousObjects.txt @@ -22,14 +22,13 @@ JetFile: AnonymousObjects.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CALL - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('MouseAdapter') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('MouseAdapter') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/BinaryTree.txt b/idea/testData/psi/examples/BinaryTree.txt index 290c6f660f8..6d84204f0e6 100644 --- a/idea/testData/psi/examples/BinaryTree.txt +++ b/idea/testData/psi/examples/BinaryTree.txt @@ -13,17 +13,16 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMutableSet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMutableSet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -1672,11 +1671,10 @@ JetFile: BinaryTree.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMutableIterator') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMutableIterator') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/BitArith.txt b/idea/testData/psi/examples/BitArith.txt index aa00fb2006c..ba289b6e704 100644 --- a/idea/testData/psi/examples/BitArith.txt +++ b/idea/testData/psi/examples/BitArith.txt @@ -483,17 +483,16 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IComparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IComparable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/Builder.txt b/idea/testData/psi/examples/Builder.txt index 77541e0d6f4..51253d4535e 100644 --- a/idea/testData/psi/examples/Builder.txt +++ b/idea/testData/psi/examples/Builder.txt @@ -13,14 +13,13 @@ JetFile: Builder.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CALL - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('AntBuilder') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('AntBuilder') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -199,11 +198,10 @@ JetFile: Builder.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ClassPathEntry') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ClassPathEntry') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -282,11 +280,10 @@ JetFile: Builder.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ClassPathEntry') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ClassPathEntry') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/PolymorphicClassObjects.txt b/idea/testData/psi/examples/PolymorphicClassObjects.txt index 8f851551a50..c9c0b4403d4 100644 --- a/idea/testData/psi/examples/PolymorphicClassObjects.txt +++ b/idea/testData/psi/examples/PolymorphicClassObjects.txt @@ -133,11 +133,10 @@ JetFile: PolymorphicClassObjects.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Buildable') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Buildable') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/Queue.txt b/idea/testData/psi/examples/Queue.txt index ff9fb8f1681..36499d2525c 100644 --- a/idea/testData/psi/examples/Queue.txt +++ b/idea/testData/psi/examples/Queue.txt @@ -13,17 +13,16 @@ JetFile: Queue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IPushPop') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/Stack.txt b/idea/testData/psi/examples/Stack.txt index 93ca4517042..857e27c1122 100644 --- a/idea/testData/psi/examples/Stack.txt +++ b/idea/testData/psi/examples/Stack.txt @@ -13,17 +13,16 @@ JetFile: Stack.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IPushPop') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/array/MutableArray.txt b/idea/testData/psi/examples/array/MutableArray.txt index 1493dec7142..6d249c14ef3 100644 --- a/idea/testData/psi/examples/array/MutableArray.txt +++ b/idea/testData/psi/examples/array/MutableArray.txt @@ -21,11 +21,10 @@ JetFile: MutableArray.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ISized') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ISized') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -83,11 +82,10 @@ JetFile: MutableArray.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ISized') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ISized') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -145,30 +143,28 @@ JetFile: MutableArray.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ReadOnlyArray') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ReadOnlyArray') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('WriteOnlyArray') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('WriteOnlyArray') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 e62199685f3..8ccfa718b3d 100644 --- a/idea/testData/psi/examples/collections/ArrayList.txt +++ b/idea/testData/psi/examples/collections/ArrayList.txt @@ -13,17 +13,16 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMutableList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -137,14 +136,13 @@ JetFile: ArrayList.jet PsiElement(object)('object') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CALL - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMutableIterator') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMutableIterator') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/HashMap.txt b/idea/testData/psi/examples/collections/HashMap.txt index 4d37794515e..5fb63f4dcfb 100644 --- a/idea/testData/psi/examples/collections/HashMap.txt +++ b/idea/testData/psi/examples/collections/HashMap.txt @@ -90,11 +90,10 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IEquality') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IEquality') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -296,11 +295,10 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IHashable') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IHashable') PsiWhiteSpace('\n ') PsiComment(EOL_COMMENT)('// equals and hashCode implementations are inherited') PsiWhiteSpace('\n\n') @@ -444,17 +442,16 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IHashingStrategy') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -558,17 +555,16 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IHashingStrategy') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -690,22 +686,21 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMap') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('K') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMap') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('K') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -844,22 +839,21 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMap') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('K') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMap') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('K') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/IList.txt b/idea/testData/psi/examples/collections/IList.txt index 97661755b21..80a332b1b09 100644 --- a/idea/testData/psi/examples/collections/IList.txt +++ b/idea/testData/psi/examples/collections/IList.txt @@ -19,24 +19,22 @@ JetFile: IList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ISized') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ISized') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/IMutableIterable.txt b/idea/testData/psi/examples/collections/IMutableIterable.txt index 1a9b7d287ea..29acad604de 100644 --- a/idea/testData/psi/examples/collections/IMutableIterable.txt +++ b/idea/testData/psi/examples/collections/IMutableIterable.txt @@ -19,17 +19,16 @@ JetFile: IMutableIterable.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/IMutableIterator.txt b/idea/testData/psi/examples/collections/IMutableIterator.txt index 6969f5e81f9..aa8a8872059 100644 --- a/idea/testData/psi/examples/collections/IMutableIterator.txt +++ b/idea/testData/psi/examples/collections/IMutableIterator.txt @@ -19,17 +19,16 @@ JetFile: IMutableIterator.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 8288204bd1a..81389ab6021 100644 --- a/idea/testData/psi/examples/collections/IMutableList.txt +++ b/idea/testData/psi/examples/collections/IMutableList.txt @@ -16,30 +16,28 @@ JetFile: IMutableList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMutableIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMutableIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/IMutableSet.txt b/idea/testData/psi/examples/collections/IMutableSet.txt index fab87bdb9f7..06178d34959 100644 --- a/idea/testData/psi/examples/collections/IMutableSet.txt +++ b/idea/testData/psi/examples/collections/IMutableSet.txt @@ -16,30 +16,28 @@ JetFile: IMutableSet.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ISet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ISet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMutableIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMutableIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 e4e04078f9d..e3595b21db6 100644 --- a/idea/testData/psi/examples/collections/ISet.txt +++ b/idea/testData/psi/examples/collections/ISet.txt @@ -16,24 +16,22 @@ JetFile: ISet.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ISized') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ISized') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/LinkedList.txt b/idea/testData/psi/examples/collections/LinkedList.txt index 4ce72b96d99..f9e1020f932 100644 --- a/idea/testData/psi/examples/collections/LinkedList.txt +++ b/idea/testData/psi/examples/collections/LinkedList.txt @@ -13,17 +13,16 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IMutableList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/List.txt b/idea/testData/psi/examples/collections/List.txt index d54eb563f6b..f91bf0e9c8a 100644 --- a/idea/testData/psi/examples/collections/List.txt +++ b/idea/testData/psi/examples/collections/List.txt @@ -30,17 +30,16 @@ JetFile: List.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/io/IOSamples.txt b/idea/testData/psi/examples/io/IOSamples.txt index 81b8befce58..b622dad9775 100644 --- a/idea/testData/psi/examples/io/IOSamples.txt +++ b/idea/testData/psi/examples/io/IOSamples.txt @@ -100,16 +100,15 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CALL - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('ICloseable') - VALUE_ARGUMENT_LIST - PsiElement(LPAR)('(') - VALUE_ARGUMENT - PsiElement(IDENTIFIER)('closeable') - PsiElement(RPAR)(')') + DELEGATOR_SUPER_CALL + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('ICloseable') + VALUE_ARGUMENT_LIST + PsiElement(LPAR)('(') + VALUE_ARGUMENT + PsiElement(IDENTIFIER)('closeable') + PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') @@ -194,24 +193,22 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Byte') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Byte') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('JavaCloseableWrapper') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('JavaCloseableWrapper') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -459,24 +456,22 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IAdder') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('Byte') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IAdder') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('Byte') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('JavaCloseableWrapper') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('JavaCloseableWrapper') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt index 6bb4d746ab9..8839cdc39c8 100644 --- a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt +++ b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt @@ -13,17 +13,16 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IPriorityQueue') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IPriorityQueue') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt index 5ca1a884b05..4c1cc4e5300 100644 --- a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt +++ b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt @@ -32,17 +32,16 @@ JetFile: PriorityQueueAsPushPop.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') DELEGATION_SPECIFIER_LIST - DELEGATION_SPECIFIER - DELEGATOR_SUPER_CLASS - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + DELEGATOR_SUPER_CLASS + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('IPushPop') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{')