From dfc03a5f30ae1870285212b41d1c4b40f7a225cc Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Tue, 11 Jan 2011 18:02:02 +0300 Subject: [PATCH] User types are parsed hierarchically, i.e. (((java).lang).Object) instead of (java).(lang).(Object) --- .../jet/lang/parsing/JetParsing.java | 20 +-- idea/testData/psi/Attributes.txt | 78 +++++----- idea/testData/psi/Attributes_ERR.txt | 78 +++++----- idea/testData/psi/Decomposers.txt | 6 +- idea/testData/psi/Decomposers_ERR.txt | 18 +-- idea/testData/psi/FunctionTypes.txt | 136 +++++++++--------- idea/testData/psi/LocalDeclarations.txt | 6 +- idea/testData/psi/Match.txt | 6 +- idea/testData/psi/Properties.txt | 36 ++--- idea/testData/psi/Properties_ERR.txt | 12 +- idea/testData/psi/RootNamespace.txt | 32 ++--- .../psi/examples/collections/HashMap.txt | 36 ++--- idea/testData/psi/examples/io/IOSamples.txt | 12 +- 13 files changed, 235 insertions(+), 241 deletions(-) diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java index a0d6f20ea08..ab1f5d51c03 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -1261,27 +1261,21 @@ public class JetParsing extends AbstractJetParsing { * ; */ public void parseUserType() { + PsiBuilder.Marker type = mark(); if (at(NAMESPACE_KEYWORD)) { advance(); // NAMESPACE_KEYWORD expect(DOT, "Expecting '.'", TokenSet.create(IDENTIFIER)); } + while (true) { - parseSimpleUserType(); + expect(IDENTIFIER, "Type name expected", TokenSet.create(LT)); + parseTypeArgumentList(); + if (!at(DOT)) break; + type.done(USER_TYPE); + type = type.precede(); advance(); // DOT } - } - - /* - * simpleUserType - * : SimpleName ("<" (optionalProjection type){","} ">")? - * ; - */ - private void parseSimpleUserType() { - PsiBuilder.Marker type = mark(); - - expect(IDENTIFIER, "Type name expected", TokenSet.create(LT)); - parseTypeArgumentList(); type.done(USER_TYPE); } diff --git a/idea/testData/psi/Attributes.txt b/idea/testData/psi/Attributes.txt index a7bbee859fc..94232808336 100644 --- a/idea/testData/psi/Attributes.txt +++ b/idea/testData/psi/Attributes.txt @@ -71,38 +71,38 @@ JetFile: Attributes.jet PsiElement(COMMA)(',') ATTRIBUTE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('goo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('doo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('f') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE + USER_TYPE + USER_TYPE USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('goo') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('doo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('f') + PsiElement(GT)('>') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('bar') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('goo') + PsiElement(GT)('>') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') @@ -163,15 +163,15 @@ JetFile: Attributes.jet PsiWhiteSpace(' ') ATTRIBUTE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('b') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('f') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('b') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('f') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('c') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') diff --git a/idea/testData/psi/Attributes_ERR.txt b/idea/testData/psi/Attributes_ERR.txt index 540a0121f27..068337a2094 100644 --- a/idea/testData/psi/Attributes_ERR.txt +++ b/idea/testData/psi/Attributes_ERR.txt @@ -77,38 +77,38 @@ JetFile: Attributes_ERR.jet PsiElement(COMMA)(',') ATTRIBUTE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('goo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('doo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('f') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('foo') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE + USER_TYPE + USER_TYPE USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('goo') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('doo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('f') + PsiElement(GT)('>') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('foo') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('bar') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('goo') + PsiElement(GT)('>') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') @@ -191,15 +191,15 @@ JetFile: Attributes_ERR.jet PsiWhiteSpace(' ') ATTRIBUTE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('b') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('f') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('b') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('f') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('c') PsiElement(RBRACKET)(']') PsiWhiteSpace('\n') diff --git a/idea/testData/psi/Decomposers.txt b/idea/testData/psi/Decomposers.txt index 0c1cac1bfba..7319314fe1f 100644 --- a/idea/testData/psi/Decomposers.txt +++ b/idea/testData/psi/Decomposers.txt @@ -64,9 +64,9 @@ JetFile: Decomposers.jet PsiWhiteSpace(' ') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foobar') DECOMPOSER_PROPERTY_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/Decomposers_ERR.txt b/idea/testData/psi/Decomposers_ERR.txt index ca6204eac9f..0f9201981d1 100644 --- a/idea/testData/psi/Decomposers_ERR.txt +++ b/idea/testData/psi/Decomposers_ERR.txt @@ -57,9 +57,9 @@ JetFile: Decomposers_ERR.jet PsiWhiteSpace(' ') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('a') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('a') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foobar') DECOMPOSER_PROPERTY_LIST PsiErrorElement:Expecting a property list in parentheses '( ... )' @@ -185,12 +185,12 @@ JetFile: Decomposers_ERR.jet PsiWhiteSpace(' ') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') + PsiElement(DOT)('.') PsiErrorElement:Type name expected PsiElement(MINUS)('-') DECOMPOSER_PROPERTY_LIST diff --git a/idea/testData/psi/FunctionTypes.txt b/idea/testData/psi/FunctionTypes.txt index 926bf3e5998..422f6dd29f9 100644 --- a/idea/testData/psi/FunctionTypes.txt +++ b/idea/testData/psi/FunctionTypes.txt @@ -539,9 +539,9 @@ JetFile: FunctionTypes.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -570,20 +570,20 @@ JetFile: FunctionTypes.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') TYPE_ARGUMENT_LIST PsiElement(LT)('<') @@ -711,9 +711,9 @@ JetFile: FunctionTypes.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -757,20 +757,20 @@ JetFile: FunctionTypes.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') TYPE_ARGUMENT_LIST PsiElement(LT)('<') @@ -906,9 +906,9 @@ JetFile: FunctionTypes.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -944,20 +944,20 @@ JetFile: FunctionTypes.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') TYPE_ARGUMENT_LIST PsiElement(LT)('<') @@ -1127,9 +1127,9 @@ JetFile: FunctionTypes.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -1187,20 +1187,20 @@ JetFile: FunctionTypes.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - TYPE_ARGUMENT_LIST - PsiElement(LT)('<') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(COMMA)(',') - PsiWhiteSpace(' ') - TYPE_REFERENCE - USER_TYPE - PsiElement(IDENTIFIER)('B') - PsiElement(GT)('>') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + TYPE_ARGUMENT_LIST + PsiElement(LT)('<') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(COMMA)(',') + PsiWhiteSpace(' ') + TYPE_REFERENCE + USER_TYPE + PsiElement(IDENTIFIER)('B') + PsiElement(GT)('>') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T') TYPE_ARGUMENT_LIST PsiElement(LT)('<') diff --git a/idea/testData/psi/LocalDeclarations.txt b/idea/testData/psi/LocalDeclarations.txt index ebc823e6279..94e3f752563 100644 --- a/idea/testData/psi/LocalDeclarations.txt +++ b/idea/testData/psi/LocalDeclarations.txt @@ -146,9 +146,9 @@ JetFile: LocalDeclarations.jet PsiWhiteSpace(' ') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('T') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('T') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo') DECOMPOSER_PROPERTY_LIST PsiElement(LPAR)('(') diff --git a/idea/testData/psi/Match.txt b/idea/testData/psi/Match.txt index f71818d664c..713fc17edce 100644 --- a/idea/testData/psi/Match.txt +++ b/idea/testData/psi/Match.txt @@ -221,9 +221,9 @@ JetFile: Match.jet PsiWhiteSpace(' ') PATTERN USER_TYPE - PsiElement(IDENTIFIER)('A') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('A') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('b') PsiWhiteSpace(' ') PsiElement(DOUBLE_ARROW)('=>') diff --git a/idea/testData/psi/Properties.txt b/idea/testData/psi/Properties.txt index 1392766a3b3..4f06bfb51e8 100644 --- a/idea/testData/psi/Properties.txt +++ b/idea/testData/psi/Properties.txt @@ -72,9 +72,9 @@ JetFile: Properties.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -157,9 +157,9 @@ JetFile: Properties.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -209,9 +209,9 @@ JetFile: Properties.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -267,9 +267,9 @@ JetFile: Properties.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -344,9 +344,9 @@ JetFile: Properties.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -402,9 +402,9 @@ JetFile: Properties.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST diff --git a/idea/testData/psi/Properties_ERR.txt b/idea/testData/psi/Properties_ERR.txt index c4cbd8750f9..dacf8bd65ff 100644 --- a/idea/testData/psi/Properties_ERR.txt +++ b/idea/testData/psi/Properties_ERR.txt @@ -133,9 +133,9 @@ JetFile: Properties_ERR.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST @@ -187,9 +187,9 @@ JetFile: Properties_ERR.jet PsiElement(LBRACE)('{') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.') VALUE_PARAMETER_LIST diff --git a/idea/testData/psi/RootNamespace.txt b/idea/testData/psi/RootNamespace.txt index d80fa46613c..223740d0d04 100644 --- a/idea/testData/psi/RootNamespace.txt +++ b/idea/testData/psi/RootNamespace.txt @@ -58,15 +58,15 @@ JetFile: RootNamespace.jet PsiElement(new)('new') PsiWhiteSpace(' ') TYPE_REFERENCE - PsiElement(namespace)('namespace') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiElement(DOT)('.') USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(namespace)('namespace') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('X') VALUE_ARGUMENT_LIST PsiElement(LPAR)('(') @@ -85,15 +85,15 @@ JetFile: RootNamespace.jet PsiElement(case)('case') PsiWhiteSpace(' ') PATTERN - PsiElement(namespace)('namespace') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('foo') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('bar') - PsiElement(DOT)('.') USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(namespace)('namespace') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('foo') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('bar') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('X') TUPLE_PATTERN PsiElement(LPAR)('(') diff --git a/idea/testData/psi/examples/collections/HashMap.txt b/idea/testData/psi/examples/collections/HashMap.txt index fb9e65bb367..f46d525c340 100644 --- a/idea/testData/psi/examples/collections/HashMap.txt +++ b/idea/testData/psi/examples/collections/HashMap.txt @@ -51,12 +51,12 @@ JetFile: HashMap.jet PsiWhiteSpace(' ') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('java') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('lang') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('java') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('lang') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiElement(DOT)('.') @@ -73,12 +73,12 @@ JetFile: HashMap.jet PsiWhiteSpace(' ') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('java') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('lang') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('java') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('lang') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiWhiteSpace('\n') @@ -135,12 +135,12 @@ JetFile: HashMap.jet PsiWhiteSpace(' ') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('java') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('lang') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('java') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('lang') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('Object') PsiElement(RPAR)(')') PsiElement(DOT)('.') diff --git a/idea/testData/psi/examples/io/IOSamples.txt b/idea/testData/psi/examples/io/IOSamples.txt index d1b418d589a..4076467ba30 100644 --- a/idea/testData/psi/examples/io/IOSamples.txt +++ b/idea/testData/psi/examples/io/IOSamples.txt @@ -88,12 +88,12 @@ JetFile: IOSamples.jet PsiWhiteSpace(' ') TYPE_REFERENCE USER_TYPE - PsiElement(IDENTIFIER)('java') - PsiElement(DOT)('.') - USER_TYPE - PsiElement(IDENTIFIER)('io') - PsiElement(DOT)('.') - USER_TYPE + USER_TYPE + USER_TYPE + PsiElement(IDENTIFIER)('java') + PsiElement(DOT)('.') + PsiElement(IDENTIFIER)('io') + PsiElement(DOT)('.') PsiElement(IDENTIFIER)('Closeable') PsiElement(RPAR)(')') PsiWhiteSpace(' ')