From c777677a85217a26b71d3977db2eda32b47249a6 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Thu, 6 Jan 2011 18:40:11 +0300 Subject: [PATCH] Need expression-kind node wrapping IDENTIFIER in reference expression --- idea/src/org/jetbrains/jet/JetNodeTypes.java | 2 +- .../lang/parsing/JetExpressionParsing.java | 4 +- idea/testData/psi/AnnotatedExpressions.txt | 3 +- idea/testData/psi/AnonymousInitializer.txt | 6 +- idea/testData/psi/Attributes.txt | 6 +- idea/testData/psi/Attributes_ERR.txt | 6 +- idea/testData/psi/BabySteps.txt | 3 +- idea/testData/psi/BabySteps_ERR.txt | 3 +- idea/testData/psi/ByCaluses.txt | 30 +- idea/testData/psi/Constructors.txt | 24 +- idea/testData/psi/ControlStructures.txt | 201 ++++-- idea/testData/psi/EOLsInComments.txt | 48 +- idea/testData/psi/Enums.txt | 6 +- idea/testData/psi/FunctionCalls.txt | 117 ++-- idea/testData/psi/FunctionLiterals.txt | 54 +- idea/testData/psi/FunctionLiterals_ERR.txt | 36 +- idea/testData/psi/Functions_ERR.txt | 3 +- idea/testData/psi/LocalDeclarations.txt | 3 +- idea/testData/psi/Match.txt | 66 +- idea/testData/psi/Match_ERR.txt | 30 +- idea/testData/psi/NewlinesInParentheses.txt | 75 ++- idea/testData/psi/Precedence.txt | 347 ++++++---- idea/testData/psi/Properties.txt | 51 +- idea/testData/psi/Properties_ERR.txt | 12 +- idea/testData/psi/QuotedIdentifiers.txt | 3 +- idea/testData/psi/RootNamespace.txt | 12 +- idea/testData/psi/SimpleClassMembers.txt | 60 +- idea/testData/psi/SimpleClassMembers_ERR.txt | 12 +- idea/testData/psi/SimpleExpressions.txt | 12 +- idea/testData/psi/SoftKeywords.txt | 6 +- idea/testData/psi/ThisType.txt | 6 +- .../psi/examples/AnonymousObjects.txt | 27 +- idea/testData/psi/examples/BinaryTree.txt | 594 ++++++++++++------ idea/testData/psi/examples/BitArith.txt | 93 ++- idea/testData/psi/examples/Builder.txt | 54 +- .../psi/examples/FunctionsAndTypes.txt | 39 +- idea/testData/psi/examples/Graph.txt | 183 ++++-- idea/testData/psi/examples/LINQ.txt | 21 +- .../psi/examples/PolymorphicClassObjects.txt | 21 +- idea/testData/psi/examples/Queue.txt | 63 +- idea/testData/psi/examples/Stack.txt | 21 +- idea/testData/psi/examples/UnionFind.txt | 96 ++- .../testData/psi/examples/UpdateOperation.txt | 45 +- idea/testData/psi/examples/With.txt | 39 +- .../psi/examples/collections/ArrayList.txt | 186 ++++-- .../psi/examples/collections/HashMap.txt | 90 ++- .../psi/examples/collections/IIterator.txt | 75 ++- .../psi/examples/collections/LinkedList.txt | 228 ++++--- .../psi/examples/collections/List.txt | 42 +- idea/testData/psi/examples/io/IOSamples.txt | 93 ++- .../examples/priorityqueues/BinaryHeap.txt | 309 ++++++--- .../priorityqueues/PriorityQueueAsPushPop.txt | 21 +- .../testData/psi/examples/util/Comparison.txt | 57 +- 53 files changed, 2425 insertions(+), 1219 deletions(-) diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java index a6a5ef01979..1a7e7a3430b 100644 --- a/idea/src/org/jetbrains/jet/JetNodeTypes.java +++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java @@ -91,7 +91,7 @@ public interface JetNodeTypes { JetNodeType RECEIVER_TYPE = new JetNodeType("RECEIVER_TYPE"); JetNodeType FUNCTION_LITERAL = new JetNodeType("FUNCTION_LITERAL"); JetNodeType ANNOTATED_EXPRESSION = new JetNodeType("ANNOTATED_EXPRESSION"); - JetNodeType SIMPLE_NAME = new JetNodeType("SIMPLE_NAME"); + JetNodeType REFERENCE_EXPRESSION = new JetNodeType("REFERENCE_EXPRESSION"); JetNodeType BINARY_EXPRESSION = new JetNodeType("BINARY_EXPRESSION"); JetNodeType PREFIX_EXPRESSION = new JetNodeType("PREFIX_EXPRESSION"); JetNodeType POSTFIX_EXPRESSION = new JetNodeType("POSTFIX_EXPRESSION"); diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 1400cf6c88d..0ea08135a51 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -545,9 +545,9 @@ public class JetExpressionParsing extends AbstractJetParsing { * SimpleName */ private void parseSimpleName() { -// PsiBuilder.Marker simpleName = mark(); + PsiBuilder.Marker simpleName = mark(); expect(IDENTIFIER, "Expecting an identifier [Interal error]"); -// simpleName.done(SIMPLE_NAME); + simpleName.done(REFERENCE_EXPRESSION); } /* diff --git a/idea/testData/psi/AnnotatedExpressions.txt b/idea/testData/psi/AnnotatedExpressions.txt index 211a3252c66..77603ff31ec 100644 --- a/idea/testData/psi/AnnotatedExpressions.txt +++ b/idea/testData/psi/AnnotatedExpressions.txt @@ -21,7 +21,8 @@ JetFile: AnnotatedExpressions.jet PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') INTEGER_CONSTANT PsiElement(INTEGER_LITERAL)('1') diff --git a/idea/testData/psi/AnonymousInitializer.txt b/idea/testData/psi/AnonymousInitializer.txt index ebcca83d9a3..5ef0ef3d0a3 100644 --- a/idea/testData/psi/AnonymousInitializer.txt +++ b/idea/testData/psi/AnonymousInitializer.txt @@ -15,7 +15,8 @@ JetFile: AnonymousInitializer.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -27,7 +28,8 @@ JetFile: AnonymousInitializer.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') diff --git a/idea/testData/psi/Attributes.txt b/idea/testData/psi/Attributes.txt index c9c5686024c..a7bbee859fc 100644 --- a/idea/testData/psi/Attributes.txt +++ b/idea/testData/psi/Attributes.txt @@ -56,11 +56,13 @@ JetFile: Attributes.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiElement(COMMA)(',') ATTRIBUTE diff --git a/idea/testData/psi/Attributes_ERR.txt b/idea/testData/psi/Attributes_ERR.txt index 5a5d96f1d2b..540a0121f27 100644 --- a/idea/testData/psi/Attributes_ERR.txt +++ b/idea/testData/psi/Attributes_ERR.txt @@ -61,11 +61,13 @@ JetFile: Attributes_ERR.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/BabySteps.txt b/idea/testData/psi/BabySteps.txt index 21f09525ab8..e4c2d7a1586 100644 --- a/idea/testData/psi/BabySteps.txt +++ b/idea/testData/psi/BabySteps.txt @@ -58,7 +58,8 @@ JetFile: BabySteps.jet PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS diff --git a/idea/testData/psi/BabySteps_ERR.txt b/idea/testData/psi/BabySteps_ERR.txt index d8dd07e7abe..c91a4a2c7d0 100644 --- a/idea/testData/psi/BabySteps_ERR.txt +++ b/idea/testData/psi/BabySteps_ERR.txt @@ -60,7 +60,8 @@ JetFile: BabySteps_ERR.jet PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS diff --git a/idea/testData/psi/ByCaluses.txt b/idea/testData/psi/ByCaluses.txt index a0a97eccc2a..9d3455e75b3 100644 --- a/idea/testData/psi/ByCaluses.txt +++ b/idea/testData/psi/ByCaluses.txt @@ -17,7 +17,8 @@ JetFile: ByCaluses.jet PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -52,13 +53,15 @@ JetFile: ByCaluses.jet PsiElement(by)('by') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -102,7 +105,8 @@ JetFile: ByCaluses.jet PsiWhiteSpace(' ') TUPLE PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') CLASS_BODY @@ -140,7 +144,8 @@ JetFile: ByCaluses.jet TUPLE PsiElement(LPAR)('(') CALL_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') @@ -182,11 +187,13 @@ JetFile: ByCaluses.jet PsiElement(by)('by') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') INDICES PsiElement(LBRACKET)('[') CALL_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') @@ -228,12 +235,14 @@ JetFile: ByCaluses.jet PsiElement(by)('by') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT CALL_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') @@ -293,7 +302,8 @@ JetFile: ByCaluses.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') diff --git a/idea/testData/psi/Constructors.txt b/idea/testData/psi/Constructors.txt index 68b23421573..5d7c6ff3b4b 100644 --- a/idea/testData/psi/Constructors.txt +++ b/idea/testData/psi/Constructors.txt @@ -24,15 +24,18 @@ JetFile: Constructors.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') @@ -49,7 +52,8 @@ JetFile: Constructors.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') CONSTRUCTOR @@ -74,15 +78,18 @@ JetFile: Constructors.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') @@ -99,7 +106,8 @@ JetFile: Constructors.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK diff --git a/idea/testData/psi/ControlStructures.txt b/idea/testData/psi/ControlStructures.txt index 5d5c783f4af..8002e61c255 100644 --- a/idea/testData/psi/ControlStructures.txt +++ b/idea/testData/psi/ControlStructures.txt @@ -134,12 +134,14 @@ JetFile: ControlStructures.jet PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(else)('else') PsiWhiteSpace(' ') ELSE - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') VALUE_PARAMETER @@ -163,7 +165,8 @@ JetFile: ControlStructures.jet PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -185,7 +188,8 @@ JetFile: ControlStructures.jet BREAK PsiElement(break)('break') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('la') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('la') PsiWhiteSpace('\n ') BREAK PsiElement(break)('break') @@ -195,7 +199,8 @@ JetFile: ControlStructures.jet CONTINUE PsiElement(continue)('continue') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('la') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('la') PsiWhiteSpace('\n ') CONTINUE PsiElement(continue)('continue') @@ -207,7 +212,8 @@ JetFile: ControlStructures.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -216,16 +222,19 @@ JetFile: ControlStructures.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n ') PsiElement(else)('else') PsiWhiteSpace('\n ') ELSE - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PsiElement(else)('else') PsiWhiteSpace(' ') @@ -235,16 +244,19 @@ JetFile: ControlStructures.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n ') PsiElement(else)('else') PsiWhiteSpace('\n ') ELSE - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n ') TRY PsiElement(try)('try') @@ -426,11 +438,13 @@ JetFile: ControlStructures.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') FOR PsiElement(for)('for') @@ -442,11 +456,13 @@ JetFile: ControlStructures.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') FOR PsiElement(for)('for') @@ -466,11 +482,13 @@ JetFile: ControlStructures.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') FOR PsiElement(for)('for') @@ -488,7 +506,8 @@ JetFile: ControlStructures.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -556,11 +575,13 @@ JetFile: ControlStructures.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n\n ') FOR PsiElement(for)('for') @@ -572,7 +593,8 @@ JetFile: ControlStructures.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -592,7 +614,8 @@ JetFile: ControlStructures.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -600,7 +623,8 @@ JetFile: ControlStructures.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -614,13 +638,15 @@ JetFile: ControlStructures.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') BODY PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n\n ') WHILE PsiElement(while)('while') @@ -628,15 +654,18 @@ JetFile: ControlStructures.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(in)('in') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n\n ') WHILE PsiElement(while)('while') @@ -644,11 +673,13 @@ JetFile: ControlStructures.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(in)('in') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -656,7 +687,8 @@ JetFile: ControlStructures.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -666,24 +698,28 @@ JetFile: ControlStructures.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(in)('in') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') BODY PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n\n ') WHILE PsiElement(while)('while') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -698,65 +734,77 @@ JetFile: ControlStructures.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') PsiElement(else)('else') PsiWhiteSpace('\n ') ELSE - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n\n ') IF PsiElement(if)('if') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(else)('else') PsiWhiteSpace(' ') ELSE - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n\n ') IF PsiElement(if)('if') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') PsiElement(else)('else') PsiWhiteSpace(' ') ELSE - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n\n ') IF PsiElement(if)('if') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') PsiElement(else)('else') PsiWhiteSpace('\n ') ELSE - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n ') IF @@ -764,33 +812,39 @@ JetFile: ControlStructures.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') IF PsiElement(if)('if') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') IF PsiElement(if)('if') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n ') IF @@ -798,7 +852,8 @@ JetFile: ControlStructures.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -806,14 +861,16 @@ JetFile: ControlStructures.jet PsiElement(else)('else') PsiWhiteSpace(' ') ELSE - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') IF PsiElement(if)('if') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -821,14 +878,16 @@ JetFile: ControlStructures.jet PsiElement(else)('else') PsiWhiteSpace(' ') ELSE - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') IF PsiElement(if)('if') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -837,14 +896,16 @@ JetFile: ControlStructures.jet PsiElement(else)('else') PsiWhiteSpace(' ') ELSE - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') IF PsiElement(if)('if') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -862,20 +923,23 @@ JetFile: ControlStructures.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('r') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('r') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') DO_WHILE PsiElement(do)('do') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(while)('while') PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('r') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('r') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') DO_WHILE @@ -888,9 +952,11 @@ JetFile: ControlStructures.jet PsiElement(SEMICOLON)(';') PsiElement(SEMICOLON)(';') PsiElement(SEMICOLON)(';') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(SEMICOLON)(';') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(SEMICOLON)(';') PsiElement(SEMICOLON)(';') PsiElement(SEMICOLON)(';') @@ -902,7 +968,8 @@ JetFile: ControlStructures.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('r') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('r') PsiElement(RPAR)(')') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') diff --git a/idea/testData/psi/EOLsInComments.txt b/idea/testData/psi/EOLsInComments.txt index 7f8e9afbc9f..701fd3e9d1e 100644 --- a/idea/testData/psi/EOLsInComments.txt +++ b/idea/testData/psi/EOLsInComments.txt @@ -13,72 +13,88 @@ JetFile: EOLsInComments.jet BLOCK PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PsiComment(DOC_COMMENT)('/** */') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PsiComment(BLOCK_COMMENT)('/* */') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiComment(BLOCK_COMMENT)('/*\n */') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PsiComment(BLOCK_COMMENT)('/*\n */') PsiWhiteSpace(' ') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiComment(DOC_COMMENT)('/**\n */') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('//') PsiWhiteSpace('\n ') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('//') PsiWhiteSpace('\n') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/Enums.txt b/idea/testData/psi/Enums.txt index 948b7ddb4df..defe675ee32 100644 --- a/idea/testData/psi/Enums.txt +++ b/idea/testData/psi/Enums.txt @@ -198,7 +198,8 @@ JetFile: Enums.jet PsiElement(LPAR)('(') PsiComment(BLOCK_COMMENT)('/*tail.size + 1*/') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') PROPERTY @@ -219,7 +220,8 @@ JetFile: Enums.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('//> 0') PsiWhiteSpace('\n') diff --git a/idea/testData/psi/FunctionCalls.txt b/idea/testData/psi/FunctionCalls.txt index 9ea157a38d8..e589fa148f0 100644 --- a/idea/testData/psi/FunctionCalls.txt +++ b/idea/testData/psi/FunctionCalls.txt @@ -14,15 +14,18 @@ JetFile: FunctionCalls.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -32,11 +35,13 @@ JetFile: FunctionCalls.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -46,71 +51,85 @@ JetFile: FunctionCalls.jet PsiWhiteSpace('\n ') TUPLE PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY - PsiElement(IDENTIFIER)('s') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') PsiWhiteSpace('\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY - PsiElement(IDENTIFIER)('s') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('s') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('s') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('s') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -120,19 +139,22 @@ JetFile: FunctionCalls.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('s') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -142,24 +164,28 @@ JetFile: FunctionCalls.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY - PsiElement(IDENTIFIER)('s') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('s') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT CALL_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -174,12 +200,14 @@ JetFile: FunctionCalls.jet PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT CALL_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -194,19 +222,23 @@ JetFile: FunctionCalls.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(LT)('<') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT @@ -216,23 +248,28 @@ JetFile: FunctionCalls.jet PsiWhiteSpace(' ') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') TUPLE PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(LT)('<') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT @@ -251,11 +288,13 @@ JetFile: FunctionCalls.jet PsiWhiteSpace(' ') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') TUPLE PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n') diff --git a/idea/testData/psi/FunctionLiterals.txt b/idea/testData/psi/FunctionLiterals.txt index 2870dc722ef..afba7ea97f0 100644 --- a/idea/testData/psi/FunctionLiterals.txt +++ b/idea/testData/psi/FunctionLiterals.txt @@ -22,7 +22,8 @@ JetFile: FunctionLiterals.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') FUNCTION_LITERAL @@ -33,7 +34,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') FUNCTION_LITERAL @@ -47,7 +49,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -67,7 +70,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -93,7 +97,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -113,7 +118,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') FUNCTION_LITERAL @@ -131,7 +137,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -161,7 +168,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -191,7 +199,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -221,7 +230,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') FUNCTION_LITERAL @@ -233,7 +243,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -245,7 +256,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -263,7 +275,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -281,7 +294,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') FUNCTION_LITERAL @@ -300,7 +314,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -325,7 +340,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -356,7 +372,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -381,7 +398,8 @@ JetFile: FunctionLiterals.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/FunctionLiterals_ERR.txt b/idea/testData/psi/FunctionLiterals_ERR.txt index 3e7129149a4..1931fa0d076 100644 --- a/idea/testData/psi/FunctionLiterals_ERR.txt +++ b/idea/testData/psi/FunctionLiterals_ERR.txt @@ -22,7 +22,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -37,7 +38,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') FUNCTION_LITERAL @@ -52,7 +54,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -72,7 +75,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -96,7 +100,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -134,7 +139,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -167,7 +173,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -205,7 +212,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') FUNCTION_LITERAL @@ -226,7 +234,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -255,7 +264,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') FUNCTION_LITERAL @@ -271,7 +281,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') FUNCTION_LITERAL @@ -291,7 +302,8 @@ JetFile: FunctionLiterals_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') BODY - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/Functions_ERR.txt b/idea/testData/psi/Functions_ERR.txt index 066ff0572b8..47aab541de8 100644 --- a/idea/testData/psi/Functions_ERR.txt +++ b/idea/testData/psi/Functions_ERR.txt @@ -348,7 +348,8 @@ JetFile: Functions_ERR.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n\n') FUN diff --git a/idea/testData/psi/LocalDeclarations.txt b/idea/testData/psi/LocalDeclarations.txt index ad6f707045a..e6ab84e64b1 100644 --- a/idea/testData/psi/LocalDeclarations.txt +++ b/idea/testData/psi/LocalDeclarations.txt @@ -13,7 +13,8 @@ JetFile: LocalDeclarations.jet BLOCK PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('lazy') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lazy') PsiWhiteSpace('\n ') INTEGER_CONSTANT PsiElement(INTEGER_LITERAL)('1') diff --git a/idea/testData/psi/Match.txt b/idea/testData/psi/Match.txt index 86b4fabe131..2c31a8f4393 100644 --- a/idea/testData/psi/Match.txt +++ b/idea/testData/psi/Match.txt @@ -35,7 +35,8 @@ JetFile: Match.jet PsiElement(LBRACE)('{') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -50,7 +51,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(RBRACE)('}') PsiElement(RBRACE)('}') @@ -87,7 +89,8 @@ JetFile: Match.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -96,7 +99,8 @@ JetFile: Match.jet PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -111,12 +115,14 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -142,7 +148,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -167,7 +174,8 @@ JetFile: Match.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(GT)('>') PsiWhiteSpace(' ') @@ -177,7 +185,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -188,7 +197,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -199,7 +209,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -213,7 +224,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -224,7 +236,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -235,7 +248,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -246,7 +260,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -257,7 +272,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -268,7 +284,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -278,7 +295,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -294,7 +312,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -311,7 +330,8 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -337,14 +357,16 @@ JetFile: Match.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/Match_ERR.txt b/idea/testData/psi/Match_ERR.txt index ffa22fa9348..7476a0d414b 100644 --- a/idea/testData/psi/Match_ERR.txt +++ b/idea/testData/psi/Match_ERR.txt @@ -14,7 +14,8 @@ JetFile: Match_ERR.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -23,7 +24,8 @@ JetFile: Match_ERR.jet PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -37,12 +39,14 @@ JetFile: Match_ERR.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -62,7 +66,8 @@ JetFile: Match_ERR.jet PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -82,12 +87,14 @@ JetFile: Match_ERR.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -102,7 +109,8 @@ JetFile: Match_ERR.jet PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -117,7 +125,8 @@ JetFile: Match_ERR.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -147,7 +156,8 @@ JetFile: Match_ERR.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/NewlinesInParentheses.txt b/idea/testData/psi/NewlinesInParentheses.txt index f20bec9a41b..706eb3a1b87 100644 --- a/idea/testData/psi/NewlinesInParentheses.txt +++ b/idea/testData/psi/NewlinesInParentheses.txt @@ -21,11 +21,13 @@ JetFile: NewlinesInParentheses.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') PROPERTY PsiElement(val)('val') @@ -35,11 +37,13 @@ JetFile: NewlinesInParentheses.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') PROPERTY PsiElement(val)('val') @@ -48,12 +52,14 @@ JetFile: NewlinesInParentheses.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') PROPERTY PsiElement(val)('val') @@ -65,11 +71,13 @@ JetFile: NewlinesInParentheses.jet TUPLE PsiElement(LPAR)('(') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -84,12 +92,14 @@ JetFile: NewlinesInParentheses.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') @@ -106,17 +116,20 @@ JetFile: NewlinesInParentheses.jet FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') PROPERTY @@ -127,15 +140,18 @@ JetFile: NewlinesInParentheses.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') INDICES PsiElement(LBRACKET)('[') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('d') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('d') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n ') PROPERTY @@ -146,18 +162,21 @@ JetFile: NewlinesInParentheses.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') INDICES PsiElement(LBRACKET)('[') FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('d') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('d') PsiElement(RBRACE)('}') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n ') @@ -169,28 +188,33 @@ JetFile: NewlinesInParentheses.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') INDICES PsiElement(LBRACKET)('[') BINARY_EXPRESSION FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') PREFIX_EXPRESSION PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('d') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('d') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('d') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('d') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -209,7 +233,8 @@ JetFile: NewlinesInParentheses.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') diff --git a/idea/testData/psi/Precedence.txt b/idea/testData/psi/Precedence.txt index 418b543f751..22e2861baea 100644 --- a/idea/testData/psi/Precedence.txt +++ b/idea/testData/psi/Precedence.txt @@ -15,16 +15,19 @@ JetFile: Precedence.jet PsiWhiteSpace('\n ') DOT_QIALIFIED_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace('\n ') DOT_QIALIFIED_EXPRESSION POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(PLUSPLUS)('++') PsiWhiteSpace(' ') PsiElement(DOT)('.') @@ -41,15 +44,18 @@ JetFile: Precedence.jet PREFIX_EXPRESSION PsiElement(EXCL)('!') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT CALL_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -69,19 +75,23 @@ JetFile: Precedence.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(LT)('<') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT @@ -91,30 +101,36 @@ JetFile: Precedence.jet PsiWhiteSpace(' ') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') TUPLE PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(LT)('<') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT TUPLE PsiElement(LPAR)('(') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') @@ -125,45 +141,54 @@ JetFile: Precedence.jet PsiWhiteSpace(' ') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') TUPLE PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(LT)('<') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT TUPLE PsiElement(LPAR)('(') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') TUPLE PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT CALL_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -178,190 +203,236 @@ JetFile: Precedence.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT TUPLE PsiElement(LPAR)('(') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(LT)('<') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(GT)('>') TUPLE PsiElement(LPAR)('(') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(LT)('<') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(MUL)('*') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') TUPLE PsiElement(LPAR)('(') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(MUL)('*') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION TUPLE PsiElement(LPAR)('(') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(MUL)('*') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(GT)('>') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace(' ') PsiElement(MUL)('*') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(in)('in') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace(' ') PsiElement(MUL)('*') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('d') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('d') PsiWhiteSpace('\n ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('b') - PsiWhiteSpace('\n ') - BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') - PsiWhiteSpace(' ') - PsiElement(PLUS)('+') - PsiWhiteSpace(' ') - DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('b') - PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('c') - PsiWhiteSpace('\n ') - BINARY_EXPRESSION - DOT_QIALIFIED_EXPRESSION + REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('a') - PsiElement(DOT)('.') + PsiElement(DOT)('.') + REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('b') + PsiWhiteSpace('\n ') + BINARY_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + DOT_QIALIFIED_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') + PsiElement(DOT)('.') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') + PsiWhiteSpace('\n ') + BINARY_EXPRESSION + DOT_QIALIFIED_EXPRESSION + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') + PsiElement(DOT)('.') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') + PsiWhiteSpace(' ') + PsiElement(PLUS)('+') + PsiWhiteSpace(' ') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') PREFIX_EXPRESSION PsiElement(MINUSMINUS)('--') POSTFIX_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') BINARY_EXPRESSION PREFIX_EXPRESSION PsiElement(MINUSMINUS)('--') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(MUL)('*') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(PLUS)('+') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RANGE)('..') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(MINUS)('-') INTEGER_CONSTANT PsiElement(INTEGER_LITERAL)('1') @@ -407,131 +478,162 @@ JetFile: Precedence.jet BINARY_EXPRESSION BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('d') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('f') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('g') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('g') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(ELVIS)('?:') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(in)('in') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(ELVIS)('?:') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(GT)('>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(ANDAND)('&&') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(OROR)('||') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(ANDAND)('&&') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(ARROW)('->') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(OROR)('||') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(OROR)('||') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -544,17 +646,20 @@ JetFile: Precedence.jet PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(OROR)('||') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -562,18 +667,21 @@ JetFile: Precedence.jet PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(ARROW)('->') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -582,6 +690,7 @@ JetFile: Precedence.jet PsiWhiteSpace(' ') PsiElement(ARROW)('->') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/Properties.txt b/idea/testData/psi/Properties.txt index 198b2b8a11f..d5f1658bb91 100644 --- a/idea/testData/psi/Properties.txt +++ b/idea/testData/psi/Properties.txt @@ -9,11 +9,14 @@ JetFile: Properties.jet PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n\n') PROPERTY PsiElement(val)('val') @@ -114,7 +117,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') PROPERTY PsiElement(val)('val') @@ -143,7 +147,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n\n') PROPERTY PsiElement(val)('val') @@ -175,7 +180,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -227,7 +233,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') @@ -291,7 +298,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR MODIFIER_LIST @@ -368,7 +376,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR MODIFIER_LIST @@ -426,7 +435,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR MODIFIER_LIST @@ -519,7 +529,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n\n') PROPERTY PsiElement(val)('val') @@ -622,7 +633,8 @@ JetFile: Properties.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') @@ -649,7 +661,8 @@ JetFile: Properties.jet PsiWhiteSpace('\n ') BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('get') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('get') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -661,16 +674,19 @@ JetFile: Properties.jet PsiWhiteSpace('\n ') BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('set') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('set') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('int') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('int') PsiWhiteSpace(' ') PsiElement(COLON)(':') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -712,7 +728,8 @@ JetFile: Properties.jet DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiWhiteSpace(' ') PsiElement(MINUS)('-') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/Properties_ERR.txt b/idea/testData/psi/Properties_ERR.txt index 73b24eb8f56..3bacaf64f14 100644 --- a/idea/testData/psi/Properties_ERR.txt +++ b/idea/testData/psi/Properties_ERR.txt @@ -56,7 +56,8 @@ JetFile: Properties_ERR.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n') PROPERTY PsiElement(val)('val') @@ -88,7 +89,8 @@ JetFile: Properties_ERR.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiWhiteSpace('\n') PROPERTY PsiElement(val)('val') @@ -153,7 +155,8 @@ JetFile: Properties_ERR.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(set)('set') @@ -207,7 +210,8 @@ JetFile: Properties_ERR.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(get)('get') diff --git a/idea/testData/psi/QuotedIdentifiers.txt b/idea/testData/psi/QuotedIdentifiers.txt index 302297c9310..624104aa4cf 100644 --- a/idea/testData/psi/QuotedIdentifiers.txt +++ b/idea/testData/psi/QuotedIdentifiers.txt @@ -22,7 +22,8 @@ JetFile: QuotedIdentifiers.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('`class`') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('`class`') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/RootNamespace.txt b/idea/testData/psi/RootNamespace.txt index 54b77b8984e..2e329a16eab 100644 --- a/idea/testData/psi/RootNamespace.txt +++ b/idea/testData/psi/RootNamespace.txt @@ -45,11 +45,14 @@ JetFile: RootNamespace.jet ROOT_NAMESPACE PsiElement(namespace)('namespace') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('X') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') PsiWhiteSpace('\n ') NEW PsiElement(new)('new') @@ -70,7 +73,8 @@ JetFile: RootNamespace.jet PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/SimpleClassMembers.txt b/idea/testData/psi/SimpleClassMembers.txt index e736297ce33..6e0bc94439a 100644 --- a/idea/testData/psi/SimpleClassMembers.txt +++ b/idea/testData/psi/SimpleClassMembers.txt @@ -116,15 +116,18 @@ JetFile: SimpleClassMembers.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') @@ -141,7 +144,8 @@ JetFile: SimpleClassMembers.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -240,7 +244,8 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -270,7 +275,8 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL @@ -355,15 +361,18 @@ JetFile: SimpleClassMembers.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') @@ -380,7 +389,8 @@ JetFile: SimpleClassMembers.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -446,15 +456,18 @@ JetFile: SimpleClassMembers.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') @@ -471,7 +484,8 @@ JetFile: SimpleClassMembers.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') CONSTRUCTOR @@ -488,15 +502,18 @@ JetFile: SimpleClassMembers.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') @@ -513,7 +530,8 @@ JetFile: SimpleClassMembers.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -589,7 +607,8 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -619,7 +638,8 @@ JetFile: SimpleClassMembers.jet PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',') PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL diff --git a/idea/testData/psi/SimpleClassMembers_ERR.txt b/idea/testData/psi/SimpleClassMembers_ERR.txt index cf93599347d..387ffd70c42 100644 --- a/idea/testData/psi/SimpleClassMembers_ERR.txt +++ b/idea/testData/psi/SimpleClassMembers_ERR.txt @@ -153,15 +153,18 @@ JetFile: SimpleClassMembers_ERR.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('c') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('c') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') @@ -178,7 +181,8 @@ JetFile: SimpleClassMembers_ERR.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK diff --git a/idea/testData/psi/SimpleExpressions.txt b/idea/testData/psi/SimpleExpressions.txt index d1c0b487d99..968d6bdc7fd 100644 --- a/idea/testData/psi/SimpleExpressions.txt +++ b/idea/testData/psi/SimpleExpressions.txt @@ -337,7 +337,8 @@ JetFile: SimpleExpressions.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -367,7 +368,8 @@ JetFile: SimpleExpressions.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') @@ -622,7 +624,8 @@ JetFile: SimpleExpressions.jet BREAK PsiElement(break)('break') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('la') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('la') PsiWhiteSpace('\n ') BREAK PsiElement(break)('break') @@ -632,7 +635,8 @@ JetFile: SimpleExpressions.jet CONTINUE PsiElement(continue)('continue') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('la') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('la') PsiWhiteSpace('\n ') CONTINUE PsiElement(continue)('continue') diff --git a/idea/testData/psi/SoftKeywords.txt b/idea/testData/psi/SoftKeywords.txt index a1ef5107873..cec9e26b7ce 100644 --- a/idea/testData/psi/SoftKeywords.txt +++ b/idea/testData/psi/SoftKeywords.txt @@ -149,7 +149,8 @@ JetFile: SoftKeywords.jet PsiWhiteSpace(' ') PsiElement(by)('by') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') CLASS_BODY PsiElement(LBRACE)('{') @@ -285,7 +286,8 @@ JetFile: SoftKeywords.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace('\n ') PROPERTY_ACCESSOR PsiElement(set)('set') diff --git a/idea/testData/psi/ThisType.txt b/idea/testData/psi/ThisType.txt index 30c4ae250fa..29d92e9f9fe 100644 --- a/idea/testData/psi/ThisType.txt +++ b/idea/testData/psi/ThisType.txt @@ -66,12 +66,14 @@ JetFile: ThisType.jet PsiElement(by)('by') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ') PsiElement(as)('as') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('List') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE diff --git a/idea/testData/psi/examples/AnonymousObjects.txt b/idea/testData/psi/examples/AnonymousObjects.txt index 80a4fa6efca..eeb1df053d0 100644 --- a/idea/testData/psi/examples/AnonymousObjects.txt +++ b/idea/testData/psi/examples/AnonymousObjects.txt @@ -14,7 +14,8 @@ JetFile: AnonymousObjects.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n\n') CALL_EXPRESSION - PsiElement(IDENTIFIER)('addMouseListener') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('addMouseListener') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -72,7 +73,8 @@ JetFile: AnonymousObjects.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('clickCount') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('clickCount') PsiElement(PLUSPLUS)('++') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') @@ -82,7 +84,8 @@ JetFile: AnonymousObjects.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('clickCount') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('clickCount') PsiWhiteSpace(' ') PsiElement(GT)('>') PsiWhiteSpace(' ') @@ -93,16 +96,20 @@ JetFile: AnonymousObjects.jet THEN CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('GOD') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('GOD') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('sendMessage') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('sendMessage') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('GodMEssages') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('GodMEssages') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('TOO_MANY_CLICKS') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TOO_MANY_CLICKS') PsiElement(RPAR)(')') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') @@ -184,9 +191,11 @@ JetFile: AnonymousObjects.jet PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('message') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('message') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('name') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('name') PsiElement(RPAR)(')') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') diff --git a/idea/testData/psi/examples/BinaryTree.txt b/idea/testData/psi/examples/BinaryTree.txt index 6d84204f0e6..7a37616bbb9 100644 --- a/idea/testData/psi/examples/BinaryTree.txt +++ b/idea/testData/psi/examples/BinaryTree.txt @@ -167,16 +167,19 @@ JetFile: BinaryTree.jet DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('asMatchableComparison') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('asMatchableComparison') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('comparison') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('comparison') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -196,7 +199,8 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') VALUE_ARGUMENT CALL_EXPRESSION - PsiElement(IDENTIFIER)('naturalOrder') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('naturalOrder') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -254,7 +258,8 @@ JetFile: BinaryTree.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -262,7 +267,8 @@ JetFile: BinaryTree.jet PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('other') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('other') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') FUN @@ -299,15 +305,18 @@ JetFile: BinaryTree.jet PsiElement(return)('return') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('contains') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('contains') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('root') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('root') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') FUN @@ -353,7 +362,8 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -370,18 +380,22 @@ JetFile: BinaryTree.jet PsiWhiteSpace('\n ') BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(match)('match') @@ -410,18 +424,22 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('contains') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('contains') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') MATCH_ENTRY @@ -434,18 +452,22 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('contains') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('contains') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -490,13 +512,15 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION CALL_EXPRESSION - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT PsiElement(ref)('ref') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('root') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('root') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT @@ -511,11 +535,13 @@ JetFile: BinaryTree.jet PsiWhiteSpace('\n ') BODY POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') RETURN @@ -582,7 +608,8 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -596,20 +623,24 @@ JetFile: BinaryTree.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') RETURN @@ -622,18 +653,22 @@ JetFile: BinaryTree.jet PsiWhiteSpace('\n ') BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(match)('match') @@ -662,20 +697,24 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT PsiElement(ref)('ref') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') MATCH_ENTRY @@ -688,20 +727,24 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT PsiElement(ref)('ref') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -743,7 +786,8 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -757,16 +801,19 @@ JetFile: BinaryTree.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('root') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('root') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT @@ -784,18 +831,22 @@ JetFile: BinaryTree.jet PsiWhiteSpace('\n ') BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(match)('match') @@ -833,9 +884,11 @@ JetFile: BinaryTree.jet CONDITION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -850,22 +903,27 @@ JetFile: BinaryTree.jet BODY BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') RETURN @@ -883,14 +941,17 @@ JetFile: BinaryTree.jet PsiElement(return)('return') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') MATCH_ENTRY @@ -909,9 +970,11 @@ JetFile: BinaryTree.jet CONDITION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -926,22 +989,27 @@ JetFile: BinaryTree.jet BODY BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('TreeNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('TreeNode') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') RETURN @@ -959,14 +1027,17 @@ JetFile: BinaryTree.jet PsiElement(return)('return') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -1013,15 +1084,18 @@ JetFile: BinaryTree.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('find') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('find') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('root') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('root') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') IF @@ -1030,7 +1104,8 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('toRemove') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('toRemove') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -1046,19 +1121,23 @@ JetFile: BinaryTree.jet PsiElement(false)('false') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('remove') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('remove') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('toRemove') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('toRemove') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(MINUSMINUS)('--') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') RETURN @@ -1100,7 +1179,8 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -1117,18 +1197,22 @@ JetFile: BinaryTree.jet PsiWhiteSpace('\n ') BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(match)('match') @@ -1144,7 +1228,8 @@ JetFile: BinaryTree.jet PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace('\n ') MATCH_ENTRY PsiElement(case)('case') @@ -1156,14 +1241,17 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('find') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('find') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') MATCH_ENTRY @@ -1176,14 +1264,17 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('find') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('find') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -1217,7 +1308,8 @@ JetFile: BinaryTree.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace(' ') PsiElement(match)('match') PsiWhiteSpace(' ') @@ -1244,11 +1336,13 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('replace') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('replace') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT @@ -1277,15 +1371,18 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('replace') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('replace') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') MATCH_ENTRY @@ -1309,15 +1406,18 @@ JetFile: BinaryTree.jet PsiElement(DOUBLE_ARROW)('=>') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('replace') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('replace') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') MATCH_ENTRY @@ -1352,35 +1452,44 @@ JetFile: BinaryTree.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('remove') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('remove') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -1424,11 +1533,13 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('root') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('root') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -1437,11 +1548,13 @@ JetFile: BinaryTree.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('root') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('root') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('replace') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('replace') PsiWhiteSpace('\n ') RETURN PsiElement(return)('return') @@ -1456,15 +1569,19 @@ JetFile: BinaryTree.jet BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -1475,15 +1592,19 @@ JetFile: BinaryTree.jet BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('replace') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('replace') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') @@ -1498,15 +1619,19 @@ JetFile: BinaryTree.jet BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -1517,15 +1642,19 @@ JetFile: BinaryTree.jet BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('replace') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('replace') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') @@ -1533,7 +1662,8 @@ JetFile: BinaryTree.jet PsiWhiteSpace(' ') ELSE CALL_EXPRESSION - PsiElement(IDENTIFIER)('Assert') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Assert') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -1578,9 +1708,11 @@ JetFile: BinaryTree.jet CONDITION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -1589,20 +1721,24 @@ JetFile: BinaryTree.jet PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiWhiteSpace(' ') PsiElement(else)('else') PsiWhiteSpace(' ') ELSE CALL_EXPRESSION - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('node') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('node') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -1635,7 +1771,8 @@ JetFile: BinaryTree.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('mutableIterator') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mutableIterator') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -1688,11 +1825,13 @@ JetFile: BinaryTree.jet PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('BinaryTree') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('BinaryTree') PsiElement(DOT)('.') PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiWhiteSpace('\n ') PROPERTY PsiElement(val)('val') @@ -1702,7 +1841,8 @@ JetFile: BinaryTree.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('Stack') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Stack') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -1721,7 +1861,8 @@ JetFile: BinaryTree.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('Stack') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Stack') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -1758,7 +1899,8 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('root') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('root') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') @@ -1769,13 +1911,16 @@ JetFile: BinaryTree.jet THEN CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('down') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('down') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('push') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('push') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('root') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('root') PsiElement(RPAR)(')') PsiWhiteSpace(' \n ') PsiElement(RBRACE)('}') @@ -1809,7 +1954,8 @@ JetFile: BinaryTree.jet CONDITION PREFIX_EXPRESSION PsiElement(EXCL)('!') - PsiElement(IDENTIFIER)('hasNext') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hasNext') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -1817,24 +1963,28 @@ JetFile: BinaryTree.jet PsiElement(throw)('throw') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('NoMoreElementsException') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('NoMoreElementsException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkVersion') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkVersion') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('lastNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lastNode') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('nextNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('nextNode') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -1843,9 +1993,11 @@ JetFile: BinaryTree.jet PsiElement(return)('return') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('lastNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lastNode') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -1893,9 +2045,11 @@ JetFile: BinaryTree.jet PREFIX_EXPRESSION PsiElement(EXCL)('!') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('down') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('down') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('isEmpty') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('isEmpty') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -1912,9 +2066,11 @@ JetFile: BinaryTree.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('down') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('down') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('pop') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pop') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -1926,9 +2082,11 @@ JetFile: BinaryTree.jet CONDITION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') @@ -1943,27 +2101,34 @@ JetFile: BinaryTree.jet BODY CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('up') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('up') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('push') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('push') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('down') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('down') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('push') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('push') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -1982,9 +2147,11 @@ JetFile: BinaryTree.jet CONDITION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') @@ -1999,16 +2166,20 @@ JetFile: BinaryTree.jet BODY CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('down') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('down') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('push') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('push') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -2016,7 +2187,8 @@ JetFile: BinaryTree.jet RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -2039,9 +2211,11 @@ JetFile: BinaryTree.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('up') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('up') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('pop') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pop') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -2053,9 +2227,11 @@ JetFile: BinaryTree.jet CONDITION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') @@ -2070,16 +2246,20 @@ JetFile: BinaryTree.jet BODY CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('down') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('down') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('push') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('push') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -2087,7 +2267,8 @@ JetFile: BinaryTree.jet RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('curNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('curNode') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -2120,18 +2301,22 @@ JetFile: BinaryTree.jet PREFIX_EXPRESSION PsiElement(EXCL)('!') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('down') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('down') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('isEmpty') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('isEmpty') PsiWhiteSpace(' ') PsiElement(OROR)('||') PsiWhiteSpace(' ') PREFIX_EXPRESSION PsiElement(EXCL)('!') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('up') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('up') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('isEmpty') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('isEmpty') PsiWhiteSpace('\n\n\n ') FUN MODIFIER_LIST @@ -2150,7 +2335,8 @@ JetFile: BinaryTree.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkVersion') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkVersion') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -2161,7 +2347,8 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('lastNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lastNode') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -2174,7 +2361,8 @@ JetFile: BinaryTree.jet PsiElement(throw)('throw') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('IterationException') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IterationException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -2183,29 +2371,35 @@ JetFile: BinaryTree.jet PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('remove') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('remove') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('lastNode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lastNode') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('BinaryTree') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('BinaryTree') PsiElement(DOT)('.') PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -2231,17 +2425,20 @@ JetFile: BinaryTree.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('BinaryTree') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('BinaryTree') PsiElement(DOT)('.') PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -2253,7 +2450,8 @@ JetFile: BinaryTree.jet PsiElement(throw)('throw') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('ConcurrentModificationException') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ConcurrentModificationException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/examples/BitArith.txt b/idea/testData/psi/examples/BitArith.txt index 171e94c862f..f95c1cf7059 100644 --- a/idea/testData/psi/examples/BitArith.txt +++ b/idea/testData/psi/examples/BitArith.txt @@ -26,7 +26,8 @@ JetFile: BitArith.jet PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('shl') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') @@ -59,16 +60,19 @@ JetFile: BitArith.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('or') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('oneBit') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('oneBit') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n') FUN @@ -102,21 +106,25 @@ JetFile: BitArith.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('and') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('not') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('not') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT CALL_EXPRESSION - PsiElement(IDENTIFIER)('oneBit') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('oneBit') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') @@ -152,16 +160,19 @@ JetFile: BitArith.jet PsiWhiteSpace(' ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('and') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('oneBit') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('oneBit') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') @@ -204,11 +215,13 @@ JetFile: BitArith.jet TUPLE PsiElement(LPAR)('(') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('shr') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('shl') @@ -258,7 +271,8 @@ JetFile: BitArith.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') @@ -272,12 +286,14 @@ JetFile: BitArith.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace(' ') PsiElement(PLUSEQ)('+=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('and') PsiWhiteSpace(' ') @@ -285,12 +301,14 @@ JetFile: BitArith.jet PsiElement(INTEGER_LITERAL)('1') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('ushr') PsiWhiteSpace(' ') @@ -299,7 +317,8 @@ JetFile: BitArith.jet PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -328,20 +347,24 @@ JetFile: BitArith.jet PsiElement(LPAR)('(') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('and') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('oneBit') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('oneBit') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bits') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bits') PsiWhiteSpace(' ') PsiElement(MINUS)('-') PsiWhiteSpace(' ') @@ -357,7 +380,8 @@ JetFile: BitArith.jet PsiWhiteSpace(' ') PsiElement(as)('as') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('Int') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Int') PsiWhiteSpace('\n\n') FUN PsiElement(fun)('fun') @@ -385,7 +409,8 @@ JetFile: BitArith.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -402,22 +427,26 @@ JetFile: BitArith.jet ELSE BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('mostSignificantBit') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mostSignificantBit') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('countOnes') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('countOnes') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('shl') PsiWhiteSpace(' ') @@ -455,11 +484,13 @@ JetFile: BitArith.jet PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('and') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('mask') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mask') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('mask') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mask') PsiWhiteSpace('\n\n') CLASS MODIFIER_LIST diff --git a/idea/testData/psi/examples/Builder.txt b/idea/testData/psi/examples/Builder.txt index 51253d4535e..574b2b8c655 100644 --- a/idea/testData/psi/examples/Builder.txt +++ b/idea/testData/psi/examples/Builder.txt @@ -35,14 +35,16 @@ JetFile: Builder.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('library') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('library') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('classpath') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('classpath') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -63,7 +65,8 @@ JetFile: Builder.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('library') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('library') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') @@ -85,20 +88,24 @@ JetFile: Builder.jet PsiElement(STRING_LITERAL)('"$gantHome/lib"') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('files') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('files') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('each') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('each') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('classpath') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('classpath') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -116,14 +123,16 @@ JetFile: Builder.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('module') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('module') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('targetLevel') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('targetLevel') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -131,23 +140,28 @@ JetFile: Builder.jet PsiElement(STRING_LITERAL)('"1.5"') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('classpath') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('classpath') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('antLayout') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('antLayout') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('gant') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('gant') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('groovy') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('groovy') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('src') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('src') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -159,7 +173,8 @@ JetFile: Builder.jet PsiWhiteSpace('\n\n') PsiElement(RBRACE)('}') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('build') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('build') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -372,9 +387,11 @@ JetFile: Builder.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('lib') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lib') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('initializer') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('initializer') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -382,7 +399,8 @@ JetFile: Builder.jet RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('lib') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lib') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') diff --git a/idea/testData/psi/examples/FunctionsAndTypes.txt b/idea/testData/psi/examples/FunctionsAndTypes.txt index 9176aa595bf..9d277bb37d0 100644 --- a/idea/testData/psi/examples/FunctionsAndTypes.txt +++ b/idea/testData/psi/examples/FunctionsAndTypes.txt @@ -437,11 +437,13 @@ JetFile: FunctionsAndTypes.jet PsiWhiteSpace(' ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('something') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('something') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('t') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(RPAR)(')') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') @@ -472,11 +474,13 @@ JetFile: FunctionsAndTypes.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('something') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('something') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('t') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') PROPERTY @@ -504,11 +508,13 @@ JetFile: FunctionsAndTypes.jet PsiWhiteSpace(' ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('something') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('something') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('t') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(RPAR)(')') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') @@ -537,11 +543,13 @@ JetFile: FunctionsAndTypes.jet PsiWhiteSpace(' ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('something') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('something') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(RPAR)(')') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') @@ -561,11 +569,13 @@ JetFile: FunctionsAndTypes.jet PsiWhiteSpace(' ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('something') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('something') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('t') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(RPAR)(')') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') @@ -580,11 +590,13 @@ JetFile: FunctionsAndTypes.jet PsiElement(LBRACE)('{') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('something') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('something') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(RPAR)(')') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -618,7 +630,8 @@ JetFile: FunctionsAndTypes.jet PsiElement(LBRACE)('{') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('X') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('X') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/examples/Graph.txt b/idea/testData/psi/examples/Graph.txt index c9b54c9221d..24e72752ea0 100644 --- a/idea/testData/psi/examples/Graph.txt +++ b/idea/testData/psi/examples/Graph.txt @@ -194,7 +194,8 @@ JetFile: Graph.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('mutableEdges') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mutableEdges') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') PROPERTY @@ -227,7 +228,8 @@ JetFile: Graph.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('mutableVertices') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mutableVertices') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n\n ') FUN @@ -273,9 +275,11 @@ JetFile: Graph.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('mutableEdges') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mutableEdges') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -288,15 +292,18 @@ JetFile: Graph.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('to') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('to') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -327,9 +334,11 @@ JetFile: Graph.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('mutableEdges') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mutableEdges') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -342,15 +351,18 @@ JetFile: Graph.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('to') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('to') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -388,31 +400,39 @@ JetFile: Graph.jet DOT_QIALIFIED_EXPRESSION CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('edges') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('edges') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('filter') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('filter') FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('v') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('v') PsiElement(RBRACE)('}') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('map') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('map') FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('to') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('to') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('// type is IIterable>') @@ -482,26 +502,32 @@ JetFile: Graph.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('vertices') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('vertices') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foreach') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foreach') FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('dfs') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('dfs') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('visited') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('visited') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('handler') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('handler') PsiElement(RPAR)(')') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -586,13 +612,16 @@ JetFile: Graph.jet PsiElement(EXCL)('!') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('visited') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('visited') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') @@ -601,41 +630,50 @@ JetFile: Graph.jet PsiElement(return)('return') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('handler') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('handler') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('neighbours') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('neighbours') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foreach') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foreach') FUNCTION_LITERAL PsiElement(LBRACE)('{') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('dfs') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('dfs') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('visited') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('visited') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('handler') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('handler') PsiElement(RPAR)(')') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -726,9 +764,11 @@ JetFile: Graph.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('vertices') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('vertices') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foreach') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foreach') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') @@ -743,13 +783,16 @@ JetFile: Graph.jet PsiElement(EXCL)('!') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('visited') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('visited') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') @@ -759,13 +802,16 @@ JetFile: Graph.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('pending') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pending') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('push') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('push') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') WHILE @@ -776,9 +822,11 @@ JetFile: Graph.jet PREFIX_EXPRESSION PsiElement(EXCL)('!') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('pending') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pending') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('isEmpty') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('isEmpty') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -795,33 +843,40 @@ JetFile: Graph.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('pending') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pending') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('pop') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pop') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('handler') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('handler') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(RPAR)(')') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('neighbours') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('neighbours') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foreach') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foreach') PsiWhiteSpace(' ') FUNCTION_LITERAL PsiElement(LBRACE)('{') @@ -839,13 +894,16 @@ JetFile: Graph.jet CONDITION CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('visited') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('visited') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('n') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('n') PsiElement(RPAR)(')') PsiElement(RPAR)(')') PsiWhiteSpace(' ') @@ -856,13 +914,16 @@ JetFile: Graph.jet BODY CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('pending') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pending') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('push') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('push') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('n') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('n') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') diff --git a/idea/testData/psi/examples/LINQ.txt b/idea/testData/psi/examples/LINQ.txt index 7feca5659f9..70acc89ba38 100644 --- a/idea/testData/psi/examples/LINQ.txt +++ b/idea/testData/psi/examples/LINQ.txt @@ -16,7 +16,8 @@ JetFile: LINQ.jet BINARY_EXPRESSION BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('l') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('l') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('filter') PsiWhiteSpace(' ') @@ -24,9 +25,11 @@ JetFile: LINQ.jet PsiElement(LBRACE)('{') BODY DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('map') @@ -35,9 +38,11 @@ JetFile: LINQ.jet PsiElement(LBRACE)('{') BODY DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('aggregate') @@ -58,11 +63,13 @@ JetFile: LINQ.jet PsiWhiteSpace(' ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACE)('}') 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 c9c0b4403d4..8ed6e1c1c05 100644 --- a/idea/testData/psi/examples/PolymorphicClassObjects.txt +++ b/idea/testData/psi/examples/PolymorphicClassObjects.txt @@ -313,9 +313,11 @@ JetFile: PolymorphicClassObjects.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('T') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('newBuilder') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('newBuilder') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -339,25 +341,30 @@ JetFile: PolymorphicClassObjects.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('builder') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('builder') PsiWhiteSpace(' ') PsiElement(PLUSEQ)('+=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('f') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('e') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('e') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('builder') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('builder') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') diff --git a/idea/testData/psi/examples/Queue.txt b/idea/testData/psi/examples/Queue.txt index 36499d2525c..8b81f125b02 100644 --- a/idea/testData/psi/examples/Queue.txt +++ b/idea/testData/psi/examples/Queue.txt @@ -161,7 +161,8 @@ JetFile: Queue.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') IF @@ -170,7 +171,8 @@ JetFile: Queue.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -184,18 +186,22 @@ JetFile: Queue.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') @@ -208,20 +214,25 @@ JetFile: Queue.jet BODY BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -248,7 +259,8 @@ JetFile: Queue.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -285,19 +297,24 @@ JetFile: Queue.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace('\n ') IF PsiElement(if)('if') @@ -305,7 +322,8 @@ JetFile: Queue.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -315,14 +333,16 @@ JetFile: Queue.jet PsiWhiteSpace('\n ') THEN BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') NULL PsiElement(null)('null') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -342,7 +362,8 @@ JetFile: Queue.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/Stack.txt b/idea/testData/psi/examples/Stack.txt index 857e27c1122..029ac72201c 100644 --- a/idea/testData/psi/examples/Stack.txt +++ b/idea/testData/psi/examples/Stack.txt @@ -80,13 +80,16 @@ JetFile: Stack.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('// Problem: I would like to write push(...) = data.add(...), but the types do not match') @@ -110,9 +113,11 @@ JetFile: Stack.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('removeLast') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('removeLast') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -133,8 +138,10 @@ JetFile: Stack.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('isEmpty') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('isEmpty') PsiWhiteSpace('\n\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/UnionFind.txt b/idea/testData/psi/examples/UnionFind.txt index 67ebaf6df76..bf5f7509866 100644 --- a/idea/testData/psi/examples/UnionFind.txt +++ b/idea/testData/psi/examples/UnionFind.txt @@ -21,7 +21,8 @@ JetFile: UnionFind.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('IMutableList') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IMutableList') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -59,22 +60,28 @@ JetFile: UnionFind.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -116,10 +123,12 @@ JetFile: UnionFind.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') @@ -129,11 +138,13 @@ JetFile: UnionFind.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('p') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('p') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -144,7 +155,8 @@ JetFile: UnionFind.jet RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -157,25 +169,30 @@ JetFile: UnionFind.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('p') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('p') PsiElement(RPAR)(')') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -219,11 +236,13 @@ JetFile: UnionFind.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -234,11 +253,13 @@ JetFile: UnionFind.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') IF @@ -247,11 +268,13 @@ JetFile: UnionFind.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('pa') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pa') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('pb') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pb') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -267,14 +290,17 @@ JetFile: UnionFind.jet DOT_QIALIFIED_EXPRESSION CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('Random') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Random') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('nextInt') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('nextInt') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('isOdd') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('isOdd') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -284,15 +310,18 @@ JetFile: UnionFind.jet BODY BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('pb') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pb') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('pa') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pa') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') @@ -305,15 +334,18 @@ JetFile: UnionFind.jet BODY BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('pa') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pa') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('pb') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('pb') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') diff --git a/idea/testData/psi/examples/UpdateOperation.txt b/idea/testData/psi/examples/UpdateOperation.txt index 25825fcb9e4..d1d7f182b18 100644 --- a/idea/testData/psi/examples/UpdateOperation.txt +++ b/idea/testData/psi/examples/UpdateOperation.txt @@ -70,9 +70,11 @@ JetFile: UpdateOperation.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_PARAMETER @@ -87,9 +89,11 @@ JetFile: UpdateOperation.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('y') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('y') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -103,11 +107,13 @@ JetFile: UpdateOperation.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('x') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('x') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('y') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('y') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -150,13 +156,16 @@ JetFile: UpdateOperation.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('Point') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Point') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Copy') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Copy') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('p') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('p') PsiElement(COMMA)(',') PsiWhiteSpace(' ') NAMED_ARGUMENT @@ -177,13 +186,16 @@ JetFile: UpdateOperation.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('Point') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Point') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Copy') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Copy') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('p1') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('p1') PsiElement(COMMA)(',') PsiWhiteSpace(' ') NAMED_ARGUMENT @@ -206,13 +218,16 @@ JetFile: UpdateOperation.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('Point') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Point') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Copy') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Copy') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('p') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('p') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') PsiComment(EOL_COMMENT)('// Such copy(...) methods can be automatically generated by the compiler') diff --git a/idea/testData/psi/examples/With.txt b/idea/testData/psi/examples/With.txt index 951eacd738e..8e016aa9a85 100644 --- a/idea/testData/psi/examples/With.txt +++ b/idea/testData/psi/examples/With.txt @@ -58,9 +58,11 @@ JetFile: With.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('receiver') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('receiver') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('body') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('body') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -79,20 +81,25 @@ JetFile: With.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('with') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('with') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('java') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('java') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lang') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('System') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('System') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('out') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('out') PsiElement(RPAR)(')') PsiWhiteSpace(' ') FUNCTION_LITERAL @@ -100,7 +107,8 @@ JetFile: With.jet PsiWhiteSpace('\n ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('println') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('println') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -110,7 +118,8 @@ JetFile: With.jet PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('print') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('print') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -124,16 +133,19 @@ JetFile: With.jet CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('System') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('System') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('out') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('out') PsiElement(DOT)('.') FUNCTION_LITERAL PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('println') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('println') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -143,7 +155,8 @@ JetFile: With.jet PsiElement(SEMICOLON)(';') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('print') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('print') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT diff --git a/idea/testData/psi/examples/collections/ArrayList.txt b/idea/testData/psi/examples/collections/ArrayList.txt index 8ccfa718b3d..8663e98557d 100644 --- a/idea/testData/psi/examples/collections/ArrayList.txt +++ b/idea/testData/psi/examples/collections/ArrayList.txt @@ -38,7 +38,8 @@ JetFile: ArrayList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('MutableArray') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('MutableArray') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -100,7 +101,8 @@ JetFile: ArrayList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('mutableIterator') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('mutableIterator') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -172,7 +174,8 @@ JetFile: ArrayList.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiWhiteSpace('\n\n ') FUN MODIFIER_LIST @@ -196,11 +199,13 @@ JetFile: ArrayList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('myVersion') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('myVersion') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -236,7 +241,8 @@ JetFile: ArrayList.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkVersion') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkVersion') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -246,7 +252,8 @@ JetFile: ArrayList.jet PsiWhiteSpace(' ') PsiElement(LPAR)('(') CONDITION - PsiElement(IDENTIFIER)('hasNext') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hasNext') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -264,11 +271,13 @@ JetFile: ArrayList.jet PsiElement(RPAR)(')') PsiWhiteSpace('\n ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(PLUSPLUS)('++') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n ') @@ -290,11 +299,13 @@ JetFile: ArrayList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiWhiteSpace('\n\n\n ') FUN MODIFIER_LIST @@ -313,7 +324,8 @@ JetFile: ArrayList.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkVersion') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkVersion') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -328,16 +340,19 @@ JetFile: ArrayList.jet CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('ArrayList') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ArrayList') PsiElement(DOT)('.') PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('remove') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('remove') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace(' ') PsiElement(MINUS)('-') PsiWhiteSpace(' ') @@ -346,13 +361,16 @@ JetFile: ArrayList.jet PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('myVersion') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('myVersion') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('version') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('version') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -383,18 +401,22 @@ JetFile: ArrayList.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkIndex') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkIndex') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -429,11 +451,13 @@ JetFile: ArrayList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace(' ') PsiElement(GT)('>') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -449,7 +473,8 @@ JetFile: ArrayList.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -470,7 +495,8 @@ JetFile: ArrayList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -492,7 +518,8 @@ JetFile: ArrayList.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiWhiteSpace('\n\n\n ') FUN MODIFIER_LIST @@ -529,11 +556,13 @@ JetFile: ArrayList.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkIndex') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkIndex') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -544,25 +573,31 @@ JetFile: ArrayList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n ') BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -601,12 +636,14 @@ JetFile: ArrayList.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('ensureSize') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ensureSize') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') @@ -620,11 +657,13 @@ JetFile: ArrayList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -634,17 +673,20 @@ JetFile: ArrayList.jet BODY BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiElement(PLUSPLUS)('++') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') @@ -657,11 +699,13 @@ JetFile: ArrayList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -681,12 +725,14 @@ JetFile: ArrayList.jet LOOP_RANGE BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiElement(MINUS)('-') INTEGER_CONSTANT PsiElement(INTEGER_LITERAL)('1') PsiElement(RANGE)('..') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('// backwards, special operator... Need to optimize this to be a real indexed loop') @@ -694,11 +740,13 @@ JetFile: ArrayList.jet BODY BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') @@ -709,26 +757,32 @@ JetFile: ArrayList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n ') BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -740,11 +794,13 @@ JetFile: ArrayList.jet PsiElement(throw)('throw') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('IndexOutOfBoundsException') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IndexOutOfBoundsException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -784,10 +840,12 @@ JetFile: ArrayList.jet PsiWhiteSpace(' ') LOOP_RANGE BINARY_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RANGE)('..') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('used') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('used') PsiElement(MINUS)('-') INTEGER_CONSTANT PsiElement(INTEGER_LITERAL)('1') @@ -796,20 +854,24 @@ JetFile: ArrayList.jet BODY BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/collections/HashMap.txt b/idea/testData/psi/examples/collections/HashMap.txt index 5fb63f4dcfb..77f4368beba 100644 --- a/idea/testData/psi/examples/collections/HashMap.txt +++ b/idea/testData/psi/examples/collections/HashMap.txt @@ -50,29 +50,37 @@ JetFile: HashMap.jet PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('java') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('java') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lang') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Object') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('equals') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('equals') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('other') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('other') PsiWhiteSpace(' ') PsiElement(as)('as') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('java') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('java') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lang') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Object') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') @@ -127,14 +135,18 @@ JetFile: HashMap.jet PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('java') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('java') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lang') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('Object') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('hashCode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hashCode') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -497,13 +509,16 @@ JetFile: HashMap.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('equals') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('equals') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') FUN @@ -536,9 +551,11 @@ JetFile: HashMap.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('hashCode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hashCode') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -612,18 +629,22 @@ JetFile: HashMap.jet DOT_QIALIFIED_EXPRESSION CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('hashable') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hashable') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('equals') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('equals') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') FUN @@ -658,14 +679,17 @@ JetFile: HashMap.jet DOT_QIALIFIED_EXPRESSION CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('hashable') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hashable') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('hashCode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hashCode') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -738,14 +762,17 @@ JetFile: HashMap.jet DOT_QIALIFIED_EXPRESSION CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('hashable') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hashable') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('hashCode') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hashCode') PsiWhiteSpace('\n ') FUN MODIFIER_LIST @@ -790,16 +817,19 @@ JetFile: HashMap.jet BINARY_EXPRESSION CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('hashable') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hashable') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace('\n\n ') PsiComment(EOL_COMMENT)('// everything else uses these equals() and hashCode()... ') PsiWhiteSpace('\n\n') diff --git a/idea/testData/psi/examples/collections/IIterator.txt b/idea/testData/psi/examples/collections/IIterator.txt index 794732de7c4..4a0ad5e50ad 100644 --- a/idea/testData/psi/examples/collections/IIterator.txt +++ b/idea/testData/psi/examples/collections/IIterator.txt @@ -88,11 +88,13 @@ JetFile: IIterator.jet PsiElement(return)('return') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('fillBuffer') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('fillBuffer') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('buffer') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('buffer') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT @@ -102,9 +104,11 @@ JetFile: IIterator.jet PsiWhiteSpace(' ') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('buffer') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('buffer') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -176,7 +180,8 @@ JetFile: IIterator.jet BINARY_EXPRESSION BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') @@ -186,19 +191,23 @@ JetFile: IIterator.jet PsiElement(OROR)('||') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiWhiteSpace(' ') PsiElement(GT)('>') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('buffer') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('buffer') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lastIndex') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lastIndex') PsiWhiteSpace(' ') PsiElement(OROR)('||') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('length') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('length') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') @@ -208,19 +217,23 @@ JetFile: IIterator.jet PsiElement(OROR)('||') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('length') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('length') PsiWhiteSpace(' ') PsiElement(GT)('>') PsiWhiteSpace(' ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('buffer') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('buffer') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiWhiteSpace(' ') PsiElement(MINUS)('-') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -232,7 +245,8 @@ JetFile: IIterator.jet PsiElement(throw)('throw') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('IndexOutOfBoundsException') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IndexOutOfBoundsException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -246,7 +260,8 @@ JetFile: IIterator.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('len') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('len') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -283,17 +298,20 @@ JetFile: IIterator.jet PsiWhiteSpace(' ') LOOP_RANGE BINARY_EXPRESSION - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiWhiteSpace(' ') PsiElement(RANGE)('..') PsiWhiteSpace(' ') BINARY_EXPRESSION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiWhiteSpace(' ') PsiElement(PLUS)('+') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('length') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('length') PsiWhiteSpace(' ') PsiElement(MINUS)('-') PsiWhiteSpace(' ') @@ -313,33 +331,39 @@ JetFile: IIterator.jet CONDITION PREFIX_EXPRESSION PsiElement(EXCL)('!') - PsiElement(IDENTIFIER)('hasNext') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('hasNext') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('count') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('count') PsiWhiteSpace('\n ') BINARY_EXPRESSION ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('buffer') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('buffer') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('count') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('count') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -347,7 +371,8 @@ JetFile: IIterator.jet RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('count') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('count') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n') diff --git a/idea/testData/psi/examples/collections/LinkedList.txt b/idea/testData/psi/examples/collections/LinkedList.txt index f9e1020f932..031de1793bb 100644 --- a/idea/testData/psi/examples/collections/LinkedList.txt +++ b/idea/testData/psi/examples/collections/LinkedList.txt @@ -167,15 +167,18 @@ JetFile: LinkedList.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(PLUSPLUS)('++') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkIndex') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkIndex') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -186,11 +189,13 @@ JetFile: LinkedList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('Item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Item') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') IF @@ -199,7 +204,8 @@ JetFile: LinkedList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -214,20 +220,25 @@ JetFile: LinkedList.jet BODY BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('newItem') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('newItem') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('newItem') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('newItem') PsiWhiteSpace('\n ') IF PsiElement(if)('if') @@ -235,7 +246,8 @@ JetFile: LinkedList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQEQEQ)('===') PsiWhiteSpace(' ') @@ -249,11 +261,13 @@ JetFile: LinkedList.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -274,35 +288,44 @@ JetFile: LinkedList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('itemAt') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('itemAt') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('newItem') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('newItem') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('insertAfter') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('insertAfter') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace('\n ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('insertAfter') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('insertAfter') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('newItem') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('newItem') PsiWhiteSpace('\n ') IF PsiElement(if)('if') @@ -310,11 +333,13 @@ JetFile: LinkedList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQEQEQ)('===') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('insertAfter') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('insertAfter') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -323,11 +348,13 @@ JetFile: LinkedList.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('newItem') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('newItem') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -365,7 +392,8 @@ JetFile: LinkedList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace(' ') PsiElement(NOT_IN)('!in') PsiWhiteSpace(' ') @@ -374,7 +402,8 @@ JetFile: LinkedList.jet PsiElement(INTEGER_LITERAL)('0') PsiElement(RANGE)('..') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(MINUS)('-') INTEGER_CONSTANT PsiElement(INTEGER_LITERAL)('1') @@ -389,11 +418,13 @@ JetFile: LinkedList.jet PsiElement(throw)('throw') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('IndexOutOfBoundsException') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IndexOutOfBoundsException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -431,11 +462,13 @@ JetFile: LinkedList.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkIndex') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkIndex') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -446,11 +479,13 @@ JetFile: LinkedList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('itemAt') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('itemAt') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') IF @@ -459,11 +494,13 @@ JetFile: LinkedList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiWhiteSpace(' ') PsiElement(EQEQEQ)('===') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -472,14 +509,17 @@ JetFile: LinkedList.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace('\n ') IF PsiElement(if)('if') @@ -487,7 +527,8 @@ JetFile: LinkedList.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace(' ') PsiElement(EQEQEQ)('===') PsiWhiteSpace(' ') @@ -497,7 +538,8 @@ JetFile: LinkedList.jet PsiWhiteSpace('\n ') THEN BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiElement(EQ)('=') PsiWhiteSpace(' ') NULL @@ -515,18 +557,23 @@ JetFile: LinkedList.jet BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('previous') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('previous') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace('\n ') IF PsiElement(if)('if') @@ -535,9 +582,11 @@ JetFile: LinkedList.jet CONDITION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EQEQEQ)('===') PsiWhiteSpace(' ') @@ -553,18 +602,23 @@ JetFile: LinkedList.jet BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('previous') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('previous') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('previous') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('previous') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace(' ') @@ -576,30 +630,36 @@ JetFile: LinkedList.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('previous') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('previous') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') POSTFIX_EXPRESSION - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(MINUSMINUS)('--') PsiWhiteSpace('\n ') RETURN PsiElement(return)('return') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -644,11 +704,13 @@ JetFile: LinkedList.jet PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('checkIndex') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('checkIndex') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -659,11 +721,13 @@ JetFile: LinkedList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('itemAt') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('itemAt') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -674,24 +738,30 @@ JetFile: LinkedList.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -726,7 +796,8 @@ JetFile: LinkedList.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('head') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('head') PsiWhiteSpace('\n ') FOR PsiElement(for)('for') @@ -742,7 +813,8 @@ JetFile: LinkedList.jet INTEGER_CONSTANT PsiElement(INTEGER_LITERAL)('1') PsiElement(RANGE)('..') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -751,21 +823,25 @@ JetFile: LinkedList.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') diff --git a/idea/testData/psi/examples/collections/List.txt b/idea/testData/psi/examples/collections/List.txt index f91bf0e9c8a..5a341cf6445 100644 --- a/idea/testData/psi/examples/collections/List.txt +++ b/idea/testData/psi/examples/collections/List.txt @@ -131,9 +131,11 @@ JetFile: List.jet PsiElement(PLUS)('+') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n ') PROPERTY @@ -157,7 +159,8 @@ JetFile: List.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('theSize') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('theSize') PsiWhiteSpace('\n\n\n ') PROPERTY MODIFIER_LIST @@ -185,7 +188,8 @@ JetFile: List.jet PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('Nil') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Nil') PsiWhiteSpace('\n\n\n ') FUN MODIFIER_LIST @@ -228,7 +232,8 @@ JetFile: List.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('List') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('List') PsiElement(DOT)('.') PsiElement(this)('this') PsiWhiteSpace('\n\n ') @@ -247,7 +252,8 @@ JetFile: List.jet BODY BINARY_EXPRESSION CALL_EXPRESSION - PsiElement(IDENTIFIER)('get') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('get') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -255,11 +261,13 @@ JetFile: List.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('Nil') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Nil') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n ') @@ -287,24 +295,30 @@ JetFile: List.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('tail') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('tail') PsiWhiteSpace('\n ') RETURN PsiElement(return)('return') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('result') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('result') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') diff --git a/idea/testData/psi/examples/io/IOSamples.txt b/idea/testData/psi/examples/io/IOSamples.txt index b622dad9775..facc5361a89 100644 --- a/idea/testData/psi/examples/io/IOSamples.txt +++ b/idea/testData/psi/examples/io/IOSamples.txt @@ -107,7 +107,8 @@ JetFile: IOSamples.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('closeable') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('closeable') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') FUN @@ -166,19 +167,23 @@ JetFile: IOSamples.jet PsiElement(in)('in') PsiWhiteSpace(' ') LOOP_RANGE - PsiElement(IDENTIFIER)('from') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('from') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('t') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') @@ -278,7 +283,8 @@ JetFile: IOSamples.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('stream') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('stream') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK @@ -287,16 +293,19 @@ JetFile: IOSamples.jet PsiComment(EOL_COMMENT)('// implicitly throws IOException') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('stream') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('stream') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('FileInputStream') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('FileInputStream') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('file') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('file') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('// throws IOException') @@ -326,7 +335,8 @@ JetFile: IOSamples.jet CONDITION PREFIX_EXPRESSION PsiElement(EXCL)('!') - PsiElement(IDENTIFIER)('nextUsed') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('nextUsed') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -335,7 +345,8 @@ JetFile: IOSamples.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('nextUsed') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('nextUsed') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -346,11 +357,13 @@ JetFile: IOSamples.jet PsiElement(return)('return') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(as)('as') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('Byte') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Byte') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -383,12 +396,14 @@ JetFile: IOSamples.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('nextUsed') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('nextUsed') PsiWhiteSpace(' ') PsiElement(ANDAND)('&&') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') @@ -404,7 +419,8 @@ JetFile: IOSamples.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('nextUsed') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('nextUsed') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') @@ -412,15 +428,18 @@ JetFile: IOSamples.jet PsiElement(false)('false') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('stream') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('stream') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('read') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('read') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -433,7 +452,8 @@ JetFile: IOSamples.jet PsiElement(return)('return') PsiWhiteSpace(' ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('next') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('next') PsiWhiteSpace(' ') PsiElement(EXCLEQ)('!=') PsiWhiteSpace(' ') @@ -514,23 +534,27 @@ JetFile: IOSamples.jet VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('stream') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('stream') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BLOCK PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('stream') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('stream') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('FileOutputStream') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('FileOutputStream') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('file') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('file') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -561,13 +585,16 @@ JetFile: IOSamples.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('stream') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('stream') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('write') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('write') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -616,21 +643,25 @@ JetFile: IOSamples.jet PsiComment(EOL_COMMENT)('//= ...') PsiWhiteSpace('\n\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('streamCopy') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('streamCopy') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT CALL_EXPRESSION - PsiElement(IDENTIFIER)('FileInput') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('FileInput') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('f1') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f1') PsiElement(RPAR)(')') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('f2') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('f2') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiComment(EOL_COMMENT)('// throws IOException, you must catch or rethrow explicitly') diff --git a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt index 8839cdc39c8..fb4c74a64f9 100644 --- a/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt +++ b/idea/testData/psi/examples/priorityqueues/BinaryHeap.txt @@ -105,7 +105,8 @@ JetFile: BinaryHeap.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('naturalOrder') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('naturalOrder') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -121,26 +122,31 @@ JetFile: BinaryHeap.jet DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') PsiWhiteSpace('\n ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('ArrayList') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ArrayList') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(RPAR)(')') PsiWhiteSpace('\n') PsiComment(EOL_COMMENT)('// siftDown(* this.data.size / 2 .. 0)') @@ -160,9 +166,11 @@ JetFile: BinaryHeap.jet BINARY_EXPRESSION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiWhiteSpace(' ') PsiElement(DIV)('/') PsiWhiteSpace(' ') @@ -181,11 +189,13 @@ JetFile: BinaryHeap.jet PsiWhiteSpace('\n ') BODY CALL_EXPRESSION - PsiElement(IDENTIFIER)('siftDown') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('siftDown') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('i') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('i') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -219,22 +229,26 @@ JetFile: BinaryHeap.jet DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') PsiWhiteSpace('\n ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('ArrayList') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ArrayList') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -254,28 +268,33 @@ JetFile: BinaryHeap.jet DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('ArrayList') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ArrayList') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('Assert') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Assert') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('T') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('T') PsiWhiteSpace(' ') PsiElement(is)('is') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('IComparable') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('IComparable') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -288,12 +307,14 @@ JetFile: BinaryHeap.jet DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('comparator') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('comparator') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('naturalOrder') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('naturalOrder') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -333,7 +354,8 @@ JetFile: BinaryHeap.jet DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('isEmpty') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('isEmpty') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') THEN @@ -341,16 +363,19 @@ JetFile: BinaryHeap.jet PsiElement(throw)('throw') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('UnderflowException') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('UnderflowException') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('swap') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('swap') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -360,27 +385,34 @@ JetFile: BinaryHeap.jet PsiWhiteSpace(' ') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lastIndex') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lastIndex') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('remove') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('remove') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lastIndex') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lastIndex') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('siftDown') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('siftDown') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -416,24 +448,30 @@ JetFile: BinaryHeap.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('siftUp') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('siftUp') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('lastItem') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('lastItem') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -469,7 +507,8 @@ JetFile: BinaryHeap.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace('\n ') WHILE PsiElement(while)('while') @@ -478,11 +517,14 @@ JetFile: BinaryHeap.jet CONDITION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('exists') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('exists') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -497,7 +539,8 @@ JetFile: BinaryHeap.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiWhiteSpace('\n ') IF PsiElement(if)('if') @@ -507,18 +550,23 @@ JetFile: BinaryHeap.jet BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -527,14 +575,17 @@ JetFile: BinaryHeap.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('left') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('left') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -546,29 +597,37 @@ JetFile: BinaryHeap.jet BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('exists') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('exists') PsiWhiteSpace(' ') PsiElement(ANDAND)('&&') PsiWhiteSpace(' ') BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -577,14 +636,17 @@ JetFile: BinaryHeap.jet PsiWhiteSpace('\n ') BODY BINARY_EXPRESSION - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('right') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('right') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -594,11 +656,13 @@ JetFile: BinaryHeap.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -607,25 +671,31 @@ JetFile: BinaryHeap.jet PsiWhiteSpace('\n ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('swap') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('swap') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('min') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('min') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -663,9 +733,11 @@ JetFile: BinaryHeap.jet PREFIX_EXPRESSION PsiElement(EXCL)('!') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('exists') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('exists') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -679,7 +751,8 @@ JetFile: BinaryHeap.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('index') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('index') PsiWhiteSpace('\n ') WHILE PsiElement(while)('while') @@ -688,11 +761,14 @@ JetFile: BinaryHeap.jet CONDITION DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('exists') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('exists') PsiElement(RPAR)(')') PsiWhiteSpace(' ') BODY @@ -707,19 +783,24 @@ JetFile: BinaryHeap.jet CONDITION BINARY_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('value') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('value') PsiElement(RPAR)(')') PsiWhiteSpace(' ') THEN @@ -729,31 +810,39 @@ JetFile: BinaryHeap.jet BODY CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('swap') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('swap') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('current') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('current') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('parent') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('parent') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n ') @@ -894,9 +983,11 @@ JetFile: BinaryHeap.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('foo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('foo') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('bar') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('bar') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -909,7 +1000,8 @@ JetFile: BinaryHeap.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') ARRAY_ACCESS_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') INDICES PsiElement(LBRACKET)('[') PsiElement(this)('this') @@ -931,7 +1023,8 @@ JetFile: BinaryHeap.jet PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('it') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('it') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n\n ') @@ -962,9 +1055,11 @@ JetFile: BinaryHeap.jet PsiElement(LT)('<') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('data') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('data') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiElement(RPAR)(')') PsiWhiteSpace(' ') PsiElement(ANDAND)('&&') @@ -1034,7 +1129,8 @@ JetFile: BinaryHeap.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('compare') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compare') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT @@ -1042,7 +1138,8 @@ JetFile: BinaryHeap.jet PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('other') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('other') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PsiElement(RBRACE)('}') @@ -1101,7 +1198,8 @@ JetFile: BinaryHeap.jet PsiElement(this)('this') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n ') BINARY_EXPRESSION @@ -1109,7 +1207,8 @@ JetFile: BinaryHeap.jet PsiElement(this)('this') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') @@ -1118,7 +1217,8 @@ JetFile: BinaryHeap.jet PsiElement(this)('this') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n ') BINARY_EXPRESSION @@ -1126,12 +1226,14 @@ JetFile: BinaryHeap.jet PsiElement(this)('this') INDICES PsiElement(LBRACKET)('[') - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RBRACKET)(']') PsiWhiteSpace(' ') PsiElement(EQ)('=') PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('t') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('t') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') PsiWhiteSpace('\n\n') @@ -1167,7 +1269,8 @@ JetFile: BinaryHeap.jet DOT_QIALIFIED_EXPRESSION PsiElement(this)('this') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('size') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('size') PsiWhiteSpace(' ') PsiElement(MINUS)('-') PsiWhiteSpace(' ') diff --git a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt index 4c1cc4e5300..672eae94950 100644 --- a/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt +++ b/idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt @@ -63,9 +63,11 @@ JetFile: PriorityQueueAsPushPop.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('wrapped') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('wrapped') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('extract') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('extract') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') PsiElement(RPAR)(')') @@ -95,13 +97,16 @@ JetFile: PriorityQueueAsPushPop.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('wrapped') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('wrapped') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('add') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('add') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('item') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('item') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') PROPERTY @@ -120,8 +125,10 @@ JetFile: PriorityQueueAsPushPop.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('wrapped') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('wrapped') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('isEmpty') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('isEmpty') PsiWhiteSpace('\n\n') PsiElement(RBRACE)('}') \ No newline at end of file diff --git a/idea/testData/psi/examples/util/Comparison.txt b/idea/testData/psi/examples/util/Comparison.txt index b8865cb47ac..25de18f2548 100644 --- a/idea/testData/psi/examples/util/Comparison.txt +++ b/idea/testData/psi/examples/util/Comparison.txt @@ -93,13 +93,16 @@ JetFile: Comparison.jet PsiWhiteSpace(' ') CALL_EXPRESSION DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('compareTo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compareTo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n\n') FUN @@ -143,12 +146,14 @@ JetFile: Comparison.jet TUPLE PsiElement(LPAR)('(') BINARY_EXPRESSION - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiWhiteSpace(' ') PsiElement(as)('as') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('Comparable') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparable') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -157,17 +162,20 @@ JetFile: Comparison.jet PsiElement(GT)('>') PsiElement(RPAR)(')') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('compareTo') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('compareTo') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT BINARY_EXPRESSION - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(as)('as') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('Comparable') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('Comparable') TYPE_ARGUMENT_LIST PsiElement(LT)('<') TYPE_REFERENCE @@ -309,15 +317,18 @@ JetFile: Comparison.jet PsiElement(EQ)('=') PsiWhiteSpace(' ') CALL_EXPRESSION - PsiElement(IDENTIFIER)('cmp') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('cmp') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('a') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('a') PsiElement(COMMA)(',') PsiWhiteSpace(' ') VALUE_ARGUMENT - PsiElement(IDENTIFIER)('b') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('b') PsiElement(RPAR)(')') PsiWhiteSpace('\n ') IF @@ -326,7 +337,8 @@ JetFile: Comparison.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('res') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('res') PsiWhiteSpace(' ') PsiElement(EQEQ)('==') PsiWhiteSpace(' ') @@ -339,9 +351,11 @@ JetFile: Comparison.jet PsiElement(return)('return') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('ComparisonResult') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ComparisonResult') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('EQ') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('EQ') PsiWhiteSpace('\n ') IF PsiElement(if)('if') @@ -349,7 +363,8 @@ JetFile: Comparison.jet PsiElement(LPAR)('(') CONDITION BINARY_EXPRESSION - PsiElement(IDENTIFIER)('res') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('res') PsiWhiteSpace(' ') PsiElement(LT)('<') PsiWhiteSpace(' ') @@ -362,16 +377,20 @@ JetFile: Comparison.jet PsiElement(return)('return') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('ComparisonResult') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ComparisonResult') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('LS') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('LS') PsiWhiteSpace('\n ') RETURN PsiElement(return)('return') PsiWhiteSpace(' ') DOT_QIALIFIED_EXPRESSION - PsiElement(IDENTIFIER)('ComparisonResult') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('ComparisonResult') PsiElement(DOT)('.') - PsiElement(IDENTIFIER)('GR') + REFERENCE_EXPRESSION + PsiElement(IDENTIFIER)('GR') PsiWhiteSpace('\n') PsiElement(RBRACE)('}') \ No newline at end of file