From 23fec0f24c83b43ad73d464e367ab9836893a894 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 24 Jan 2011 16:05:24 +0300 Subject: [PATCH] Wrap user types into JetTypeElements + Support nullable types --- idea/src/org/jetbrains/jet/JetNodeTypes.java | 1 + .../lang/parsing/JetExpressionParsing.java | 2 +- .../jet/lang/parsing/JetParsing.java | 29 +- .../jet/lang/psi/JetNullableType.java | 26 + .../jetbrains/jet/lang/psi/JetUserType.java | 2 +- .../jetbrains/jet/lang/psi/JetVisitor.java | 4 + idea/testData/psi/AnnotatedExpressions.txt | 10 +- idea/testData/psi/Attributes.txt | 136 +- idea/testData/psi/AttributesOnPatterns.txt | 20 +- idea/testData/psi/Attributes_ERR.txt | 121 +- idea/testData/psi/BabySteps.txt | 20 +- idea/testData/psi/BabySteps_ERR.txt | 20 +- idea/testData/psi/ByCaluses.txt | 35 +- idea/testData/psi/Constructors.txt | 41 +- idea/testData/psi/ControlStructures.txt | 85 +- idea/testData/psi/EOLsOnRollback.txt | 20 +- idea/testData/psi/Enums.txt | 89 +- idea/testData/psi/Extensions.txt | 60 +- idea/testData/psi/Extensions_ERR.txt | 10 +- idea/testData/psi/FunctionCalls.txt | 40 +- idea/testData/psi/FunctionLiterals.txt | 100 +- idea/testData/psi/FunctionLiterals_ERR.txt | 50 +- idea/testData/psi/FunctionTypes.txt | 1140 +++++++++-------- idea/testData/psi/FunctionTypes_ERR.txt | 25 +- idea/testData/psi/Functions.txt | 399 +++--- idea/testData/psi/Functions_ERR.txt | 176 +-- idea/testData/psi/LocalDeclarations.txt | 25 +- idea/testData/psi/NamespaceModifiers.txt | 10 +- idea/testData/psi/Precedence.txt | 35 +- idea/testData/psi/Properties.txt | 167 ++- idea/testData/psi/Properties_ERR.txt | 43 +- idea/testData/psi/QuotedIdentifiers.txt | 5 +- idea/testData/psi/RootNamespace.txt | 13 +- idea/testData/psi/SimpleClassMembers.txt | 162 ++- idea/testData/psi/SimpleClassMembers_ERR.txt | 43 +- idea/testData/psi/SimpleExpressions.txt | 231 ++-- idea/testData/psi/SoftKeywords.txt | 380 +++--- idea/testData/psi/ThisType.txt | 85 +- idea/testData/psi/TupleTypes.txt | 95 +- idea/testData/psi/TupleTypes_ERR.txt | 85 +- idea/testData/psi/TypeAnnotations.txt | 73 +- idea/testData/psi/TypeConstraints.txt | 20 +- idea/testData/psi/TypeDef.txt | 70 +- idea/testData/psi/TypeDef_ERR.txt | 30 +- .../psi/TypeExpressionAmbiguities_ERR.txt | 69 +- .../testData/psi/TypeParametersBeforeName.txt | 61 +- idea/testData/psi/When.txt | 15 +- .../psi/examples/AnonymousObjects.txt | 20 +- idea/testData/psi/examples/BinaryTree.txt | 275 ++-- idea/testData/psi/examples/BitArith.txt | 112 +- idea/testData/psi/examples/Builder.txt | 55 +- idea/testData/psi/examples/Color.txt | 30 +- .../psi/examples/FunctionsAndTypes.txt | 165 ++- idea/testData/psi/examples/Graph.txt | 381 +++--- idea/testData/psi/examples/IPushPop.txt | 15 +- .../psi/examples/PolymorphicClassObjects.txt | 168 +-- idea/testData/psi/examples/Queue.txt | 92 +- idea/testData/psi/examples/Stack.txt | 41 +- idea/testData/psi/examples/UnionFind.txt | 40 +- .../testData/psi/examples/UpdateOperation.txt | 35 +- idea/testData/psi/examples/With.txt | 20 +- .../psi/examples/array/MutableArray.txt | 76 +- .../psi/examples/collections/ArrayList.txt | 109 +- .../psi/examples/collections/HashMap.txt | 363 +++--- .../psi/examples/collections/IIterable.txt | 18 +- .../psi/examples/collections/IIterator.txt | 78 +- .../psi/examples/collections/IList.txt | 43 +- .../examples/collections/IMutableIterable.txt | 36 +- .../examples/collections/IMutableIterator.txt | 23 +- .../psi/examples/collections/IMutableList.txt | 89 +- .../psi/examples/collections/IMutableSet.txt | 56 +- .../psi/examples/collections/ISet.txt | 33 +- .../psi/examples/collections/ISized.txt | 5 +- .../psi/examples/collections/LinkedList.txt | 106 +- .../psi/examples/collections/List.txt | 97 +- idea/testData/psi/examples/io/IOSamples.txt | 163 ++- .../examples/priorityqueues/BinaryHeap.txt | 244 ++-- .../priorityqueues/IPriorityQueue.txt | 15 +- .../priorityqueues/PriorityQueueAsPushPop.txt | 41 +- .../testData/psi/examples/util/Comparison.txt | 150 ++- .../psi/examples/util/IComparable.txt | 16 +- 81 files changed, 4376 insertions(+), 3212 deletions(-) create mode 100644 idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java index 295abc076ca..e5f472a04a1 100644 --- a/idea/src/org/jetbrains/jet/JetNodeTypes.java +++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java @@ -122,6 +122,7 @@ public interface JetNodeTypes { JetNodeType WHEN_ENTRY = new JetNodeType("WHEN_ENTRY"); JetNodeType WHEN_CONDITION = new JetNodeType("WHEN_CONDITION"); JetNodeType TUPLE_PATTERN_ENTRY = new JetNodeType("TUPLE_PATTERN_ENTRY"); + JetNodeType NULLABLE_TYPE = new JetNodeType("NULLABLE_TYPE", JetNullableType.class); JetNodeType NAMESPACE_NAME = new JetNodeType("NAMESPACE_NAME", JetContainerNode.class); } diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 9afb0b217ee..fab8db1d13a 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -586,7 +586,7 @@ public class JetExpressionParsing extends AbstractJetParsing { myJetParsing.parseAttributeList(); if (at(NAMESPACE_KEYWORD) || at(IDENTIFIER)) { - myJetParsing.parseUserType(); + myJetParsing.parseUserTypeOrQualifiedName(); if (!myBuilder.newlineBeforeCurrentToken() && at(LPAR)) { PsiBuilder.Marker list = mark(); parseTuplePattern(DECOMPOSER_ARGUMENT); diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java index 2b3399fb32e..bb8511ea343 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -1158,8 +1158,18 @@ public class JetParsing extends AbstractJetParsing { /* * type - * : attributes (selfType | functionType | userType | tupleType) + * : attributes typeDescriptor + * + * typeDescriptor + * : selfType + * : functionType + * : userType + * : tupleType + * : nullableType * ; + * + * nullableType + * : typeDescriptor "?" */ public void parseTypeRef() { PsiBuilder.Marker type = mark(); @@ -1183,6 +1193,15 @@ public class JetParsing extends AbstractJetParsing { TokenSet.orSet(TOPLEVEL_OBJECT_FIRST, TokenSet.create(EQ, COMMA, GT, RBRACKET, DOT, RPAR, RBRACE, LBRACE, SEMICOLON))); } + + while (at(QUEST)) { + PsiBuilder.Marker precede = type.precede(); + + advance(); // QUEST + type.done(NULLABLE_TYPE); + + type = precede; + } type.done(TYPE_REFERENCE); } @@ -1204,7 +1223,13 @@ public class JetParsing extends AbstractJetParsing { * : ("namespace" ".")? simpleUserType{"."} * ; */ - public void parseUserType() { + private void parseUserType() { + PsiBuilder.Marker userType = mark(); + parseUserTypeOrQualifiedName(); + userType.done(USER_TYPE); + } + + public void parseUserTypeOrQualifiedName() { PsiBuilder.Marker type = mark(); boolean typeClosed = false; diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java b/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java new file mode 100644 index 00000000000..5ffacbcfb86 --- /dev/null +++ b/idea/src/org/jetbrains/jet/lang/psi/JetNullableType.java @@ -0,0 +1,26 @@ +package org.jetbrains.jet.lang.psi; + +import com.intellij.lang.ASTNode; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.JetNodeTypes; + +import java.util.List; + +/** + * @author max + */ +public class JetNullableType extends JetTypeElement { + public JetNullableType(@NotNull ASTNode node) { + super(node); + } + + @Override + public void accept(JetVisitor visitor) { + visitor.visitNullableType(this); + } + + @NotNull + public JetTypeElement getInnerType() { + return findChildByClass(JetTypeElement.class); + } +} diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java b/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java index a6dd211d77f..a001cf39521 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetUserType.java @@ -33,7 +33,7 @@ public class JetUserType extends JetTypeElement { @Nullable @IfNotParsed public ASTNode getTypeNameNode() { - return getNode().findChildByType(JetTokens.IDENTIFIER); + return getNode().findChildByType(JetNodeTypes.REFERENCE_EXPRESSION); } @Nullable @IfNotParsed diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java index 4e62060988c..2f0c27e1dd6 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java @@ -321,4 +321,8 @@ public class JetVisitor extends PsiElementVisitor { public void visitNamedDeclaration(JetNamedDeclaration declaration) { visitJetElement(declaration); } + + public void visitNullableType(JetNullableType nullableType) { + visitTypeElement(nullableType); + } } diff --git a/idea/testData/psi/AnnotatedExpressions.txt b/idea/testData/psi/AnnotatedExpressions.txt index af82ae24e30..aee085f5313 100644 --- a/idea/testData/psi/AnnotatedExpressions.txt +++ b/idea/testData/psi/AnnotatedExpressions.txt @@ -18,8 +18,9 @@ JetFile: AnnotatedExpressions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') REFERENCE_EXPRESSION @@ -33,8 +34,9 @@ JetFile: AnnotatedExpressions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') THIS_EXPRESSION diff --git a/idea/testData/psi/Attributes.txt b/idea/testData/psi/Attributes.txt index 64d32f7eb29..586e1ccbc84 100644 --- a/idea/testData/psi/Attributes.txt +++ b/idea/testData/psi/Attributes.txt @@ -41,19 +41,22 @@ JetFile: Attributes.jet PsiElement(LBRACKET)('[') ATTRIBUTE 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -68,53 +71,59 @@ JetFile: Attributes.jet PsiElement(COMMA)(',') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ina') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ina') PsiElement(COMMA)(',') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION REFERENCE_EXPRESSION REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + PsiElement(IDENTIFIER)('goo') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('goo') + PsiElement(IDENTIFIER)('doo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') + PsiElement(GT)('>') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('doo') + PsiElement(IDENTIFIER)('foo') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('f') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('goo') PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('goo') - PsiElement(GT)('>') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foo') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('df') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('df') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') PsiElement(in)('in') @@ -123,8 +132,9 @@ JetFile: Attributes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsdf') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsdf') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') PsiElement(out)('out') @@ -146,8 +156,9 @@ JetFile: Attributes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsdf') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsdf') PsiElement(EQ)('=') BINARY_EXPRESSION INTEGER_CONSTANT @@ -159,16 +170,18 @@ JetFile: Attributes.jet PsiWhiteSpace(' ') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsdf') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsdf') PsiElement(EQ)('=') BINARY_EXPRESSION INTEGER_CONSTANT @@ -182,8 +195,9 @@ JetFile: Attributes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -191,8 +205,9 @@ JetFile: Attributes.jet PsiWhiteSpace(' ') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsdf') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsdf') PsiElement(EQ)('=') BINARY_EXPRESSION INTEGER_CONSTANT @@ -218,29 +233,32 @@ JetFile: Attributes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsd') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsd') PsiElement(COMMA)(',') PsiWhiteSpace(' ') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsd') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsd') PsiElement(COMMA)(',') PsiWhiteSpace(' ') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('b') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('b') + PsiElement(IDENTIFIER)('f') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('f') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('c') + PsiElement(IDENTIFIER)('c') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') PsiElement(private)('private') diff --git a/idea/testData/psi/AttributesOnPatterns.txt b/idea/testData/psi/AttributesOnPatterns.txt index 2f25adbd7e9..326d1f7c67e 100644 --- a/idea/testData/psi/AttributesOnPatterns.txt +++ b/idea/testData/psi/AttributesOnPatterns.txt @@ -32,8 +32,9 @@ JetFile: AttributesOnPatterns.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -54,8 +55,9 @@ JetFile: AttributesOnPatterns.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') INTEGER_CONSTANT @@ -75,8 +77,9 @@ JetFile: AttributesOnPatterns.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') REFERENCE_EXPRESSION @@ -96,8 +99,9 @@ JetFile: AttributesOnPatterns.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') REFERENCE_EXPRESSION diff --git a/idea/testData/psi/Attributes_ERR.txt b/idea/testData/psi/Attributes_ERR.txt index ec6327343dc..f438095eae8 100644 --- a/idea/testData/psi/Attributes_ERR.txt +++ b/idea/testData/psi/Attributes_ERR.txt @@ -46,19 +46,22 @@ JetFile: Attributes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -74,53 +77,59 @@ JetFile: Attributes_ERR.jet PsiWhiteSpace(' ') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ina') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ina') PsiElement(COMMA)(',') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION REFERENCE_EXPRESSION REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + PsiElement(IDENTIFIER)('goo') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('goo') + PsiElement(IDENTIFIER)('doo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') + PsiElement(GT)('>') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('doo') + PsiElement(IDENTIFIER)('foo') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('f') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('goo') PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('goo') - PsiElement(GT)('>') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foo') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('df') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('df') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') PsiElement(in)('in') @@ -129,8 +138,9 @@ JetFile: Attributes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsdf') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsdf') PsiElement(COMMA)(',') PsiErrorElement:Expecting a comma-separated list of attributes @@ -140,13 +150,15 @@ JetFile: Attributes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('s') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiElement(COMMA)(',') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('fd') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('fd') PsiErrorElement:Expecting ']' to close an attribute annotation PsiWhiteSpace(' ') @@ -188,29 +200,32 @@ JetFile: Attributes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsd') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsd') PsiElement(COMMA)(',') PsiWhiteSpace(' ') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdfsd') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdfsd') PsiElement(COMMA)(',') PsiWhiteSpace(' ') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('b') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('b') + PsiElement(IDENTIFIER)('f') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('f') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('c') + PsiElement(IDENTIFIER)('c') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') PsiElement(private)('private') diff --git a/idea/testData/psi/BabySteps.txt b/idea/testData/psi/BabySteps.txt index 302cd83305b..eef0e542f6f 100644 --- a/idea/testData/psi/BabySteps.txt +++ b/idea/testData/psi/BabySteps.txt @@ -25,8 +25,9 @@ JetFile: BabySteps.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('doo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('doo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -39,8 +40,9 @@ JetFile: BabySteps.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -53,8 +55,9 @@ JetFile: BabySteps.jet PsiWhiteSpace(' ') DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -64,8 +67,9 @@ JetFile: BabySteps.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + 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 4e56c3be8ab..2ebdf887013 100644 --- a/idea/testData/psi/BabySteps_ERR.txt +++ b/idea/testData/psi/BabySteps_ERR.txt @@ -25,8 +25,9 @@ JetFile: BabySteps_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('doo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('doo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -39,8 +40,9 @@ JetFile: BabySteps_ERR.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -55,8 +57,9 @@ JetFile: BabySteps_ERR.jet PsiElement(COMMA)(',') DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -66,8 +69,9 @@ JetFile: BabySteps_ERR.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/ByCaluses.txt b/idea/testData/psi/ByCaluses.txt index 4029b7a19fe..e10f59bf162 100644 --- a/idea/testData/psi/ByCaluses.txt +++ b/idea/testData/psi/ByCaluses.txt @@ -12,8 +12,9 @@ JetFile: ByCaluses.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -47,8 +48,9 @@ JetFile: ByCaluses.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -98,8 +100,9 @@ JetFile: ByCaluses.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -136,8 +139,9 @@ JetFile: ByCaluses.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -181,8 +185,9 @@ JetFile: ByCaluses.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -229,8 +234,9 @@ JetFile: ByCaluses.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -278,8 +284,9 @@ JetFile: ByCaluses.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/Constructors.txt b/idea/testData/psi/Constructors.txt index 7e6d5da6e59..dd3a6c9ee7f 100644 --- a/idea/testData/psi/Constructors.txt +++ b/idea/testData/psi/Constructors.txt @@ -41,14 +41,16 @@ JetFile: Constructors.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -66,8 +68,9 @@ JetFile: Constructors.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -95,14 +98,16 @@ JetFile: Constructors.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/ControlStructures.txt b/idea/testData/psi/ControlStructures.txt index 73f63572f42..332afae7ceb 100644 --- a/idea/testData/psi/ControlStructures.txt +++ b/idea/testData/psi/ControlStructures.txt @@ -15,8 +15,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -27,8 +28,9 @@ JetFile: ControlStructures.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -37,8 +39,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -55,8 +58,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -70,8 +74,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -87,8 +92,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -102,8 +108,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -119,8 +126,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -150,8 +158,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -277,8 +286,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -305,8 +315,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -325,8 +336,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -345,8 +357,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -373,8 +386,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -393,8 +407,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -476,8 +491,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') PsiElement(in)('in') PsiWhiteSpace(' ') @@ -500,8 +516,9 @@ JetFile: ControlStructures.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') PsiElement(in)('in') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/EOLsOnRollback.txt b/idea/testData/psi/EOLsOnRollback.txt index b2f04cc1a40..bbd1c270ff7 100644 --- a/idea/testData/psi/EOLsOnRollback.txt +++ b/idea/testData/psi/EOLsOnRollback.txt @@ -40,8 +40,9 @@ JetFile: EOLsOnRollback.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('boo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('boo') PsiWhiteSpace('\n\n ') TYPEDEF PsiElement(type)('type') @@ -53,8 +54,9 @@ JetFile: EOLsOnRollback.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiWhiteSpace('\n ') PROPERTY PsiElement(var)('var') @@ -67,8 +69,9 @@ JetFile: EOLsOnRollback.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(var)('var') @@ -89,8 +92,9 @@ JetFile: EOLsOnRollback.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(val)('val') diff --git a/idea/testData/psi/Enums.txt b/idea/testData/psi/Enums.txt index 4abfcbd839f..e3147906f5a 100644 --- a/idea/testData/psi/Enums.txt +++ b/idea/testData/psi/Enums.txt @@ -19,8 +19,9 @@ JetFile: Enums.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY @@ -36,8 +37,9 @@ JetFile: Enums.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Color') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Color') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -55,8 +57,9 @@ JetFile: Enums.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Color') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Color') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -74,8 +77,9 @@ JetFile: Enums.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Color') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Color') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -110,8 +114,9 @@ JetFile: Enums.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY @@ -127,14 +132,16 @@ JetFile: Enums.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Nothing') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Nothing') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -159,8 +166,9 @@ JetFile: Enums.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -171,14 +179,16 @@ JetFile: Enums.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -186,14 +196,16 @@ JetFile: Enums.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiComment(BLOCK_COMMENT)('/*tail.size + 1*/') @@ -210,8 +222,9 @@ JetFile: Enums.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bool') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bool') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') diff --git a/idea/testData/psi/Extensions.txt b/idea/testData/psi/Extensions.txt index 9fee5fca85c..a989658c929 100644 --- a/idea/testData/psi/Extensions.txt +++ b/idea/testData/psi/Extensions.txt @@ -8,8 +8,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') EXTENSION PsiElement(extension)('extension') @@ -21,8 +22,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') EXTENSION PsiElement(extension)('extension') @@ -36,8 +38,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') EXTENSION PsiElement(extension)('extension') @@ -52,8 +55,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') EXTENSION PsiElement(extension)('extension') @@ -90,8 +94,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') EXTENSION @@ -104,8 +109,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') EXTENSION @@ -120,8 +126,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') EXTENSION @@ -137,8 +144,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') EXTENSION @@ -177,8 +185,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -194,8 +203,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -213,8 +223,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -233,8 +244,9 @@ JetFile: Extensions.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/Extensions_ERR.txt b/idea/testData/psi/Extensions_ERR.txt index 002572ab465..a869d05d8a9 100644 --- a/idea/testData/psi/Extensions_ERR.txt +++ b/idea/testData/psi/Extensions_ERR.txt @@ -20,8 +20,9 @@ JetFile: Extensions_ERR.jet PsiErrorElement:Expecting 'for' to specify the type that is being extended TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') EXTENSION PsiElement(extension)('extension') @@ -36,8 +37,9 @@ JetFile: Extensions_ERR.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') EXTENSION PsiElement(extension)('extension') diff --git a/idea/testData/psi/FunctionCalls.txt b/idea/testData/psi/FunctionCalls.txt index 5dda3c00088..44bada3b83f 100644 --- a/idea/testData/psi/FunctionCalls.txt +++ b/idea/testData/psi/FunctionCalls.txt @@ -29,8 +29,9 @@ JetFile: FunctionCalls.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -45,8 +46,9 @@ JetFile: FunctionCalls.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(GT)('>') PsiWhiteSpace('\n ') PARENTHESIZED @@ -133,8 +135,9 @@ JetFile: FunctionCalls.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -158,8 +161,9 @@ JetFile: FunctionCalls.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -189,13 +193,15 @@ JetFile: FunctionCalls.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') @@ -211,13 +217,15 @@ JetFile: FunctionCalls.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/FunctionLiterals.txt b/idea/testData/psi/FunctionLiterals.txt index cded334ddf5..d94c3036e8c 100644 --- a/idea/testData/psi/FunctionLiterals.txt +++ b/idea/testData/psi/FunctionLiterals.txt @@ -63,8 +63,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') @@ -84,15 +85,17 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -112,8 +115,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -151,8 +155,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -161,8 +166,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') @@ -182,8 +188,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -193,8 +200,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -217,15 +225,17 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -269,8 +279,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -288,8 +299,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -301,8 +313,9 @@ JetFile: FunctionLiterals.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -320,8 +333,9 @@ JetFile: FunctionLiterals.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -331,8 +345,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') @@ -345,8 +360,9 @@ JetFile: FunctionLiterals.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -356,15 +372,17 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -376,8 +394,9 @@ JetFile: FunctionLiterals.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -388,8 +407,9 @@ JetFile: FunctionLiterals.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/FunctionLiterals_ERR.txt b/idea/testData/psi/FunctionLiterals_ERR.txt index f9396b5a7ff..6391bd38873 100644 --- a/idea/testData/psi/FunctionLiterals_ERR.txt +++ b/idea/testData/psi/FunctionLiterals_ERR.txt @@ -89,8 +89,9 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -115,8 +116,9 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -153,8 +155,9 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PsiErrorElement:Expecting a parameter declaration @@ -166,8 +169,9 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') @@ -187,8 +191,9 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PsiErrorElement:Expecting a parameter declaration @@ -206,8 +211,9 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -219,8 +225,9 @@ JetFile: FunctionLiterals_ERR.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiErrorElement:Expecting '(' PsiElement(IDENTIFIER)('t') @@ -240,8 +247,9 @@ JetFile: FunctionLiterals_ERR.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiErrorElement:Expecting '(' PsiElement(IDENTIFIER)('t') @@ -255,8 +263,9 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') @@ -286,8 +295,9 @@ JetFile: FunctionLiterals_ERR.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiErrorElement:To specify a receiver type, use the full notation: {ReceiverType.(parameters) [: ReturnType] => ...} PsiElement(IDENTIFIER)('a') diff --git a/idea/testData/psi/FunctionTypes.txt b/idea/testData/psi/FunctionTypes.txt index eed105453f9..946daa81f22 100644 --- a/idea/testData/psi/FunctionTypes.txt +++ b/idea/testData/psi/FunctionTypes.txt @@ -19,20 +19,23 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -50,15 +53,17 @@ JetFile: FunctionTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -84,12 +89,14 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -140,19 +147,22 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -175,15 +185,17 @@ JetFile: FunctionTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -205,8 +217,9 @@ JetFile: FunctionTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -257,17 +270,20 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -276,15 +292,17 @@ JetFile: FunctionTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -302,8 +320,9 @@ JetFile: FunctionTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -312,15 +331,17 @@ JetFile: FunctionTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -338,8 +359,9 @@ JetFile: FunctionTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -353,23 +375,26 @@ JetFile: FunctionTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -387,8 +412,9 @@ JetFile: FunctionTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -402,15 +428,17 @@ JetFile: FunctionTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -450,8 +478,9 @@ JetFile: FunctionTypes.jet PsiElement(lazy)('lazy') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -471,15 +500,17 @@ JetFile: FunctionTypes.jet PsiElement(ref)('ref') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -514,39 +545,9 @@ JetFile: FunctionTypes.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -573,28 +574,12 @@ JetFile: FunctionTypes.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -621,167 +606,226 @@ JetFile: FunctionTypes.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('S') - PsiElement(RPAR)(')') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - REFERENCE_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - REFERENCE_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE + PsiElement(GT)('>') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + PsiElement(GT)('>') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('S') + PsiElement(RPAR)(')') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -826,8 +870,9 @@ JetFile: FunctionTypes.jet TUPLE_TYPE PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('S') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('S') PsiElement(RPAR)(')') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -868,110 +913,119 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - REFERENCE_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - REFERENCE_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -999,8 +1053,9 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') FUNCTION_TYPE @@ -1010,8 +1065,9 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') FUNCTION_TYPE @@ -1020,130 +1076,72 @@ JetFile: FunctionTypes.jet TUPLE_TYPE PsiElement(LPAR)('(') TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('S') + PsiElement(RPAR)(')') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('S') - PsiElement(RPAR)(')') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiElement(DOT)('.') - VALUE_PARAMETER_LIST - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiWhiteSpace(' ') - PsiElement(COLON)(':') - PsiWhiteSpace(' ') - TYPE_REFERENCE - TUPLE_TYPE - PsiElement(LPAR)('(') - PsiElement(RPAR)(')') - PsiElement(RBRACE)('}') - PsiWhiteSpace('\n') - TYPEDEF - PsiElement(type)('type') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(EQ)('=') - PsiWhiteSpace(' ') - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -1183,46 +1181,32 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE - ATTRIBUTE_ANNOTATION - PsiElement(LBRACKET)('[') - ATTRIBUTE - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(RBRACKET)(']') - PsiWhiteSpace(' ') - FUNCTION_TYPE - PsiElement(LBRACE)('{') - TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -1262,8 +1246,9 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') FUNCTION_TYPE @@ -1273,8 +1258,94 @@ JetFile: FunctionTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(GT)('>') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiElement(DOT)('.') + VALUE_PARAMETER_LIST + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiWhiteSpace(' ') + PsiElement(COLON)(':') + PsiWhiteSpace(' ') + TYPE_REFERENCE + TUPLE_TYPE + PsiElement(LPAR)('(') + PsiElement(RPAR)(')') + PsiElement(RBRACE)('}') + PsiWhiteSpace('\n') + TYPEDEF + PsiElement(type)('type') + PsiWhiteSpace(' ') + PsiElement(IDENTIFIER)('f') + PsiWhiteSpace(' ') + TYPE_PARAMETER_LIST + + PsiElement(EQ)('=') + PsiWhiteSpace(' ') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + FUNCTION_TYPE + PsiElement(LBRACE)('{') + TYPE_REFERENCE + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') FUNCTION_TYPE @@ -1283,8 +1354,9 @@ JetFile: FunctionTypes.jet TUPLE_TYPE PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('S') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('S') PsiElement(RPAR)(')') PsiElement(DOT)('.') VALUE_PARAMETER_LIST diff --git a/idea/testData/psi/FunctionTypes_ERR.txt b/idea/testData/psi/FunctionTypes_ERR.txt index a9c25fc4608..7837897e8fb 100644 --- a/idea/testData/psi/FunctionTypes_ERR.txt +++ b/idea/testData/psi/FunctionTypes_ERR.txt @@ -19,20 +19,23 @@ JetFile: FunctionTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiErrorElement:Expecting ':' followed by a return type PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') TYPEDEF @@ -50,8 +53,9 @@ JetFile: FunctionTypes_ERR.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiErrorElement:Expecting a parameter declaration @@ -61,6 +65,7 @@ JetFile: FunctionTypes_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/Functions.txt b/idea/testData/psi/Functions.txt index 3667583de48..86c067e38a0 100644 --- a/idea/testData/psi/Functions.txt +++ b/idea/testData/psi/Functions.txt @@ -17,8 +17,9 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') @@ -36,12 +37,14 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -61,30 +64,35 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -110,12 +118,14 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -128,15 +138,17 @@ JetFile: Functions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') FUN PsiElement(fun)('fun') @@ -146,15 +158,17 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -170,15 +184,17 @@ JetFile: Functions.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiElement(GT)('>') VALUE_PARAMETER_LIST @@ -189,15 +205,17 @@ JetFile: Functions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') @@ -217,8 +235,9 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') @@ -237,12 +256,14 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -263,30 +284,35 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -313,12 +339,14 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -331,15 +359,17 @@ JetFile: Functions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') FUN @@ -350,15 +380,17 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -374,15 +406,17 @@ JetFile: Functions.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiElement(GT)('>') VALUE_PARAMETER_LIST @@ -393,15 +427,17 @@ JetFile: Functions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n') FUN @@ -425,8 +461,9 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') @@ -448,12 +485,14 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -477,30 +516,35 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -530,12 +574,14 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -548,15 +594,17 @@ JetFile: Functions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -570,15 +618,17 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -594,15 +644,17 @@ JetFile: Functions.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiElement(GT)('>') VALUE_PARAMETER_LIST @@ -613,15 +665,17 @@ JetFile: Functions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -635,8 +689,9 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') FUNCTION_TYPE @@ -646,30 +701,35 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -699,15 +759,17 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -722,8 +784,9 @@ JetFile: Functions.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') FUNCTION_TYPE @@ -731,15 +794,17 @@ JetFile: Functions.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiElement(GT)('>') VALUE_PARAMETER_LIST @@ -750,15 +815,17 @@ JetFile: Functions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/Functions_ERR.txt b/idea/testData/psi/Functions_ERR.txt index 2169cb66643..632a7d4518b 100644 --- a/idea/testData/psi/Functions_ERR.txt +++ b/idea/testData/psi/Functions_ERR.txt @@ -18,8 +18,9 @@ JetFile: Functions_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') @@ -44,12 +45,14 @@ JetFile: Functions_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -69,8 +72,9 @@ JetFile: Functions_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') FUN PsiElement(fun)('fun') @@ -80,15 +84,17 @@ JetFile: Functions_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -104,15 +110,17 @@ JetFile: Functions_ERR.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiErrorElement:Expecting '} PsiElement(GT)('>') @@ -124,15 +132,17 @@ JetFile: Functions_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') FUN PsiElement(fun)('fun') @@ -142,15 +152,17 @@ JetFile: Functions_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -166,15 +178,17 @@ JetFile: Functions_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') FUN PsiElement(fun)('fun') @@ -184,15 +198,17 @@ JetFile: Functions_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -215,15 +231,17 @@ JetFile: Functions_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') FUN PsiElement(fun)('fun') @@ -233,15 +251,17 @@ JetFile: Functions_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -267,15 +287,17 @@ JetFile: Functions_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') FUN PsiElement(fun)('fun') @@ -285,15 +307,17 @@ JetFile: Functions_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -316,8 +340,9 @@ JetFile: Functions_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PsiErrorElement:Expecting a parameter declaration @@ -328,15 +353,17 @@ JetFile: Functions_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') @@ -370,30 +397,35 @@ JetFile: Functions_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') diff --git a/idea/testData/psi/LocalDeclarations.txt b/idea/testData/psi/LocalDeclarations.txt index 720bc837dc5..dcd6e9244bf 100644 --- a/idea/testData/psi/LocalDeclarations.txt +++ b/idea/testData/psi/LocalDeclarations.txt @@ -25,8 +25,9 @@ JetFile: LocalDeclarations.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(abstract)('abstract') @@ -49,8 +50,9 @@ JetFile: LocalDeclarations.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(class)('class') @@ -82,8 +84,9 @@ JetFile: LocalDeclarations.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(var)('var') @@ -108,8 +111,9 @@ JetFile: LocalDeclarations.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -136,8 +140,9 @@ JetFile: LocalDeclarations.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/NamespaceModifiers.txt b/idea/testData/psi/NamespaceModifiers.txt index 69715333ccc..b2ed1775490 100644 --- a/idea/testData/psi/NamespaceModifiers.txt +++ b/idea/testData/psi/NamespaceModifiers.txt @@ -7,8 +7,9 @@ JetFile: NamespaceModifiers.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(namespace)('namespace') @@ -23,8 +24,9 @@ JetFile: NamespaceModifiers.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(namespace)('namespace') diff --git a/idea/testData/psi/Precedence.txt b/idea/testData/psi/Precedence.txt index ef51848ee3a..51d5114548a 100644 --- a/idea/testData/psi/Precedence.txt +++ b/idea/testData/psi/Precedence.txt @@ -59,18 +59,21 @@ JetFile: Precedence.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -192,13 +195,15 @@ JetFile: Precedence.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -526,8 +531,9 @@ JetFile: Precedence.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(LT)('<') @@ -539,8 +545,9 @@ JetFile: Precedence.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION diff --git a/idea/testData/psi/Properties.txt b/idea/testData/psi/Properties.txt index f46f33fcfb2..3928dc21bf9 100644 --- a/idea/testData/psi/Properties.txt +++ b/idea/testData/psi/Properties.txt @@ -30,8 +30,9 @@ JetFile: Properties.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') @@ -40,8 +41,9 @@ JetFile: Properties.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n') @@ -72,11 +74,12 @@ JetFile: Properties.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -100,8 +103,9 @@ JetFile: Properties.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n') PROPERTY PsiElement(val)('val') @@ -110,8 +114,9 @@ JetFile: Properties.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') @@ -125,8 +130,9 @@ JetFile: Properties.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n ') @@ -158,11 +164,12 @@ JetFile: Properties.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -210,11 +217,12 @@ JetFile: Properties.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -243,8 +251,9 @@ JetFile: Properties.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -268,11 +277,12 @@ JetFile: Properties.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -291,8 +301,9 @@ JetFile: Properties.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -305,8 +316,9 @@ JetFile: Properties.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(public)('public') @@ -331,8 +343,9 @@ JetFile: Properties.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -346,11 +359,12 @@ JetFile: Properties.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -369,8 +383,9 @@ JetFile: Properties.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -389,8 +404,9 @@ JetFile: Properties.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -404,11 +420,12 @@ JetFile: Properties.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -427,8 +444,9 @@ JetFile: Properties.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -441,8 +459,9 @@ JetFile: Properties.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(public)('public') @@ -489,8 +508,9 @@ JetFile: Properties.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n ') @@ -510,8 +530,9 @@ JetFile: Properties.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n ') @@ -583,8 +604,9 @@ JetFile: Properties.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') @@ -609,8 +631,9 @@ JetFile: Properties.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') @@ -684,8 +707,9 @@ JetFile: Properties.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -699,22 +723,25 @@ JetFile: Properties.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('lastIndex') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') diff --git a/idea/testData/psi/Properties_ERR.txt b/idea/testData/psi/Properties_ERR.txt index 04d75fcc589..04a063074d4 100644 --- a/idea/testData/psi/Properties_ERR.txt +++ b/idea/testData/psi/Properties_ERR.txt @@ -48,8 +48,9 @@ JetFile: Properties_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiErrorElement:Expecting ']' to close an attribute annotation PsiWhiteSpace(' ') @@ -64,8 +65,9 @@ JetFile: Properties_ERR.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiErrorElement:Expecting namespace or top level declaration @@ -78,8 +80,9 @@ JetFile: Properties_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') @@ -98,8 +101,9 @@ JetFile: Properties_ERR.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n ') @@ -134,11 +138,12 @@ JetFile: Properties_ERR.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -188,11 +193,12 @@ JetFile: Properties_ERR.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -252,8 +258,9 @@ JetFile: Properties_ERR.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('f') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('d') PsiErrorElement:Expecting namespace or top level declaration diff --git a/idea/testData/psi/QuotedIdentifiers.txt b/idea/testData/psi/QuotedIdentifiers.txt index 53c7c6b4af6..c60f759af6f 100644 --- a/idea/testData/psi/QuotedIdentifiers.txt +++ b/idea/testData/psi/QuotedIdentifiers.txt @@ -6,8 +6,9 @@ JetFile: QuotedIdentifiers.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('`return`') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('`return`') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') diff --git a/idea/testData/psi/RootNamespace.txt b/idea/testData/psi/RootNamespace.txt index 945cbcaccef..126a228aac2 100644 --- a/idea/testData/psi/RootNamespace.txt +++ b/idea/testData/psi/RootNamespace.txt @@ -58,16 +58,17 @@ JetFile: RootNamespace.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(namespace)('namespace') + REFERENCE_EXPRESSION + PsiElement(namespace)('namespace') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foo') + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('X') + PsiElement(IDENTIFIER)('X') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/SimpleClassMembers.txt b/idea/testData/psi/SimpleClassMembers.txt index 85d6f724b57..ebf57dfd92e 100644 --- a/idea/testData/psi/SimpleClassMembers.txt +++ b/idea/testData/psi/SimpleClassMembers.txt @@ -20,8 +20,9 @@ JetFile: SimpleClassMembers.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -36,8 +37,9 @@ JetFile: SimpleClassMembers.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -85,8 +87,9 @@ JetFile: SimpleClassMembers.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') @@ -119,14 +122,16 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -156,8 +161,9 @@ JetFile: SimpleClassMembers.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -199,8 +205,9 @@ JetFile: SimpleClassMembers.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Fooo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Fooo') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -219,14 +226,16 @@ JetFile: SimpleClassMembers.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Fooo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Fooo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -250,14 +259,16 @@ JetFile: SimpleClassMembers.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Fooo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Fooo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -267,8 +278,9 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Goo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Goo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -316,8 +328,9 @@ JetFile: SimpleClassMembers.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') @@ -350,14 +363,16 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -397,8 +412,9 @@ JetFile: SimpleClassMembers.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') @@ -431,14 +447,16 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -477,14 +495,16 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -534,8 +554,9 @@ JetFile: SimpleClassMembers.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Fooo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Fooo') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -554,14 +575,16 @@ JetFile: SimpleClassMembers.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Fooo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Fooo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -585,14 +608,16 @@ JetFile: SimpleClassMembers.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Fooo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Fooo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -602,8 +627,9 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Goo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Goo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/SimpleClassMembers_ERR.txt b/idea/testData/psi/SimpleClassMembers_ERR.txt index 7552c7cb9a9..8c394a813bb 100644 --- a/idea/testData/psi/SimpleClassMembers_ERR.txt +++ b/idea/testData/psi/SimpleClassMembers_ERR.txt @@ -20,8 +20,9 @@ JetFile: SimpleClassMembers_ERR.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -111,15 +112,17 @@ JetFile: SimpleClassMembers_ERR.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiErrorElement:Expecting a '>' - + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiErrorElement:Expecting a '>' + VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -158,14 +161,16 @@ JetFile: SimpleClassMembers_ERR.jet PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 1183854d261..1b991f21efa 100644 --- a/idea/testData/psi/SimpleExpressions.txt +++ b/idea/testData/psi/SimpleExpressions.txt @@ -15,8 +15,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -31,8 +32,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -46,8 +48,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -61,8 +64,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -76,8 +80,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -91,8 +96,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -106,8 +112,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -121,8 +128,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -136,8 +144,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -151,8 +160,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -166,8 +176,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -181,8 +192,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -196,8 +208,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -211,8 +224,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -226,8 +240,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -241,8 +256,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -250,8 +266,9 @@ JetFile: SimpleExpressions.jet PsiElement(this)('this') PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('sdf') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sdf') PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -261,8 +278,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -279,8 +297,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -305,8 +324,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -324,8 +344,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -333,8 +354,9 @@ JetFile: SimpleExpressions.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -349,8 +371,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -358,14 +381,16 @@ JetFile: SimpleExpressions.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -380,8 +405,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -389,8 +415,9 @@ JetFile: SimpleExpressions.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -399,8 +426,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -408,14 +436,16 @@ JetFile: SimpleExpressions.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -424,8 +454,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -435,8 +466,9 @@ JetFile: SimpleExpressions.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') CLASS_BODY PsiElement(LBRACE)('{') PsiElement(RBRACE)('}') @@ -448,8 +480,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -460,8 +493,9 @@ JetFile: SimpleExpressions.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -470,8 +504,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -488,8 +523,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -503,8 +539,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -520,8 +557,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -535,8 +573,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -552,8 +591,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -567,8 +607,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -582,8 +623,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -597,8 +639,9 @@ JetFile: SimpleExpressions.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/SoftKeywords.txt b/idea/testData/psi/SoftKeywords.txt index ddfea74d73f..2b94d257a6c 100644 --- a/idea/testData/psi/SoftKeywords.txt +++ b/idea/testData/psi/SoftKeywords.txt @@ -74,8 +74,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_PARAMETER @@ -135,8 +136,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -144,8 +146,9 @@ JetFile: SoftKeywords.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -298,8 +301,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('s') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -329,8 +333,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('abstract') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('abstract') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -346,8 +351,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('virtual') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('virtual') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -363,8 +369,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('enum') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('enum') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -380,8 +387,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('open') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('open') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -397,8 +405,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('attribute') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('attribute') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -414,8 +423,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('override') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('override') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -431,8 +441,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('virtual') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('virtual') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -448,8 +459,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('abstract') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('abstract') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -465,8 +477,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('private') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('private') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -482,8 +495,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('protected') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('protected') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -499,8 +513,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('public') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('public') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -516,8 +531,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('internal') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('internal') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -533,8 +549,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('lazy') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lazy') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -550,8 +567,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('wraps') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('wraps') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -567,8 +585,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('import') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('import') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -584,8 +603,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('where') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('where') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -601,8 +621,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('by') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('by') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -618,8 +639,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('get') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('get') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -635,8 +657,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('set') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('set') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -652,8 +675,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('public') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('public') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -669,8 +693,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('private') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('private') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -686,8 +711,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('protected') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('protected') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -703,8 +729,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('internal') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('internal') PsiWhiteSpace('\n\n ') FUN PsiElement(fun)('fun') @@ -721,8 +748,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -731,8 +759,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -741,8 +770,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -751,8 +781,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -761,8 +792,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -771,8 +803,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -781,8 +814,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -791,8 +825,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -801,8 +836,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -811,8 +847,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -821,8 +858,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -831,8 +869,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -841,8 +880,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -851,8 +891,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -861,8 +902,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -871,8 +913,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -881,8 +924,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -891,8 +935,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -901,8 +946,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -911,8 +957,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -921,8 +968,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -931,8 +979,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -941,8 +990,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -986,8 +1036,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiWhiteSpace('\n\n ') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') @@ -1009,8 +1060,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1019,8 +1071,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1029,8 +1082,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1039,8 +1093,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1049,8 +1104,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1059,8 +1115,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1069,8 +1126,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1079,8 +1137,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1089,8 +1148,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1099,8 +1159,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1109,8 +1170,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1119,8 +1181,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1129,8 +1192,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1139,8 +1203,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1149,8 +1214,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1159,8 +1225,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1169,8 +1236,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1179,8 +1247,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1189,8 +1258,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1199,8 +1269,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1209,8 +1280,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1219,8 +1291,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1229,8 +1302,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1239,8 +1313,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('t') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -1284,8 +1359,9 @@ JetFile: SoftKeywords.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') PsiElement(RPAR)(')') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/ThisType.txt b/idea/testData/psi/ThisType.txt index 1580e10d402..6e6c09747d2 100644 --- a/idea/testData/psi/ThisType.txt +++ b/idea/testData/psi/ThisType.txt @@ -12,14 +12,15 @@ JetFile: ThisType.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiElement(GT)('>') PRIMARY_CONSTRUCTOR_PARAMETERS_LIST PsiElement(LPAR)('(') @@ -39,14 +40,15 @@ JetFile: ThisType.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -54,14 +56,15 @@ JetFile: ThisType.jet DELEGATION_SPECIFIER_LIST DELEGATOR_BY TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') @@ -72,14 +75,15 @@ JetFile: ThisType.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -128,14 +132,15 @@ JetFile: ThisType.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') + 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/TupleTypes.txt b/idea/testData/psi/TupleTypes.txt index fa779bf8618..d3d8b45a411 100644 --- a/idea/testData/psi/TupleTypes.txt +++ b/idea/testData/psi/TupleTypes.txt @@ -29,8 +29,9 @@ JetFile: TupleTypes.jet TUPLE_TYPE PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -43,13 +44,15 @@ JetFile: TupleTypes.jet TUPLE_TYPE PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -67,8 +70,9 @@ JetFile: TupleTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') LABELED_TUPLE_TYPE_ENTRY @@ -77,8 +81,9 @@ JetFile: TupleTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -92,8 +97,9 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -111,8 +117,9 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') TUPLE_TYPE PsiElement(LPAR)('(') @@ -121,12 +128,14 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -140,8 +149,9 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -151,12 +161,14 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE @@ -164,11 +176,13 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -182,8 +196,9 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -198,12 +213,14 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') LABELED_TUPLE_TYPE_ENTRY @@ -216,12 +233,14 @@ JetFile: TupleTypes.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RPAR)(')') \ No newline at end of file diff --git a/idea/testData/psi/TupleTypes_ERR.txt b/idea/testData/psi/TupleTypes_ERR.txt index 51e85e39481..45f46071744 100644 --- a/idea/testData/psi/TupleTypes_ERR.txt +++ b/idea/testData/psi/TupleTypes_ERR.txt @@ -29,8 +29,9 @@ JetFile: TupleTypes_ERR.jet TUPLE_TYPE PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -43,8 +44,9 @@ JetFile: TupleTypes_ERR.jet TUPLE_TYPE PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(COMMA)(',') PsiErrorElement:Type expected @@ -74,8 +76,9 @@ JetFile: TupleTypes_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -89,8 +92,9 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -108,8 +112,9 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') TUPLE_TYPE PsiElement(LPAR)('(') @@ -118,13 +123,15 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiErrorElement:Expecting ']' to close an attribute annotation PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -138,8 +145,9 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -149,12 +157,14 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE @@ -162,11 +172,13 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -180,8 +192,9 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') TUPLE_TYPE @@ -196,12 +209,14 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') LABELED_TUPLE_TYPE_ENTRY @@ -214,12 +229,14 @@ JetFile: TupleTypes_ERR.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RPAR)(')') \ No newline at end of file diff --git a/idea/testData/psi/TypeAnnotations.txt b/idea/testData/psi/TypeAnnotations.txt index f20a0ec0113..8eb3baf47f9 100644 --- a/idea/testData/psi/TypeAnnotations.txt +++ b/idea/testData/psi/TypeAnnotations.txt @@ -18,20 +18,23 @@ JetFile: TypeAnnotations.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('B') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') TYPEDEF @@ -48,37 +51,43 @@ JetFile: TypeAnnotations.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') ATTRIBUTE_ANNOTATION PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('x') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('F') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + MODIFIER_LIST + ATTRIBUTE_ANNOTATION + PsiElement(LBRACKET)('[') + ATTRIBUTE + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') + PsiElement(RBRACKET)(']') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') \ No newline at end of file diff --git a/idea/testData/psi/TypeConstraints.txt b/idea/testData/psi/TypeConstraints.txt index 7e3e6953863..af1e22f32be 100644 --- a/idea/testData/psi/TypeConstraints.txt +++ b/idea/testData/psi/TypeConstraints.txt @@ -15,14 +15,16 @@ JetFile: TypeConstraints.jet TYPE_CONSTRAINT_LIST TYPE_CONSTRAINT TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_CONSTRAINT @@ -31,14 +33,16 @@ JetFile: TypeConstraints.jet PsiElement(object)('object') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/TypeDef.txt b/idea/testData/psi/TypeDef.txt index c1dcd6036f1..9fc34848eab 100644 --- a/idea/testData/psi/TypeDef.txt +++ b/idea/testData/psi/TypeDef.txt @@ -19,8 +19,9 @@ JetFile: TypeDef.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF PsiElement(type)('type') @@ -35,8 +36,9 @@ JetFile: TypeDef.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF PsiElement(type)('type') @@ -50,15 +52,17 @@ JetFile: TypeDef.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF PsiElement(type)('type') @@ -77,8 +81,9 @@ JetFile: TypeDef.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF PsiElement(type)('type') @@ -96,15 +101,17 @@ JetFile: TypeDef.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n') TYPEDEF PsiElement(type)('type') @@ -116,8 +123,9 @@ JetFile: TypeDef.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') @@ -134,8 +142,9 @@ JetFile: TypeDef.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n') @@ -151,15 +160,17 @@ JetFile: TypeDef.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') @@ -180,8 +191,9 @@ JetFile: TypeDef.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') @@ -201,14 +213,16 @@ JetFile: TypeDef.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace(' ') PsiElement(SEMICOLON)(';') \ No newline at end of file diff --git a/idea/testData/psi/TypeDef_ERR.txt b/idea/testData/psi/TypeDef_ERR.txt index 161d6e1344a..e005e0664bb 100644 --- a/idea/testData/psi/TypeDef_ERR.txt +++ b/idea/testData/psi/TypeDef_ERR.txt @@ -84,8 +84,9 @@ JetFile: TypeDef_ERR.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n') TYPEDEF PsiElement(type)('type') @@ -109,8 +110,9 @@ JetFile: TypeDef_ERR.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n') @@ -141,8 +143,9 @@ JetFile: TypeDef_ERR.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF PsiElement(type)('type') @@ -161,8 +164,9 @@ JetFile: TypeDef_ERR.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') TYPEDEF PsiElement(type)('type') @@ -187,8 +191,9 @@ JetFile: TypeDef_ERR.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n') CLASS PsiElement(class)('class') @@ -207,5 +212,6 @@ JetFile: TypeDef_ERR.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') \ No newline at end of file + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') \ No newline at end of file diff --git a/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt b/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt index 348e62e8262..ae071e56680 100644 --- a/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt +++ b/idea/testData/psi/TypeExpressionAmbiguities_ERR.txt @@ -25,18 +25,21 @@ JetFile: TypeExpressionAmbiguities_ERR.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -138,8 +141,9 @@ JetFile: TypeExpressionAmbiguities_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT @@ -161,17 +165,19 @@ JetFile: TypeExpressionAmbiguities_ERR.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('b') - PsiWhiteSpace(' ') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('c') - PsiErrorElement:Expecting a '>' - + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') + PsiErrorElement:Expecting a '>' + PsiWhiteSpace('\n ') BINARY_WITH_TYPE REFERENCE_EXPRESSION @@ -180,17 +186,19 @@ JetFile: TypeExpressionAmbiguities_ERR.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Foo') - PsiWhiteSpace(' ') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Foo') PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') - PsiErrorElement:Expecting a '>' - + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') + PsiErrorElement:Expecting a '>' + PsiWhiteSpace('\n ') BINARY_WITH_PATTERN REFERENCE_EXPRESSION @@ -206,8 +214,9 @@ JetFile: TypeExpressionAmbiguities_ERR.jet PsiElement(LT)('<') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiErrorElement:Expecting a '>' PsiWhiteSpace('\n') diff --git a/idea/testData/psi/TypeParametersBeforeName.txt b/idea/testData/psi/TypeParametersBeforeName.txt index 49dfc5482c1..ed5b7113dca 100644 --- a/idea/testData/psi/TypeParametersBeforeName.txt +++ b/idea/testData/psi/TypeParametersBeforeName.txt @@ -37,8 +37,9 @@ JetFile: TypeParametersBeforeName.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('foo') @@ -66,12 +67,14 @@ JetFile: TypeParametersBeforeName.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') TYPE_PARAMETER_LIST @@ -98,8 +101,9 @@ JetFile: TypeParametersBeforeName.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') FUNCTION_TYPE @@ -111,8 +115,9 @@ JetFile: TypeParametersBeforeName.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Unit') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Unit') PsiElement(RBRACE)('}') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') @@ -132,14 +137,16 @@ JetFile: TypeParametersBeforeName.jet PsiElement(GT)('>') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n') @@ -153,13 +160,15 @@ JetFile: TypeParametersBeforeName.jet PsiElement(GT)('>') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('A') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('A') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') \ No newline at end of file diff --git a/idea/testData/psi/When.txt b/idea/testData/psi/When.txt index f69eedae816..1980f9ae524 100644 --- a/idea/testData/psi/When.txt +++ b/idea/testData/psi/When.txt @@ -747,15 +747,17 @@ JetFile: When.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('foo') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Bar') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Bar') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') @@ -874,8 +876,9 @@ JetFile: When.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('a') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/examples/AnonymousObjects.txt b/idea/testData/psi/examples/AnonymousObjects.txt index b94a8775a6b..15506021022 100644 --- a/idea/testData/psi/examples/AnonymousObjects.txt +++ b/idea/testData/psi/examples/AnonymousObjects.txt @@ -25,8 +25,9 @@ JetFile: AnonymousObjects.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('MouseAdapter') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('MouseAdapter') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -65,8 +66,9 @@ JetFile: AnonymousObjects.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('MouseEvent') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('MouseEvent') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -172,8 +174,9 @@ JetFile: AnonymousObjects.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('GodMEssage') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('GodMEssage') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -185,8 +188,9 @@ JetFile: AnonymousObjects.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('RuntimeException') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('RuntimeException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/examples/BinaryTree.txt b/idea/testData/psi/examples/BinaryTree.txt index a75478e5e91..d95a6d6b543 100644 --- a/idea/testData/psi/examples/BinaryTree.txt +++ b/idea/testData/psi/examples/BinaryTree.txt @@ -15,14 +15,16 @@ JetFile: BinaryTree.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableSet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableSet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -47,8 +49,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -59,8 +62,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiWhiteSpace('\n ') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -75,8 +79,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiWhiteSpace('\n ') PROPERTY PsiElement(var)('var') @@ -86,8 +91,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiWhiteSpace('\n\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -102,14 +108,16 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('MatchableComparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('MatchableComparison') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n ') PROPERTY MODIFIER_LIST @@ -122,8 +130,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiWhiteSpace('\n ') PROPERTY MODIFIER_LIST @@ -150,14 +159,16 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparison') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -205,8 +216,9 @@ JetFile: BinaryTree.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -226,15 +238,17 @@ JetFile: BinaryTree.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('operator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('operator') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('compareTo') TYPE_PARAMETER_LIST @@ -247,15 +261,17 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -291,15 +307,17 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -336,8 +354,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -346,15 +365,17 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -491,15 +512,17 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -577,8 +600,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -587,15 +611,17 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -761,15 +787,17 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -1053,15 +1081,17 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -1150,15 +1180,17 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -1286,8 +1318,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -1510,8 +1543,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -1520,8 +1554,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -1694,8 +1729,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -1759,14 +1795,16 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -1793,14 +1831,16 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -1810,8 +1850,9 @@ JetFile: BinaryTree.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableIterator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterator') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -1847,8 +1888,9 @@ JetFile: BinaryTree.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -1867,8 +1909,9 @@ JetFile: BinaryTree.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -1882,8 +1925,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') @@ -1942,8 +1986,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -2018,8 +2063,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -2288,8 +2334,9 @@ JetFile: BinaryTree.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') diff --git a/idea/testData/psi/examples/BitArith.txt b/idea/testData/psi/examples/BitArith.txt index f1501f43c65..d7504f0fc6e 100644 --- a/idea/testData/psi/examples/BitArith.txt +++ b/idea/testData/psi/examples/BitArith.txt @@ -14,8 +14,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -43,8 +44,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -53,8 +55,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -89,8 +92,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -99,8 +103,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -142,8 +147,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -152,8 +158,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -194,8 +201,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -204,8 +212,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -248,8 +257,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('INumber') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('INumber') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -336,8 +346,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('INumber') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('INumber') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -381,8 +392,9 @@ JetFile: BitArith.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') @@ -398,8 +410,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('INumber') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('INumber') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -459,8 +472,9 @@ JetFile: BitArith.jet PsiElement(fun)('fun') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('matchMask') TYPE_PARAMETER_LIST @@ -473,8 +487,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -509,14 +524,15 @@ JetFile: BitArith.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IComparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - SELF_TYPE - PsiElement(This)('This') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IComparable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + SELF_TYPE + PsiElement(This)('This') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -529,8 +545,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n ') FUN MODIFIER_LIST @@ -538,8 +555,9 @@ JetFile: BitArith.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('operator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('operator') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -571,8 +589,9 @@ JetFile: BitArith.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('operator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('operator') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -588,8 +607,9 @@ JetFile: BitArith.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') diff --git a/idea/testData/psi/examples/Builder.txt b/idea/testData/psi/examples/Builder.txt index fcb03523ccf..4e91a145395 100644 --- a/idea/testData/psi/examples/Builder.txt +++ b/idea/testData/psi/examples/Builder.txt @@ -15,8 +15,9 @@ JetFile: Builder.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('AntBuilder') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('AntBuilder') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -79,8 +80,9 @@ JetFile: Builder.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('File') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('File') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -215,8 +217,9 @@ JetFile: Builder.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ClassPathEntry') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ClassPathEntry') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -235,8 +238,9 @@ JetFile: Builder.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ClassPathEntry') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ClassPathEntry') PsiComment(BLOCK_COMMENT)('/*...*/') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -255,8 +259,9 @@ JetFile: Builder.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('String') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('String') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -272,8 +277,9 @@ JetFile: Builder.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('String') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('String') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -297,8 +303,9 @@ JetFile: Builder.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ClassPathEntry') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ClassPathEntry') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -317,8 +324,9 @@ JetFile: Builder.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ClassPathEntry') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ClassPathEntry') PsiComment(BLOCK_COMMENT)('/*...*/') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -349,8 +357,9 @@ JetFile: Builder.jet PsiElement(LBRACE)('{') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Library') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Library') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -359,8 +368,9 @@ JetFile: Builder.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Library') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Library') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -378,8 +388,9 @@ JetFile: Builder.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Library') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Library') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/examples/Color.txt b/idea/testData/psi/examples/Color.txt index 23a51d15de1..dc9fe8234db 100644 --- a/idea/testData/psi/examples/Color.txt +++ b/idea/testData/psi/examples/Color.txt @@ -19,8 +19,9 @@ JetFile: Color.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -31,8 +32,9 @@ JetFile: Color.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -43,8 +45,9 @@ JetFile: Color.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY @@ -60,8 +63,9 @@ JetFile: Color.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Color') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Color') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -89,8 +93,9 @@ JetFile: Color.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Color') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Color') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -118,8 +123,9 @@ JetFile: Color.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Color') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Color') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/examples/FunctionsAndTypes.txt b/idea/testData/psi/examples/FunctionsAndTypes.txt index 4ee28b25ee4..c18937fb4f3 100644 --- a/idea/testData/psi/examples/FunctionsAndTypes.txt +++ b/idea/testData/psi/examples/FunctionsAndTypes.txt @@ -15,15 +15,17 @@ JetFile: FunctionsAndTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiComment(EOL_COMMENT)('// type f1 = {(T) => X}') @@ -43,20 +45,23 @@ JetFile: FunctionsAndTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiComment(EOL_COMMENT)('// type f2 = {(T, E) => X}') @@ -79,21 +84,24 @@ JetFile: FunctionsAndTypes.jet TUPLE_TYPE PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiComment(EOL_COMMENT)('//type f_tuple = {((T, E)) => X}') @@ -114,8 +122,9 @@ JetFile: FunctionsAndTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -126,15 +135,17 @@ JetFile: FunctionsAndTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Y') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Y') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') PsiElement(RBRACE)('}') @@ -162,15 +173,17 @@ JetFile: FunctionsAndTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Y') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Y') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -182,15 +195,17 @@ JetFile: FunctionsAndTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Y') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Y') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Z') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Z') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') PsiElement(RBRACE)('}') @@ -223,8 +238,9 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -233,15 +249,17 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiComment(EOL_COMMENT)('//type Comparison = {(a : T, b : T) => Int}') @@ -272,8 +290,9 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -282,15 +301,17 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiComment(EOL_COMMENT)('//type Equality = {(a : T, b : T) => Boolean}') @@ -321,15 +342,17 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiComment(EOL_COMMENT)('//type HashFunction = {(obj : T) => Int}') @@ -393,15 +416,17 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('R') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('R') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiComment(EOL_COMMENT)('//type Function1 = {(input : T) => R}') @@ -423,15 +448,17 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -461,15 +488,17 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -500,8 +529,9 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') @@ -536,8 +566,9 @@ JetFile: FunctionsAndTypes.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') @@ -613,15 +644,17 @@ JetFile: FunctionsAndTypes.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('X') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') PsiElement(EQ)('=') diff --git a/idea/testData/psi/examples/Graph.txt b/idea/testData/psi/examples/Graph.txt index c081e4d840d..1f5454bda20 100644 --- a/idea/testData/psi/examples/Graph.txt +++ b/idea/testData/psi/examples/Graph.txt @@ -19,8 +19,9 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') CLASS @@ -46,8 +47,9 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -58,8 +60,9 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -70,8 +73,9 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') CLASS @@ -105,25 +109,29 @@ JetFile: Graph.jet PsiElement(new)('new') PsiWhiteSpace(' ') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ArrayList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(GT)('>') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('Edge') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(GT)('>') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -146,20 +154,23 @@ JetFile: Graph.jet PsiElement(new)('new') PsiWhiteSpace(' ') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('HashSet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -172,25 +183,29 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(GT)('>') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('Edge') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -206,25 +221,29 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ISet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(GT)('>') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('Edge') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -246,8 +265,9 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -256,8 +276,9 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -266,8 +287,9 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -287,8 +309,9 @@ JetFile: Graph.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Edge') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Edge') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -325,8 +348,9 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -346,8 +370,9 @@ JetFile: Graph.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Edge') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Edge') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -384,14 +409,16 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -456,15 +483,17 @@ JetFile: Graph.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Unit') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Unit') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -482,20 +511,23 @@ JetFile: Graph.jet PsiElement(new)('new') PsiWhiteSpace(' ') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('HashSet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -545,14 +577,16 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Vertex') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -561,20 +595,23 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ISet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -588,15 +625,17 @@ JetFile: Graph.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Unit') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Unit') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -698,20 +737,23 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IPushPop') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -720,20 +762,23 @@ JetFile: Graph.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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 + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ISet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') - PsiElement(GT)('>') - PsiElement(GT)('>') + PsiElement(IDENTIFIER)('Vertex') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -747,15 +792,17 @@ JetFile: Graph.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Unit') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Unit') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/IPushPop.txt b/idea/testData/psi/examples/IPushPop.txt index 1032091dab5..0f161fcd6cf 100644 --- a/idea/testData/psi/examples/IPushPop.txt +++ b/idea/testData/psi/examples/IPushPop.txt @@ -24,8 +24,9 @@ JetFile: IPushPop.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -41,8 +42,9 @@ JetFile: IPushPop.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') FUN @@ -58,7 +60,8 @@ JetFile: IPushPop.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/PolymorphicClassObjects.txt b/idea/testData/psi/examples/PolymorphicClassObjects.txt index d59ac1b09e0..0212d08ad93 100644 --- a/idea/testData/psi/examples/PolymorphicClassObjects.txt +++ b/idea/testData/psi/examples/PolymorphicClassObjects.txt @@ -26,8 +26,9 @@ JetFile: PolymorphicClassObjects.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('operator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('operator') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -43,8 +44,9 @@ JetFile: PolymorphicClassObjects.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') FUN @@ -60,8 +62,9 @@ JetFile: PolymorphicClassObjects.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('R') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('R') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -98,19 +101,22 @@ JetFile: PolymorphicClassObjects.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Builder') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('R') + PsiElement(GT)('>') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -136,8 +142,9 @@ JetFile: PolymorphicClassObjects.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Buildable') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Buildable') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -165,19 +172,22 @@ JetFile: PolymorphicClassObjects.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Builder') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('R') + PsiElement(GT)('>') PsiWhiteSpace('\n\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -202,20 +212,23 @@ JetFile: PolymorphicClassObjects.jet TYPE_CONSTRAINT_LIST TYPE_CONSTRAINT TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Iterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Iterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') TYPE_CONSTRAINT @@ -224,31 +237,36 @@ JetFile: PolymorphicClassObjects.jet PsiElement(object)('object') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Buildable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -275,29 +293,33 @@ JetFile: PolymorphicClassObjects.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('E') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('E') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('R') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('R') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('R') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 ca62c982412..aa1ef5677e3 100644 --- a/idea/testData/psi/examples/Queue.txt +++ b/idea/testData/psi/examples/Queue.txt @@ -15,14 +15,16 @@ JetFile: Queue.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IPushPop') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -49,8 +51,9 @@ JetFile: Queue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -61,14 +64,16 @@ JetFile: Queue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') PROPERTY @@ -82,14 +87,16 @@ JetFile: Queue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -107,14 +114,16 @@ JetFile: Queue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -138,8 +147,9 @@ JetFile: Queue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -156,8 +166,9 @@ JetFile: Queue.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -276,8 +287,9 @@ JetFile: Queue.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('UnderflowException') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('UnderflowException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/examples/Stack.txt b/idea/testData/psi/examples/Stack.txt index f4154cba2e3..4d78d8833b5 100644 --- a/idea/testData/psi/examples/Stack.txt +++ b/idea/testData/psi/examples/Stack.txt @@ -15,14 +15,16 @@ JetFile: Stack.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IPushPop') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -41,14 +43,16 @@ JetFile: Stack.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ArrayList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ArrayList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -71,8 +75,9 @@ JetFile: Stack.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK diff --git a/idea/testData/psi/examples/UnionFind.txt b/idea/testData/psi/examples/UnionFind.txt index 4f25b41f6f3..b607bb62362 100644 --- a/idea/testData/psi/examples/UnionFind.txt +++ b/idea/testData/psi/examples/UnionFind.txt @@ -26,8 +26,9 @@ JetFile: UnionFind.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -46,8 +47,9 @@ JetFile: UnionFind.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -102,15 +104,17 @@ JetFile: UnionFind.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -211,8 +215,9 @@ JetFile: UnionFind.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -221,8 +226,9 @@ JetFile: UnionFind.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -359,16 +365,18 @@ JetFile: UnionFind.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('isOdd') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') diff --git a/idea/testData/psi/examples/UpdateOperation.txt b/idea/testData/psi/examples/UpdateOperation.txt index 84c333e8e06..d9bed0bfc64 100644 --- a/idea/testData/psi/examples/UpdateOperation.txt +++ b/idea/testData/psi/examples/UpdateOperation.txt @@ -14,8 +14,9 @@ JetFile: UpdateOperation.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -24,8 +25,9 @@ JetFile: UpdateOperation.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY @@ -54,8 +56,9 @@ JetFile: UpdateOperation.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Pair') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Pair') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -64,8 +67,9 @@ JetFile: UpdateOperation.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -83,8 +87,9 @@ JetFile: UpdateOperation.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -102,8 +107,9 @@ JetFile: UpdateOperation.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Pair') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Pair') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -133,8 +139,9 @@ JetFile: UpdateOperation.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Point') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Point') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/examples/With.txt b/idea/testData/psi/examples/With.txt index ec32a1317b3..6fb375d088a 100644 --- a/idea/testData/psi/examples/With.txt +++ b/idea/testData/psi/examples/With.txt @@ -6,8 +6,9 @@ JetFile: With.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('inline') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('inline') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -26,8 +27,9 @@ JetFile: With.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -39,8 +41,9 @@ JetFile: With.jet FUNCTION_TYPE PsiElement(LBRACE)('{') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -49,8 +52,9 @@ JetFile: With.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Unit') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Unit') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/array/MutableArray.txt b/idea/testData/psi/examples/array/MutableArray.txt index 241f3571a36..b51b13c4371 100644 --- a/idea/testData/psi/examples/array/MutableArray.txt +++ b/idea/testData/psi/examples/array/MutableArray.txt @@ -23,8 +23,9 @@ JetFile: MutableArray.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ISized') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ISized') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -35,8 +36,9 @@ JetFile: MutableArray.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('operator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('operator') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -52,15 +54,17 @@ JetFile: MutableArray.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -85,8 +89,9 @@ JetFile: MutableArray.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ISized') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ISized') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -99,8 +104,9 @@ JetFile: MutableArray.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('operator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('operator') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -116,8 +122,9 @@ JetFile: MutableArray.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -126,8 +133,9 @@ JetFile: MutableArray.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') @@ -147,26 +155,30 @@ JetFile: MutableArray.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ReadOnlyArray') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ReadOnlyArray') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('WriteOnlyArray') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 c362f5f0a6b..ccfca60c2ab 100644 --- a/idea/testData/psi/examples/collections/ArrayList.txt +++ b/idea/testData/psi/examples/collections/ArrayList.txt @@ -15,14 +15,16 @@ JetFile: ArrayList.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -89,14 +91,16 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -123,14 +127,16 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -140,8 +146,9 @@ JetFile: ArrayList.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableIterator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterator') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -216,8 +223,9 @@ JetFile: ArrayList.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ConcurrentModificationException') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ConcurrentModificationException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -264,8 +272,9 @@ JetFile: ArrayList.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('NoMoreElementsException') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('NoMoreElementsException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -394,8 +403,9 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -439,8 +449,9 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -469,8 +480,9 @@ JetFile: ArrayList.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IndexOutOfBoundsException') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IndexOutOfBoundsException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -539,8 +551,9 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -549,8 +562,9 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -619,8 +633,9 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -629,8 +644,9 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -823,8 +839,9 @@ JetFile: ArrayList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK diff --git a/idea/testData/psi/examples/collections/HashMap.txt b/idea/testData/psi/examples/collections/HashMap.txt index 1bda6ee46f8..a20cb2f5558 100644 --- a/idea/testData/psi/examples/collections/HashMap.txt +++ b/idea/testData/psi/examples/collections/HashMap.txt @@ -27,15 +27,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Any') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Any') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -50,14 +52,15 @@ JetFile: HashMap.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('java') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('java') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lang') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Object') + PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiElement(DOT)('.') REFERENCE_EXPRESSION @@ -72,14 +75,15 @@ JetFile: HashMap.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('java') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('java') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lang') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Object') + PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') @@ -99,8 +103,9 @@ JetFile: HashMap.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IEquality') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IEquality') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -113,8 +118,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Integer') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Integer') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -134,14 +140,15 @@ JetFile: HashMap.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('java') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('java') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lang') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Object') + PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiElement(DOT)('.') REFERENCE_EXPRESSION @@ -186,15 +193,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -210,8 +219,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -220,15 +230,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -244,15 +256,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('V') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -268,15 +282,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -299,8 +315,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Any') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Any') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -308,8 +325,9 @@ JetFile: HashMap.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IHashable') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IHashable') PsiWhiteSpace('\n ') PsiComment(EOL_COMMENT)('// equals and hashCode implementations are inherited') PsiWhiteSpace('\n\n') @@ -319,15 +337,17 @@ JetFile: HashMap.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('inline') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('inline') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Any') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Any') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('hashable') TYPE_PARAMETER_LIST @@ -339,8 +359,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('HashableWrapper') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('HashableWrapper') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -348,8 +369,9 @@ JetFile: HashMap.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('HashableWrapper') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('HashableWrapper') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -387,8 +409,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -397,15 +420,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -421,15 +446,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Integer') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Integer') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -448,8 +475,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IHashable') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IHashable') PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -457,14 +485,16 @@ JetFile: HashMap.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IHashingStrategy') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -486,8 +516,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -496,15 +527,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -539,15 +572,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Integer') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Integer') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -575,14 +610,16 @@ JetFile: HashMap.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IHashingStrategy') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -604,8 +641,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -614,15 +652,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -665,15 +705,17 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Integer') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Integer') PsiWhiteSpace('\n ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -713,19 +755,22 @@ JetFile: HashMap.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMap') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -738,8 +783,9 @@ JetFile: HashMap.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('inline') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('inline') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -755,8 +801,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -784,8 +831,9 @@ JetFile: HashMap.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('inline') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('inline') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -801,8 +849,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -811,8 +860,9 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -859,14 +909,16 @@ JetFile: HashMap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IHashingStrategy') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -874,19 +926,22 @@ JetFile: HashMap.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMap') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('K') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('V') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -911,14 +966,16 @@ JetFile: HashMap.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('JavaObjectHashingStrategy') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('K') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('JavaObjectHashingStrategy') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 dd93f2fd892..bb35aec444b 100644 --- a/idea/testData/psi/examples/collections/IIterable.txt +++ b/idea/testData/psi/examples/collections/IIterable.txt @@ -32,13 +32,15 @@ JetFile: IIterable.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 6800977fe14..3ea60751d53 100644 --- a/idea/testData/psi/examples/collections/IIterator.txt +++ b/idea/testData/psi/examples/collections/IIterator.txt @@ -32,8 +32,9 @@ JetFile: IIterator.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n ') PROPERTY PsiElement(val)('val') @@ -43,8 +44,9 @@ JetFile: IIterator.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n\n ') FUN PsiElement(fun)('fun') @@ -60,24 +62,27 @@ JetFile: IIterator.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('MutableArray') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + MODIFIER_LIST + PsiElement(in)('in') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -127,17 +132,19 @@ JetFile: IIterator.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('MutableArray') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + MODIFIER_LIST + PsiElement(in)('in') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -146,8 +153,9 @@ JetFile: IIterator.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -156,15 +164,17 @@ JetFile: IIterator.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/examples/collections/IList.txt b/idea/testData/psi/examples/collections/IList.txt index 843652a0499..02d6b981661 100644 --- a/idea/testData/psi/examples/collections/IList.txt +++ b/idea/testData/psi/examples/collections/IList.txt @@ -21,20 +21,23 @@ JetFile: IList.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ISized') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ISized') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -45,8 +48,9 @@ JetFile: IList.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('operator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('operator') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -62,15 +66,17 @@ JetFile: IList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n ') PROPERTY PsiElement(val)('val') @@ -80,7 +86,8 @@ JetFile: IList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/collections/IMutableIterable.txt b/idea/testData/psi/examples/collections/IMutableIterable.txt index c6a6994a482..c98ef672e9d 100644 --- a/idea/testData/psi/examples/collections/IMutableIterable.txt +++ b/idea/testData/psi/examples/collections/IMutableIterable.txt @@ -21,14 +21,16 @@ JetFile: IMutableIterable.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -46,13 +48,15 @@ JetFile: IMutableIterable.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 dca05efb3d3..c22cc89cb38 100644 --- a/idea/testData/psi/examples/collections/IMutableIterator.txt +++ b/idea/testData/psi/examples/collections/IMutableIterator.txt @@ -21,14 +21,16 @@ JetFile: IMutableIterator.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -46,8 +48,9 @@ JetFile: IMutableIterator.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n\n') PsiComment(BLOCK_COMMENT)('/*\n Considerations:\n pro: why not + non iteration breaking\n con: counter-intuitive for, e.g., TreeSet\n\n\n fun addBefore(item : T) : Boolean\n fun addAfter(item : T) : Boolean\n*/') PsiWhiteSpace('\n') diff --git a/idea/testData/psi/examples/collections/IMutableList.txt b/idea/testData/psi/examples/collections/IMutableList.txt index 71ae5bbc954..a880dac7c46 100644 --- a/idea/testData/psi/examples/collections/IMutableList.txt +++ b/idea/testData/psi/examples/collections/IMutableList.txt @@ -18,26 +18,30 @@ JetFile: IMutableList.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -56,8 +60,9 @@ JetFile: IMutableList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -66,15 +71,17 @@ JetFile: IMutableList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -90,8 +97,9 @@ JetFile: IMutableList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -100,8 +108,9 @@ JetFile: IMutableList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') FUN @@ -118,15 +127,17 @@ JetFile: IMutableList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -141,13 +152,15 @@ JetFile: IMutableList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 9df9cdc5073..e97932ac75a 100644 --- a/idea/testData/psi/examples/collections/IMutableSet.txt +++ b/idea/testData/psi/examples/collections/IMutableSet.txt @@ -18,26 +18,30 @@ JetFile: IMutableSet.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ISet') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ISet') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -56,15 +60,17 @@ JetFile: IMutableSet.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -80,14 +86,16 @@ JetFile: IMutableSet.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/collections/ISet.txt b/idea/testData/psi/examples/collections/ISet.txt index 977669fae46..feac701d875 100644 --- a/idea/testData/psi/examples/collections/ISet.txt +++ b/idea/testData/psi/examples/collections/ISet.txt @@ -18,20 +18,23 @@ JetFile: ISet.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ISized') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ISized') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -50,14 +53,16 @@ JetFile: ISet.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/collections/ISized.txt b/idea/testData/psi/examples/collections/ISized.txt index ee10e42bcc7..20a7d2d6ad5 100644 --- a/idea/testData/psi/examples/collections/ISized.txt +++ b/idea/testData/psi/examples/collections/ISized.txt @@ -21,7 +21,8 @@ JetFile: ISized.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/collections/LinkedList.txt b/idea/testData/psi/examples/collections/LinkedList.txt index 127107f35b9..ecd737bbd28 100644 --- a/idea/testData/psi/examples/collections/LinkedList.txt +++ b/idea/testData/psi/examples/collections/LinkedList.txt @@ -15,14 +15,16 @@ JetFile: LinkedList.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -46,8 +48,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY @@ -61,8 +64,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') PsiWhiteSpace('\n ') PROPERTY PsiElement(var)('var') @@ -72,8 +76,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -88,8 +93,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -107,8 +113,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Item') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -149,8 +156,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -159,8 +167,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -379,8 +388,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -448,15 +458,17 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -680,8 +692,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -690,15 +703,17 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -782,8 +797,9 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -861,13 +877,15 @@ JetFile: LinkedList.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + 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 58f8b04b6a5..12de230d722 100644 --- a/idea/testData/psi/examples/collections/List.txt +++ b/idea/testData/psi/examples/collections/List.txt @@ -23,8 +23,9 @@ JetFile: List.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -32,14 +33,16 @@ JetFile: List.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -54,14 +57,16 @@ JetFile: List.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Nothing') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Nothing') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -86,8 +91,9 @@ JetFile: List.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') PRIMARY_CONSTRUCTOR_PARAMETER @@ -98,14 +104,16 @@ JetFile: List.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -113,14 +121,16 @@ JetFile: List.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('List') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -149,8 +159,9 @@ JetFile: List.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -173,8 +184,9 @@ JetFile: List.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -212,8 +224,9 @@ JetFile: List.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterator') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/examples/io/IOSamples.txt b/idea/testData/psi/examples/io/IOSamples.txt index e2aa08f7e03..f77e9bc822a 100644 --- a/idea/testData/psi/examples/io/IOSamples.txt +++ b/idea/testData/psi/examples/io/IOSamples.txt @@ -33,15 +33,17 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -87,14 +89,15 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION + USER_TYPE REFERENCE_EXPRESSION REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('java') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('java') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('io') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('io') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Closeable') + PsiElement(IDENTIFIER)('Closeable') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -102,8 +105,9 @@ JetFile: IOSamples.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ICloseable') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ICloseable') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -128,14 +132,16 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -144,14 +150,16 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IAdder') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IAdder') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -200,20 +208,23 @@ JetFile: IOSamples.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterator') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Byte') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterator') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Byte') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('JavaCloseableWrapper') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('JavaCloseableWrapper') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -229,8 +240,9 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('InputStream') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('InputStream') PsiWhiteSpace('\n ') PROPERTY MODIFIER_LIST @@ -243,8 +255,9 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n ') PROPERTY MODIFIER_LIST @@ -269,8 +282,9 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('File') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('File') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -278,8 +292,9 @@ JetFile: IOSamples.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('JavaCloseableWrapper') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('JavaCloseableWrapper') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -363,8 +378,9 @@ JetFile: IOSamples.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Byte') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Byte') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -479,20 +495,23 @@ JetFile: IOSamples.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IAdder') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Byte') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IAdder') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Byte') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('JavaCloseableWrapper') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('JavaCloseableWrapper') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -508,8 +527,9 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('OutputStream') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('OutputStream') PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') @@ -521,8 +541,9 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('File') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('File') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -530,8 +551,9 @@ JetFile: IOSamples.jet INITIALIZER_LIST DELEGATOR_SUPER_CALL TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('JavaCloseableWrapper') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('JavaCloseableWrapper') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -577,8 +599,9 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Byte') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Byte') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -625,8 +648,9 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('File') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('File') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('//= ...') PsiWhiteSpace('\n ') @@ -638,8 +662,9 @@ JetFile: IOSamples.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('File') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('File') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('//= ...') PsiWhiteSpace('\n\n ') diff --git a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt index c6f44fcc9ef..45527b533c2 100644 --- a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt +++ b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt @@ -15,14 +15,16 @@ JetFile: BinaryHeap.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IPriorityQueue') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IPriorityQueue') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -38,14 +40,16 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n ') PROPERTY MODIFIER_LIST @@ -58,14 +62,16 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparison') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace('\n\n ') CONSTRUCTOR PsiElement(this)('this') @@ -77,14 +83,16 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IIterable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IIterable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -93,14 +101,16 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparison') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -110,8 +120,9 @@ JetFile: BinaryHeap.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -214,14 +225,16 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparison') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -303,8 +316,9 @@ JetFile: BinaryHeap.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') @@ -324,8 +338,9 @@ JetFile: BinaryHeap.jet TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(GT)('>') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -346,8 +361,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') @@ -446,8 +462,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -500,8 +517,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -725,8 +743,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -870,8 +889,9 @@ JetFile: BinaryHeap.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -884,8 +904,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -920,8 +941,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -953,8 +975,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -986,8 +1009,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -1047,8 +1071,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -1101,8 +1126,9 @@ JetFile: BinaryHeap.jet PsiElement(for)('for') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -1113,8 +1139,9 @@ JetFile: BinaryHeap.jet PsiElement(LBRACKET)('[') ATTRIBUTE TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('operator') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('operator') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(fun)('fun') @@ -1130,15 +1157,17 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -1165,14 +1194,16 @@ JetFile: BinaryHeap.jet PsiElement(fun)('fun') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IMutableList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('swap') TYPE_PARAMETER_LIST @@ -1185,8 +1216,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -1195,8 +1227,9 @@ JetFile: BinaryHeap.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -1260,22 +1293,25 @@ JetFile: BinaryHeap.jet PsiElement(val)('val') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IList') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IList') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(DOT)('.') PsiElement(IDENTIFIER)('lastIndex') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') diff --git a/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt b/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt index 32e712cc2b2..abd8fcade74 100644 --- a/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt +++ b/idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt @@ -29,8 +29,9 @@ JetFile: IPriorityQueue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace('\n ') FUN PsiElement(fun)('fun') @@ -46,8 +47,9 @@ JetFile: IPriorityQueue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -58,7 +60,8 @@ JetFile: IPriorityQueue.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Boolean') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Boolean') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt index 6137e139c91..5a5b068e868 100644 --- a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt +++ b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt @@ -19,14 +19,16 @@ JetFile: PriorityQueueAsPushPop.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IPriorityQueue') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IPriorityQueue') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') @@ -34,14 +36,16 @@ JetFile: PriorityQueueAsPushPop.jet DELEGATION_SPECIFIER_LIST DELEGATOR_SUPER_CLASS TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IPushPop') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IPushPop') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -89,8 +93,9 @@ JetFile: PriorityQueueAsPushPop.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') diff --git a/idea/testData/psi/examples/util/Comparison.txt b/idea/testData/psi/examples/util/Comparison.txt index 92207eedd44..e1775a985e4 100644 --- a/idea/testData/psi/examples/util/Comparison.txt +++ b/idea/testData/psi/examples/util/Comparison.txt @@ -21,20 +21,23 @@ JetFile: Comparison.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') FUN @@ -52,14 +55,16 @@ JetFile: Comparison.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('IComparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(GT)('>') VALUE_PARAMETER_LIST PsiElement(LPAR)('(') @@ -69,8 +74,9 @@ JetFile: Comparison.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -79,15 +85,17 @@ JetFile: Comparison.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -119,8 +127,9 @@ JetFile: Comparison.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Object') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -129,15 +138,17 @@ JetFile: Comparison.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Object') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -152,14 +163,16 @@ JetFile: Comparison.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Comparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Object') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiElement(DOT)('.') REFERENCE_EXPRESSION @@ -174,14 +187,16 @@ JetFile: Comparison.jet PsiElement(as)('as') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Comparable') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Object') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparable') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') CLASS @@ -237,20 +252,23 @@ JetFile: Comparison.jet VALUE_PARAMETER_LIST PsiElement(LPAR)('(') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(COMMA)(',') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('ComparisonResult') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ComparisonResult') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') FUN @@ -270,27 +288,31 @@ JetFile: Comparison.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Comparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparison') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('MatchableComparison') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') - PsiElement(GT)('>') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('MatchableComparison') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') + PsiElement(GT)('>') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/util/IComparable.txt b/idea/testData/psi/examples/util/IComparable.txt index 78f9a5e3a12..2f098ba67f0 100644 --- a/idea/testData/psi/examples/util/IComparable.txt +++ b/idea/testData/psi/examples/util/IComparable.txt @@ -1,9 +1,9 @@ JetFile: IComparable.jet NAMESPACE - PsiErrorElement:Expecting namespace or top level declaration - PsiElement(IDENTIFIER)('interface') - PsiWhiteSpace(' ') CLASS + MODIFIER_LIST + PsiElement(virtual)('virtual') + PsiWhiteSpace(' ') PsiElement(class)('class') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('IComparable') @@ -33,14 +33,16 @@ JetFile: IComparable.jet PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('T') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') TYPE_REFERENCE - REFERENCE_EXPRESSION - PsiElement(IDENTIFIER)('Int') + USER_TYPE + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file