azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User types are parsed hierarchically, i.e. (((java).lang).Object) instead of (java).(lang).(Object)

Browse Source
This commit is contained in:
Maxim Shafirov
2011-01-11 18:02:02 +03:00
parent caf7e80e5f
commit dfc03a5f30
13 changed files with 235 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+7 -13
View File
@@ -1261,27 +1261,21 @@ public class JetParsing extends AbstractJetParsing {
* ; * ;
*/ */
public void parseUserType() { public void parseUserType() {
PsiBuilder.Marker type = mark();
if (at(NAMESPACE_KEYWORD)) { if (at(NAMESPACE_KEYWORD)) {
advance(); // NAMESPACE_KEYWORD advance(); // NAMESPACE_KEYWORD
expect(DOT, "Expecting '.'", TokenSet.create(IDENTIFIER)); expect(DOT, "Expecting '.'", TokenSet.create(IDENTIFIER));
} }
while (true) { while (true) {
parseSimpleUserType(); expect(IDENTIFIER, "Type name expected", TokenSet.create(LT));
parseTypeArgumentList();
if (!at(DOT)) break; if (!at(DOT)) break;
type.done(USER_TYPE);
type = type.precede();
advance(); // DOT 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); type.done(USER_TYPE);
} }
idea/testData/psi/Attributes.txt
+39 -39
View File
@@ -71,38 +71,38 @@ JetFile: Attributes.jet
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
ATTRIBUTE ATTRIBUTE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
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
PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('goo') PsiElement(IDENTIFIER)('goo')
PsiElement(GT)('>') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('doo')
USER_TYPE 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(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
@@ -163,15 +163,15 @@ JetFile: Attributes.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
ATTRIBUTE ATTRIBUTE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('b') PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE PsiElement(IDENTIFIER)('b')
PsiElement(IDENTIFIER)('f') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('f')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('c') PsiElement(IDENTIFIER)('c')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
idea/testData/psi/Attributes_ERR.txt
+39 -39
View File
@@ -77,38 +77,38 @@ JetFile: Attributes_ERR.jet
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
ATTRIBUTE ATTRIBUTE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
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
PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('goo') PsiElement(IDENTIFIER)('goo')
PsiElement(GT)('>') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('doo')
USER_TYPE 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(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
@@ -191,15 +191,15 @@ JetFile: Attributes_ERR.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
ATTRIBUTE ATTRIBUTE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('b') PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE PsiElement(IDENTIFIER)('b')
PsiElement(IDENTIFIER)('f') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('f')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('c') PsiElement(IDENTIFIER)('c')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
idea/testData/psi/Decomposers.txt
+3 -3
View File
@@ -64,9 +64,9 @@ JetFile: Decomposers.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('a')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('foobar') PsiElement(IDENTIFIER)('foobar')
DECOMPOSER_PROPERTY_LIST DECOMPOSER_PROPERTY_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
idea/testData/psi/Decomposers_ERR.txt
+9 -9
View File
@@ -57,9 +57,9 @@ JetFile: Decomposers_ERR.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('a')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('foobar') PsiElement(IDENTIFIER)('foobar')
DECOMPOSER_PROPERTY_LIST DECOMPOSER_PROPERTY_LIST
PsiErrorElement:Expecting a property list in parentheses '( ... )' PsiErrorElement:Expecting a property list in parentheses '( ... )'
@@ -185,12 +185,12 @@ JetFile: Decomposers_ERR.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
USER_TYPE PsiElement(IDENTIFIER)('foo')
PsiElement(IDENTIFIER)('bar') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('bar')
USER_TYPE PsiElement(DOT)('.')
PsiErrorElement:Type name expected PsiErrorElement:Type name expected
PsiElement(MINUS)('-') PsiElement(MINUS)('-')
DECOMPOSER_PROPERTY_LIST DECOMPOSER_PROPERTY_LIST
idea/testData/psi/FunctionTypes.txt
+68 -68
View File
@@ -539,9 +539,9 @@ JetFile: FunctionTypes.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -570,20 +570,20 @@ JetFile: FunctionTypes.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
TYPE_ARGUMENT_LIST PsiElement(IDENTIFIER)('T')
PsiElement(LT)('<') TYPE_ARGUMENT_LIST
TYPE_REFERENCE PsiElement(LT)('<')
USER_TYPE TYPE_REFERENCE
PsiElement(IDENTIFIER)('A') USER_TYPE
PsiElement(COMMA)(',') PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ') PsiElement(COMMA)(',')
TYPE_REFERENCE PsiWhiteSpace(' ')
USER_TYPE TYPE_REFERENCE
PsiElement(IDENTIFIER)('B') USER_TYPE
PsiElement(GT)('>') PsiElement(IDENTIFIER)('B')
PsiElement(DOT)('.') PsiElement(GT)('>')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -711,9 +711,9 @@ JetFile: FunctionTypes.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -757,20 +757,20 @@ JetFile: FunctionTypes.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
TYPE_ARGUMENT_LIST PsiElement(IDENTIFIER)('T')
PsiElement(LT)('<') TYPE_ARGUMENT_LIST
TYPE_REFERENCE PsiElement(LT)('<')
USER_TYPE TYPE_REFERENCE
PsiElement(IDENTIFIER)('A') USER_TYPE
PsiElement(COMMA)(',') PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ') PsiElement(COMMA)(',')
TYPE_REFERENCE PsiWhiteSpace(' ')
USER_TYPE TYPE_REFERENCE
PsiElement(IDENTIFIER)('B') USER_TYPE
PsiElement(GT)('>') PsiElement(IDENTIFIER)('B')
PsiElement(DOT)('.') PsiElement(GT)('>')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -906,9 +906,9 @@ JetFile: FunctionTypes.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -944,20 +944,20 @@ JetFile: FunctionTypes.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
TYPE_ARGUMENT_LIST PsiElement(IDENTIFIER)('T')
PsiElement(LT)('<') TYPE_ARGUMENT_LIST
TYPE_REFERENCE PsiElement(LT)('<')
USER_TYPE TYPE_REFERENCE
PsiElement(IDENTIFIER)('A') USER_TYPE
PsiElement(COMMA)(',') PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ') PsiElement(COMMA)(',')
TYPE_REFERENCE PsiWhiteSpace(' ')
USER_TYPE TYPE_REFERENCE
PsiElement(IDENTIFIER)('B') USER_TYPE
PsiElement(GT)('>') PsiElement(IDENTIFIER)('B')
PsiElement(DOT)('.') PsiElement(GT)('>')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -1127,9 +1127,9 @@ JetFile: FunctionTypes.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -1187,20 +1187,20 @@ JetFile: FunctionTypes.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
TYPE_ARGUMENT_LIST PsiElement(IDENTIFIER)('T')
PsiElement(LT)('<') TYPE_ARGUMENT_LIST
TYPE_REFERENCE PsiElement(LT)('<')
USER_TYPE TYPE_REFERENCE
PsiElement(IDENTIFIER)('A') USER_TYPE
PsiElement(COMMA)(',') PsiElement(IDENTIFIER)('A')
PsiWhiteSpace(' ') PsiElement(COMMA)(',')
TYPE_REFERENCE PsiWhiteSpace(' ')
USER_TYPE TYPE_REFERENCE
PsiElement(IDENTIFIER)('B') USER_TYPE
PsiElement(GT)('>') PsiElement(IDENTIFIER)('B')
PsiElement(DOT)('.') PsiElement(GT)('>')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
idea/testData/psi/LocalDeclarations.txt
+3 -3
View File
@@ -146,9 +146,9 @@ JetFile: LocalDeclarations.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('T')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
DECOMPOSER_PROPERTY_LIST DECOMPOSER_PROPERTY_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
idea/testData/psi/Match.txt
+3 -3
View File
@@ -221,9 +221,9 @@ JetFile: Match.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PATTERN PATTERN
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('A') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('A')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('b') PsiElement(IDENTIFIER)('b')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(DOUBLE_ARROW)('=>') PsiElement(DOUBLE_ARROW)('=>')
idea/testData/psi/Properties.txt
+18 -18
View File
@@ -72,9 +72,9 @@ JetFile: Properties.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -157,9 +157,9 @@ JetFile: Properties.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -209,9 +209,9 @@ JetFile: Properties.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -267,9 +267,9 @@ JetFile: Properties.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -344,9 +344,9 @@ JetFile: Properties.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -402,9 +402,9 @@ JetFile: Properties.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
idea/testData/psi/Properties_ERR.txt
+6 -6
View File
@@ -133,9 +133,9 @@ JetFile: Properties_ERR.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -187,9 +187,9 @@ JetFile: Properties_ERR.jet
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') USER_TYPE
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('foo')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
idea/testData/psi/RootNamespace.txt
+16 -16
View File
@@ -58,15 +58,15 @@ JetFile: RootNamespace.jet
PsiElement(new)('new') PsiElement(new)('new')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE 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
USER_TYPE
PsiElement(namespace)('namespace')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('X') PsiElement(IDENTIFIER)('X')
VALUE_ARGUMENT_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
@@ -85,15 +85,15 @@ JetFile: RootNamespace.jet
PsiElement(case)('case') PsiElement(case)('case')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PATTERN 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
USER_TYPE
PsiElement(namespace)('namespace')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('X') PsiElement(IDENTIFIER)('X')
TUPLE_PATTERN TUPLE_PATTERN
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
idea/testData/psi/examples/collections/HashMap.txt
+18 -18
View File
@@ -51,12 +51,12 @@ JetFile: HashMap.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('java') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
USER_TYPE PsiElement(IDENTIFIER)('java')
PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('lang')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('Object') PsiElement(IDENTIFIER)('Object')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiElement(DOT)('.') PsiElement(DOT)('.')
@@ -73,12 +73,12 @@ JetFile: HashMap.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('java') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
USER_TYPE PsiElement(IDENTIFIER)('java')
PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('lang')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('Object') PsiElement(IDENTIFIER)('Object')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
@@ -135,12 +135,12 @@ JetFile: HashMap.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('java') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
USER_TYPE PsiElement(IDENTIFIER)('java')
PsiElement(IDENTIFIER)('lang') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('lang')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('Object') PsiElement(IDENTIFIER)('Object')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiElement(DOT)('.') PsiElement(DOT)('.')
idea/testData/psi/examples/io/IOSamples.txt
+6 -6
View File
@@ -88,12 +88,12 @@ JetFile: IOSamples.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('java') USER_TYPE
PsiElement(DOT)('.') USER_TYPE
USER_TYPE PsiElement(IDENTIFIER)('java')
PsiElement(IDENTIFIER)('io') PsiElement(DOT)('.')
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('io')
USER_TYPE PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('Closeable') PsiElement(IDENTIFIER)('Closeable')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')