DELEGATION_SPECIFIER node seem to be unnecessary.
This commit is contained in:
@@ -27,7 +27,6 @@ public interface JetNodeTypes {
|
|||||||
JetNodeType TYPE_PARAMETER_LIST = new JetNodeType("TYPE_PARAMETER_LIST", JetTypeParameterList.class);
|
JetNodeType TYPE_PARAMETER_LIST = new JetNodeType("TYPE_PARAMETER_LIST", JetTypeParameterList.class);
|
||||||
JetNodeType TYPE_PARAMETER = new JetNodeType("TYPE_PARAMETER", JetTypeParameter.class);
|
JetNodeType TYPE_PARAMETER = new JetNodeType("TYPE_PARAMETER", JetTypeParameter.class);
|
||||||
JetNodeType DELEGATION_SPECIFIER_LIST = new JetNodeType("DELEGATION_SPECIFIER_LIST");
|
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_BY = new JetNodeType("DELEGATOR_BY");
|
||||||
JetNodeType DELEGATOR_SUPER_CALL = new JetNodeType("DELEGATOR_SUPER_CALL");
|
JetNodeType DELEGATOR_SUPER_CALL = new JetNodeType("DELEGATOR_SUPER_CALL");
|
||||||
JetNodeType DELEGATOR_SUPER_CLASS = new JetNodeType("DELEGATOR_SUPER_CLASS");
|
JetNodeType DELEGATOR_SUPER_CLASS = new JetNodeType("DELEGATOR_SUPER_CLASS");
|
||||||
|
|||||||
@@ -1005,10 +1005,8 @@ public class JetParsing extends AbstractJetParsing {
|
|||||||
* ;
|
* ;
|
||||||
*/
|
*/
|
||||||
private void parseDelegationSpecifier() {
|
private void parseDelegationSpecifier() {
|
||||||
PsiBuilder.Marker specifier = mark();
|
|
||||||
parseAttributeList();
|
|
||||||
|
|
||||||
PsiBuilder.Marker delegator = mark();
|
PsiBuilder.Marker delegator = mark();
|
||||||
|
parseAttributeList();
|
||||||
parseTypeRef();
|
parseTypeRef();
|
||||||
|
|
||||||
if (at(BY_KEYWORD)) {
|
if (at(BY_KEYWORD)) {
|
||||||
@@ -1023,8 +1021,6 @@ public class JetParsing extends AbstractJetParsing {
|
|||||||
else {
|
else {
|
||||||
delegator.done(DELEGATOR_SUPER_CLASS);
|
delegator.done(DELEGATOR_SUPER_CLASS);
|
||||||
}
|
}
|
||||||
|
|
||||||
specifier.done(DELEGATION_SPECIFIER);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ JetFile: BabySteps.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CALL
|
DELEGATOR_SUPER_CALL
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -52,7 +51,6 @@ JetFile: BabySteps.jet
|
|||||||
PsiElement(RPAR)(')')
|
PsiElement(RPAR)(')')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -63,7 +61,6 @@ JetFile: BabySteps.jet
|
|||||||
PsiElement(IDENTIFIER)('x')
|
PsiElement(IDENTIFIER)('x')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ JetFile: BabySteps_ERR.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CALL
|
DELEGATOR_SUPER_CALL
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -54,7 +53,6 @@ JetFile: BabySteps_ERR.jet
|
|||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
PsiErrorElement:Expecting a delegation specifier
|
PsiErrorElement:Expecting a delegation specifier
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -65,7 +63,6 @@ JetFile: BabySteps_ERR.jet
|
|||||||
PsiElement(IDENTIFIER)('x')
|
PsiElement(IDENTIFIER)('x')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ JetFile: ByCaluses.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -45,7 +44,6 @@ JetFile: ByCaluses.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -95,7 +93,6 @@ JetFile: ByCaluses.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -133,7 +130,6 @@ JetFile: ByCaluses.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -178,7 +174,6 @@ JetFile: ByCaluses.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -225,7 +220,6 @@ JetFile: ByCaluses.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -273,7 +267,6 @@ JetFile: ByCaluses.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -207,7 +207,6 @@ JetFile: SimpleClassMembers.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -228,14 +227,12 @@ JetFile: SimpleClassMembers.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
PsiElement(IDENTIFIER)('Fooo')
|
PsiElement(IDENTIFIER)('Fooo')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -260,14 +257,12 @@ JetFile: SimpleClassMembers.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
PsiElement(IDENTIFIER)('Fooo')
|
PsiElement(IDENTIFIER)('Fooo')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -278,7 +273,6 @@ JetFile: SimpleClassMembers.jet
|
|||||||
PsiElement(IDENTIFIER)('foo')
|
PsiElement(IDENTIFIER)('foo')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CALL
|
DELEGATOR_SUPER_CALL
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -562,7 +556,6 @@ JetFile: SimpleClassMembers.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -583,14 +576,12 @@ JetFile: SimpleClassMembers.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
PsiElement(IDENTIFIER)('Fooo')
|
PsiElement(IDENTIFIER)('Fooo')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -615,14 +606,12 @@ JetFile: SimpleClassMembers.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
PsiElement(IDENTIFIER)('Fooo')
|
PsiElement(IDENTIFIER)('Fooo')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -633,7 +622,6 @@ JetFile: SimpleClassMembers.jet
|
|||||||
PsiElement(IDENTIFIER)('foo')
|
PsiElement(IDENTIFIER)('foo')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CALL
|
DELEGATOR_SUPER_CALL
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -430,7 +430,6 @@ JetFile: SimpleExpressions.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -142,7 +142,6 @@ JetFile: SoftKeywords.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_BY
|
DELEGATOR_BY
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ JetFile: AnonymousObjects.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CALL
|
DELEGATOR_SUPER_CALL
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ JetFile: BinaryTree.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -1672,7 +1671,6 @@ JetFile: BinaryTree.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -483,7 +483,6 @@ JetFile: BitArith.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ JetFile: Builder.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CALL
|
DELEGATOR_SUPER_CALL
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -199,7 +198,6 @@ JetFile: Builder.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -282,7 +280,6 @@ JetFile: Builder.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -133,7 +133,6 @@ JetFile: PolymorphicClassObjects.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ JetFile: Queue.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ JetFile: Stack.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ JetFile: MutableArray.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -83,7 +82,6 @@ JetFile: MutableArray.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -145,7 +143,6 @@ JetFile: MutableArray.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -158,7 +155,6 @@ JetFile: MutableArray.jet
|
|||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ JetFile: ArrayList.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -137,7 +136,6 @@ JetFile: ArrayList.jet
|
|||||||
PsiElement(object)('object')
|
PsiElement(object)('object')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CALL
|
DELEGATOR_SUPER_CALL
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ JetFile: HashMap.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -296,7 +295,6 @@ JetFile: HashMap.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -444,7 +442,6 @@ JetFile: HashMap.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -558,7 +555,6 @@ JetFile: HashMap.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -690,7 +686,6 @@ JetFile: HashMap.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -844,7 +839,6 @@ JetFile: HashMap.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ JetFile: IList.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -32,7 +31,6 @@ JetFile: IList.jet
|
|||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ JetFile: IMutableIterable.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ JetFile: IMutableIterator.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ JetFile: IMutableList.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -29,7 +28,6 @@ JetFile: IMutableList.jet
|
|||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ JetFile: IMutableSet.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -29,7 +28,6 @@ JetFile: IMutableSet.jet
|
|||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ JetFile: ISet.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -29,7 +28,6 @@ JetFile: ISet.jet
|
|||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ JetFile: LinkedList.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ JetFile: List.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -100,7 +100,6 @@ JetFile: IOSamples.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CALL
|
DELEGATOR_SUPER_CALL
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -194,7 +193,6 @@ JetFile: IOSamples.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -207,7 +205,6 @@ JetFile: IOSamples.jet
|
|||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -459,7 +456,6 @@ JetFile: IOSamples.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
@@ -472,7 +468,6 @@ JetFile: IOSamples.jet
|
|||||||
PsiElement(GT)('>')
|
PsiElement(GT)('>')
|
||||||
PsiElement(COMMA)(',')
|
PsiElement(COMMA)(',')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ JetFile: BinaryHeap.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ JetFile: PriorityQueueAsPushPop.jet
|
|||||||
PsiElement(COLON)(':')
|
PsiElement(COLON)(':')
|
||||||
PsiWhiteSpace(' ')
|
PsiWhiteSpace(' ')
|
||||||
DELEGATION_SPECIFIER_LIST
|
DELEGATION_SPECIFIER_LIST
|
||||||
DELEGATION_SPECIFIER
|
|
||||||
DELEGATOR_SUPER_CLASS
|
DELEGATOR_SUPER_CLASS
|
||||||
TYPE_REFERENCE
|
TYPE_REFERENCE
|
||||||
USER_TYPE
|
USER_TYPE
|
||||||
|
|||||||
Reference in New Issue
Block a user