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
+8 -14
View File
@@ -1261,28 +1261,22 @@ 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();
if (!at(DOT)) break;
advance(); // DOT
}
}
/*
* simpleUserType
* : SimpleName ("<" (optionalProjection type){","} ">")?
* ;
*/
private void parseSimpleUserType() {
PsiBuilder.Marker type = mark();
expect(IDENTIFIER, "Type name expected", TokenSet.create(LT)); expect(IDENTIFIER, "Type name expected", TokenSet.create(LT));
parseTypeArgumentList(); parseTypeArgumentList();
if (!at(DOT)) break;
type.done(USER_TYPE);
type = type.precede();
advance(); // DOT
}
type.done(USER_TYPE); type.done(USER_TYPE);
} }
idea/testData/psi/Attributes.txt
+8 -8
View File
@@ -70,16 +70,18 @@ JetFile: Attributes.jet
PsiElement(IDENTIFIER)('ina') PsiElement(IDENTIFIER)('ina')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
ATTRIBUTE ATTRIBUTE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('goo') PsiElement(IDENTIFIER)('goo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('doo') PsiElement(IDENTIFIER)('doo')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -88,7 +90,6 @@ JetFile: Attributes.jet
PsiElement(IDENTIFIER)('f') PsiElement(IDENTIFIER)('f')
PsiElement(GT)('>') PsiElement(GT)('>')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -102,7 +103,6 @@ JetFile: Attributes.jet
PsiElement(IDENTIFIER)('goo') PsiElement(IDENTIFIER)('goo')
PsiElement(GT)('>') PsiElement(GT)('>')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
@@ -162,16 +162,16 @@ JetFile: Attributes.jet
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
ATTRIBUTE ATTRIBUTE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('b') PsiElement(IDENTIFIER)('b')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('f') PsiElement(IDENTIFIER)('f')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('c') PsiElement(IDENTIFIER)('c')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
idea/testData/psi/Attributes_ERR.txt
+8 -8
View File
@@ -76,16 +76,18 @@ JetFile: Attributes_ERR.jet
PsiElement(IDENTIFIER)('ina') PsiElement(IDENTIFIER)('ina')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
ATTRIBUTE ATTRIBUTE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('goo') PsiElement(IDENTIFIER)('goo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('doo') PsiElement(IDENTIFIER)('doo')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -94,7 +96,6 @@ JetFile: Attributes_ERR.jet
PsiElement(IDENTIFIER)('f') PsiElement(IDENTIFIER)('f')
PsiElement(GT)('>') PsiElement(GT)('>')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -108,7 +109,6 @@ JetFile: Attributes_ERR.jet
PsiElement(IDENTIFIER)('goo') PsiElement(IDENTIFIER)('goo')
PsiElement(GT)('>') PsiElement(GT)('>')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
@@ -190,16 +190,16 @@ JetFile: Attributes_ERR.jet
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
ATTRIBUTE ATTRIBUTE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('b') PsiElement(IDENTIFIER)('b')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('f') PsiElement(IDENTIFIER)('f')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('c') PsiElement(IDENTIFIER)('c')
PsiElement(RBRACKET)(']') PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
idea/testData/psi/Decomposers.txt
+1 -1
View File
@@ -63,10 +63,10 @@ JetFile: Decomposers.jet
PsiElement(decomposer)('decomposer') PsiElement(decomposer)('decomposer')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('foobar') PsiElement(IDENTIFIER)('foobar')
DECOMPOSER_PROPERTY_LIST DECOMPOSER_PROPERTY_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
idea/testData/psi/Decomposers_ERR.txt
+3 -3
View File
@@ -56,10 +56,10 @@ JetFile: Decomposers_ERR.jet
PsiElement(decomposer)('decomposer') PsiElement(decomposer)('decomposer')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('a') PsiElement(IDENTIFIER)('a')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
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 '( ... )'
@@ -184,13 +184,13 @@ JetFile: Decomposers_ERR.jet
PsiElement(decomposer)('decomposer') PsiElement(decomposer)('decomposer')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiErrorElement:Type name expected PsiErrorElement:Type name expected
PsiElement(MINUS)('-') PsiElement(MINUS)('-')
DECOMPOSER_PROPERTY_LIST DECOMPOSER_PROPERTY_LIST
idea/testData/psi/FunctionTypes.txt
+8 -8
View File
@@ -538,10 +538,10 @@ JetFile: FunctionTypes.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -569,6 +569,7 @@ JetFile: FunctionTypes.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
@@ -583,7 +584,6 @@ JetFile: FunctionTypes.jet
PsiElement(IDENTIFIER)('B') PsiElement(IDENTIFIER)('B')
PsiElement(GT)('>') PsiElement(GT)('>')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -710,10 +710,10 @@ JetFile: FunctionTypes.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -756,6 +756,7 @@ JetFile: FunctionTypes.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
@@ -770,7 +771,6 @@ JetFile: FunctionTypes.jet
PsiElement(IDENTIFIER)('B') PsiElement(IDENTIFIER)('B')
PsiElement(GT)('>') PsiElement(GT)('>')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -905,10 +905,10 @@ JetFile: FunctionTypes.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -943,6 +943,7 @@ JetFile: FunctionTypes.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
@@ -957,7 +958,6 @@ JetFile: FunctionTypes.jet
PsiElement(IDENTIFIER)('B') PsiElement(IDENTIFIER)('B')
PsiElement(GT)('>') PsiElement(GT)('>')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
@@ -1126,10 +1126,10 @@ JetFile: FunctionTypes.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -1186,6 +1186,7 @@ JetFile: FunctionTypes.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
@@ -1200,7 +1201,6 @@ JetFile: FunctionTypes.jet
PsiElement(IDENTIFIER)('B') PsiElement(IDENTIFIER)('B')
PsiElement(GT)('>') PsiElement(GT)('>')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
TYPE_ARGUMENT_LIST TYPE_ARGUMENT_LIST
PsiElement(LT)('<') PsiElement(LT)('<')
idea/testData/psi/LocalDeclarations.txt
+1 -1
View File
@@ -145,10 +145,10 @@ JetFile: LocalDeclarations.jet
PsiElement(decomposer)('decomposer') PsiElement(decomposer)('decomposer')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('T')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
DECOMPOSER_PROPERTY_LIST DECOMPOSER_PROPERTY_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
idea/testData/psi/Match.txt
+1 -1
View File
@@ -220,10 +220,10 @@ JetFile: Match.jet
PsiElement(case)('case') PsiElement(case)('case')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PATTERN PATTERN
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('A') PsiElement(IDENTIFIER)('A')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('b') PsiElement(IDENTIFIER)('b')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(DOUBLE_ARROW)('=>') PsiElement(DOUBLE_ARROW)('=>')
idea/testData/psi/Properties.txt
+6 -6
View File
@@ -71,10 +71,10 @@ JetFile: Properties.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -156,10 +156,10 @@ JetFile: Properties.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -208,10 +208,10 @@ JetFile: Properties.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -266,10 +266,10 @@ JetFile: Properties.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -343,10 +343,10 @@ JetFile: Properties.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -401,10 +401,10 @@ JetFile: Properties.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
idea/testData/psi/Properties_ERR.txt
+2 -2
View File
@@ -132,10 +132,10 @@ JetFile: Properties_ERR.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
@@ -186,10 +186,10 @@ JetFile: Properties_ERR.jet
FUNCTION_TYPE FUNCTION_TYPE
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
VALUE_PARAMETER_LIST VALUE_PARAMETER_LIST
idea/testData/psi/RootNamespace.txt
+6 -6
View File
@@ -58,15 +58,15 @@ JetFile: RootNamespace.jet
PsiElement(new)('new') PsiElement(new)('new')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE
USER_TYPE
PsiElement(namespace)('namespace') PsiElement(namespace)('namespace')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
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
USER_TYPE
USER_TYPE
USER_TYPE
PsiElement(namespace)('namespace') PsiElement(namespace)('namespace')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('X') PsiElement(IDENTIFIER)('X')
TUPLE_PATTERN TUPLE_PATTERN
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
idea/testData/psi/examples/collections/HashMap.txt
+6 -6
View File
@@ -50,13 +50,13 @@ JetFile: HashMap.jet
PsiElement(as)('as') PsiElement(as)('as')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('java') PsiElement(IDENTIFIER)('java')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('lang') PsiElement(IDENTIFIER)('lang')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('Object') PsiElement(IDENTIFIER)('Object')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiElement(DOT)('.') PsiElement(DOT)('.')
@@ -72,13 +72,13 @@ JetFile: HashMap.jet
PsiElement(as)('as') PsiElement(as)('as')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('java') PsiElement(IDENTIFIER)('java')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('lang') PsiElement(IDENTIFIER)('lang')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('Object') PsiElement(IDENTIFIER)('Object')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
@@ -134,13 +134,13 @@ JetFile: HashMap.jet
PsiElement(as)('as') PsiElement(as)('as')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('java') PsiElement(IDENTIFIER)('java')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('lang') PsiElement(IDENTIFIER)('lang')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('Object') PsiElement(IDENTIFIER)('Object')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiElement(DOT)('.') PsiElement(DOT)('.')
idea/testData/psi/examples/io/IOSamples.txt
+2 -2
View File
@@ -87,13 +87,13 @@ JetFile: IOSamples.jet
PsiElement(COLON)(':') PsiElement(COLON)(':')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE
USER_TYPE
USER_TYPE USER_TYPE
PsiElement(IDENTIFIER)('java') PsiElement(IDENTIFIER)('java')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('io') PsiElement(IDENTIFIER)('io')
PsiElement(DOT)('.') PsiElement(DOT)('.')
USER_TYPE
PsiElement(IDENTIFIER)('Closeable') PsiElement(IDENTIFIER)('Closeable')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')