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

Parsing object declarations

Browse Source
This commit is contained in:
Andrey Breslav
2011-06-02 18:44:56 +04:00
parent 7ad600220b
commit efd417e043
19 changed files with 2044 additions and 1956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grammar/src/class_members.grm
+4
View File
@@ -32,6 +32,7 @@ class Example(a : Foo, i : Int) : Bar(i), Some {
memberDeclaration memberDeclaration
: classObject : classObject
: object
: constructor : constructor
: function : function
: property : property
@@ -100,3 +101,6 @@ setter
parameter parameter
: SimpleName ":" type : SimpleName ":" type
; ;
object
: "object" SimpleName ":" ":" delegationSpecifier{","}? classBody? // Class body can be optional: this is a declaration
grammar/src/expressions.grm
+1
View File
@@ -124,6 +124,7 @@ declaration
: extension : extension
: class : class
: typedef : typedef
: object
; ;
statement statement
grammar/src/toplevel.grm
+1
View File
@@ -21,6 +21,7 @@ import
toplevelObject toplevelObject
: namespace : namespace
: class : class
: object
: extension : extension
: function : function
: property : property
idea/src/org/jetbrains/jet/JetNodeTypes.java
+1
View File
@@ -16,6 +16,7 @@ public interface JetNodeTypes {
JetNodeType FUN = new JetNodeType("FUN", JetFunction.class); JetNodeType FUN = new JetNodeType("FUN", JetFunction.class);
JetNodeType EXTENSION = new JetNodeType("EXTENSION", JetExtension.class); JetNodeType EXTENSION = new JetNodeType("EXTENSION", JetExtension.class);
JetNodeType TYPEDEF = new JetNodeType("TYPEDEF", JetTypedef.class); JetNodeType TYPEDEF = new JetNodeType("TYPEDEF", JetTypedef.class);
JetNodeType OBJECT_DECLARATION = new JetNodeType("OBJECT_DECLARATION", JetObjectDeclaration.class);
JetNodeType CLASS_OBJECT = new JetNodeType("CLASS_OBJECT", JetClassObject.class); JetNodeType CLASS_OBJECT = new JetNodeType("CLASS_OBJECT", JetClassObject.class);
JetNodeType CONSTRUCTOR = new JetNodeType("CONSTRUCTOR", JetConstructor.class); JetNodeType CONSTRUCTOR = new JetNodeType("CONSTRUCTOR", JetConstructor.class);
idea/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+1 -1
View File
@@ -597,7 +597,7 @@ public class JetControlFlowProcessor {
@Override @Override
public void visitObjectLiteralExpression(JetObjectLiteralExpression expression) { public void visitObjectLiteralExpression(JetObjectLiteralExpression expression) {
List<JetDelegationSpecifier> delegationSpecifiers = expression.getDelegationSpecifiers(); List<JetDelegationSpecifier> delegationSpecifiers = expression.getObjectDeclaration().getDelegationSpecifiers();
for (JetDelegationSpecifier delegationSpecifier : delegationSpecifiers) { for (JetDelegationSpecifier delegationSpecifier : delegationSpecifiers) {
if (delegationSpecifier instanceof JetDelegatorByExpressionSpecifier) { if (delegationSpecifier instanceof JetDelegatorByExpressionSpecifier) {
JetDelegatorByExpressionSpecifier specifier = (JetDelegatorByExpressionSpecifier) delegationSpecifier; JetDelegatorByExpressionSpecifier specifier = (JetDelegatorByExpressionSpecifier) delegationSpecifier;
idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+8 -21
View File
@@ -1140,6 +1140,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
* : extension * : extension
* : class * : class
* : typedef * : typedef
* : object
* ; * ;
*/ */
private JetNodeType parseLocalDeclarationRest(boolean isEnum) { private JetNodeType parseLocalDeclarationRest(boolean isEnum) {
@@ -1160,6 +1161,10 @@ public class JetExpressionParsing extends AbstractJetParsing {
else if (keywordToken == TYPE_KEYWORD) { else if (keywordToken == TYPE_KEYWORD) {
declType = myJetParsing.parseTypeDef(); declType = myJetParsing.parseTypeDef();
} }
else if (keywordToken == OBJECT_KEYWORD) {
myJetParsing.parseObject(true);
declType = OBJECT_DECLARATION;
}
return declType; return declType;
} }
@@ -1594,29 +1599,11 @@ public class JetExpressionParsing extends AbstractJetParsing {
argument.done(VALUE_ARGUMENT); argument.done(VALUE_ARGUMENT);
} }
/*
* objectLiteral
* : "object" ":" delegationSpecifier{","}? classBody // Cannot make class body optional: foo(object F, a)
* ;
*/
public void parseObjectLiteral() { public void parseObjectLiteral() {
assert _at(OBJECT_KEYWORD);
PsiBuilder.Marker literal = mark(); PsiBuilder.Marker literal = mark();
PsiBuilder.Marker declaration = mark();
advance(); // OBJECT_KEYWORD myJetParsing.parseObject(false);
declaration.done(OBJECT_DECLARATION);
if (at(LBRACE)) {
myJetParsing.parseClassBody();
}
else {
expect(COLON, "Expecting ':'", TokenSet.create(IDENTIFIER, NAMESPACE_KEYWORD));
myJetParsing.parseDelegationSpecifierList();
if (at(LBRACE)) {
myJetParsing.parseClassBody();
}
}
literal.done(OBJECT_LITERAL); literal.done(OBJECT_LITERAL);
} }
idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+51 -2
View File
@@ -213,6 +213,7 @@ public class JetParsing extends AbstractJetParsing {
* : function * : function
* : property * : property
* : typedef * : typedef
* : object
* ; * ;
*/ */
private void parseTopLevelObject() { private void parseTopLevelObject() {
@@ -241,6 +242,10 @@ public class JetParsing extends AbstractJetParsing {
else if (keywordToken == TYPE_KEYWORD) { else if (keywordToken == TYPE_KEYWORD) {
declType = parseTypeDef(); declType = parseTypeDef();
} }
else if (keywordToken == OBJECT_KEYWORD) {
parseObject(true);
declType = OBJECT_DECLARATION;
}
if (declType == null) { if (declType == null) {
errorAndAdvance("Expecting namespace or top level declaration"); errorAndAdvance("Expecting namespace or top level declaration");
@@ -504,11 +509,10 @@ public class JetParsing extends AbstractJetParsing {
* ; * ;
*/ */
/*package*/ void parseClassBody() { /*package*/ void parseClassBody() {
assert _at(LBRACE);
PsiBuilder.Marker body = mark(); PsiBuilder.Marker body = mark();
myBuilder.enableNewlines(); myBuilder.enableNewlines();
advance(); // LBRACE expect(LBRACE, "Expecting a class body", TokenSet.create(LBRACE));
while (!eof()) { while (!eof()) {
if (at(RBRACE)) { if (at(RBRACE)) {
@@ -536,6 +540,7 @@ public class JetParsing extends AbstractJetParsing {
* : extension * : extension
* : typedef * : typedef
* : anonymousInitializer * : anonymousInitializer
* : object
* ; * ;
*/ */
private void parseMemberDeclaration() { private void parseMemberDeclaration() {
@@ -580,6 +585,10 @@ public class JetParsing extends AbstractJetParsing {
} }
else if (keywordToken == THIS_KEYWORD) { else if (keywordToken == THIS_KEYWORD) {
declType = parseConstructor(); declType = parseConstructor();
}
else if (keywordToken == OBJECT_KEYWORD) {
parseObject(true);
declType = OBJECT_DECLARATION;
} else if (keywordToken == LBRACE) { } else if (keywordToken == LBRACE) {
parseBlock(); parseBlock();
declType = ANONYMOUS_INITIALIZER; declType = ANONYMOUS_INITIALIZER;
@@ -587,6 +596,46 @@ public class JetParsing extends AbstractJetParsing {
return declType; return declType;
} }
/*
* object
* : "object" SimpleName? ":" delegationSpecifier{","}? classBody // Cannot make class body optional: foo(object F, a)
* ;
*/
public void parseObject(boolean declaration) {
assert _at(OBJECT_KEYWORD);
advance(); // OBJECT_KEYWORD
if (declaration) {
expect(IDENTIFIER, "Expecting object name", TokenSet.create(LBRACE));
}
else {
if (at(IDENTIFIER)) {
error("An object expression cannot bind a name");
}
}
if (declaration) { // Body is optional
if (at(COLON)) {
advance(); // COLON
parseDelegationSpecifierList();
}
if (at(LBRACE)) {
parseClassBody();
}
}
else {
if (at(LBRACE)) {
parseClassBody();
}
else {
expect(COLON, "Expecting ':'", TokenSet.create(IDENTIFIER, NAMESPACE_KEYWORD));
parseDelegationSpecifierList();
parseClassBody();
}
}
}
/* /*
* constructor * constructor
* : modifiers "this" functionParameters (":" initializer{","}) block? * : modifiers "this" functionParameters (":" initializer{","}) block?
idea/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
+40
View File
@@ -0,0 +1,40 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
import java.util.Collections;
import java.util.List;
/**
* @author abreslav
*/
public class JetObjectDeclaration extends JetNamedDeclaration implements JetClassOrObject {
public JetObjectDeclaration(@NotNull ASTNode node) {
super(node);
}
@Override
@Nullable
public JetDelegationSpecifierList getDelegationSpecifierList() {
return (JetDelegationSpecifierList) findChildByType(JetNodeTypes.DELEGATION_SPECIFIER_LIST);
}
@Override
@NotNull
public List<JetDelegationSpecifier> getDelegationSpecifiers() {
JetDelegationSpecifierList list = getDelegationSpecifierList();
return list != null ? list.getDelegationSpecifiers() : Collections.<JetDelegationSpecifier>emptyList();
}
@Override
@NotNull
public List<JetDeclaration> getDeclarations() {
JetClassBody body = (JetClassBody) findChildByType(JetNodeTypes.CLASS_BODY);
if (body == null) return Collections.emptyList();
return body.getDeclarations();
}
}
idea/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java
+3 -24
View File
@@ -2,16 +2,12 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode; import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.JetNodeTypes;
import java.util.Collections;
import java.util.List;
/** /**
* @author max * @author max
*/ */
public class JetObjectLiteralExpression extends JetExpression implements JetClassOrObject { public class JetObjectLiteralExpression extends JetExpression {
public JetObjectLiteralExpression(@NotNull ASTNode node) { public JetObjectLiteralExpression(@NotNull ASTNode node) {
super(node); super(node);
} }
@@ -21,25 +17,8 @@ public class JetObjectLiteralExpression extends JetExpression implements JetClas
visitor.visitObjectLiteralExpression(this); visitor.visitObjectLiteralExpression(this);
} }
@Override
@Nullable
public JetDelegationSpecifierList getDelegationSpecifierList() {
return (JetDelegationSpecifierList) findChildByType(JetNodeTypes.DELEGATION_SPECIFIER_LIST);
}
@Override
@NotNull @NotNull
public List<JetDelegationSpecifier> getDelegationSpecifiers() { public JetObjectDeclaration getObjectDeclaration() {
JetDelegationSpecifierList list = getDelegationSpecifierList(); return (JetObjectDeclaration) findChildByType(JetNodeTypes.OBJECT_DECLARATION);
return list != null ? list.getDelegationSpecifiers() : Collections.<JetDelegationSpecifier>emptyList();
}
@Override
@NotNull
public List<JetDeclaration> getDeclarations() {
JetClassBody body = (JetClassBody) findChildByType(JetNodeTypes.CLASS_BODY);
if (body == null) return Collections.emptyList();
return body.getDeclarations();
} }
} }
idea/testData/psi/ByCaluses.txt
+26 -25
View File
@@ -293,32 +293,33 @@ JetFile: ByCaluses.jet
PsiElement(by)('by') PsiElement(by)('by')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
CLASS_BODY PsiWhiteSpace(' ')
PsiElement(LBRACE)('{') CLASS_BODY
PsiWhiteSpace('\n ') PsiElement(LBRACE)('{')
FUN PsiWhiteSpace('\n ')
PsiElement(fun)('fun') FUN
PsiWhiteSpace(' ') PsiElement(fun)('fun')
PsiElement(IDENTIFIER)('f')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_LITERAL PsiElement(IDENTIFIER)('f')
PsiElement(LBRACE)('{') VALUE_PARAMETER_LIST
BODY PsiElement(LPAR)('(')
<empty list> PsiElement(RPAR)(')')
PsiElement(RBRACE)('}') PsiWhiteSpace(' ')
PsiWhiteSpace('\n') PsiElement(EQ)('=')
PsiElement(RBRACE)('}') PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
BODY
<empty list>
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
CLASS_BODY CLASS_BODY
PsiElement(LBRACE)('{') PsiElement(LBRACE)('{')
idea/testData/psi/SimpleClassMembers.txt
+469 -453
View File
@@ -172,84 +172,13 @@ JetFile: SimpleClassMembers.jet
PsiElement(class)('class') PsiElement(class)('class')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
CLASS_OBJECT
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
OBJECT_LITERAL
PsiElement(object)('object')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
CLASS_OBJECT
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
OBJECT_LITERAL
PsiElement(object)('object')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Fooo')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
CLASS_OBJECT
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
OBJECT_LITERAL
PsiElement(object)('object')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Fooo')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DELEGATOR_BY CLASS_BODY
TYPE_REFERENCE PsiElement(LBRACE)('{')
USER_TYPE PsiWhiteSpace('\n\n ')
REFERENCE_EXPRESSION PsiElement(RBRACE)('}')
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
PsiElement(by)('by')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
CLASS_OBJECT CLASS_OBJECT
MODIFIER_LIST MODIFIER_LIST
@@ -258,394 +187,481 @@ JetFile: SimpleClassMembers.jet
PsiElement(class)('class') PsiElement(class)('class')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Fooo')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DELEGATOR_BY CLASS_BODY
TYPE_REFERENCE PsiElement(LBRACE)('{')
USER_TYPE PsiWhiteSpace('\n\n ')
REFERENCE_EXPRESSION PsiElement(RBRACE)('}')
PsiElement(IDENTIFIER)('Bar') PsiWhiteSpace('\n\n ')
PsiWhiteSpace(' ') CLASS_OBJECT
PsiElement(by)('by') MODIFIER_LIST
PsiWhiteSpace(' ') PsiElement(private)('private')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo') PsiElement(class)('class')
PsiElement(COMMA)(',') PsiWhiteSpace(' ')
OBJECT_LITERAL
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL PsiElement(COLON)(':')
TYPE_REFERENCE PsiWhiteSpace(' ')
USER_TYPE DELEGATION_SPECIFIER_LIST
REFERENCE_EXPRESSION DELEGATOR_SUPER_CLASS
PsiElement(IDENTIFIER)('Goo')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n ')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace('\n\n ')
PROPERTY
PsiElement(var)('var')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n\n ')
CONSTRUCTOR
PsiElement(this)('this')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
INITIALIZER_LIST
THIS_CALL
THIS_CONSTRUCTOR_REFERENCE
PsiElement(this)('this')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('c')
PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Foo')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('Fooo')
PsiElement(GT)('>') PsiWhiteSpace(' ')
VALUE_ARGUMENT_LIST CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
CLASS_OBJECT
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
OBJECT_LITERAL
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Fooo')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_BY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
PsiElement(by)('by')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
CLASS_OBJECT
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(class)('class')
PsiWhiteSpace(' ')
OBJECT_LITERAL
OBJECT_DECLARATION
PsiElement(object)('object')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CLASS
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Fooo')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_BY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
PsiElement(by)('by')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Goo')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
CLASS_BODY
PsiErrorElement:Expecting a class body
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
CLASS
PsiElement(class)('class')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n ')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace('\n\n ')
PROPERTY
PsiElement(var)('var')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n\n ')
CONSTRUCTOR
PsiElement(this)('this')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
INITIALIZER_LIST
THIS_CALL
THIS_CONSTRUCTOR_REFERENCE
PsiElement(this)('this')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('c')
PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Foo')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T')
PsiElement(GT)('>')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n ')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace('\n\n ')
PROPERTY
PsiElement(var)('var')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f')
PsiWhiteSpace('\n\n ')
TYPEDEF
PsiElement(type)('type')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar') PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n\n ')
CONSTRUCTOR
PsiElement(this)('this')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace('\n ') PsiWhiteSpace(' ')
PsiElement(RBRACE)('}') PsiElement(COLON)(':')
PsiWhiteSpace('\n\n ') PsiWhiteSpace(' ')
FUN INITIALIZER_LIST
PsiElement(fun)('fun') THIS_CALL
PsiWhiteSpace(' ') THIS_CONSTRUCTOR_REFERENCE
PsiElement(IDENTIFIER)('foo') PsiElement(this)('this')
VALUE_PARAMETER_LIST VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
PsiElement(RPAR)(')') VALUE_ARGUMENT
PsiWhiteSpace('\n\n ') REFERENCE_EXPRESSION
PROPERTY PsiElement(IDENTIFIER)('a')
PsiElement(val)('val') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('x') VALUE_ARGUMENT
PsiWhiteSpace('\n\n ') REFERENCE_EXPRESSION
PROPERTY PsiElement(IDENTIFIER)('b')
PsiElement(var)('var') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('f') VALUE_ARGUMENT
PsiWhiteSpace('\n\n ') REFERENCE_EXPRESSION
TYPEDEF PsiElement(IDENTIFIER)('c')
PsiElement(type)('type') PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiElement(COMMA)(',')
PsiElement(IDENTIFIER)('foo') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') DELEGATOR_SUPER_CALL
TYPE_PARAMETER_LIST
<empty list>
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n\n ')
CONSTRUCTOR
PsiElement(this)('this')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
INITIALIZER_LIST
THIS_CALL
THIS_CONSTRUCTOR_REFERENCE
PsiElement(this)('this')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('c')
PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Foo')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('Foo')
PsiElement(GT)('>') TYPE_ARGUMENT_LIST
VALUE_ARGUMENT_LIST PsiElement(LT)('<')
PsiElement(LPAR)('(') TYPE_PROJECTION
VALUE_ARGUMENT TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('bar') REFERENCE_EXPRESSION
PsiElement(RPAR)(')') PsiElement(IDENTIFIER)('T')
PsiWhiteSpace('\n\n ') PsiElement(GT)('>')
CONSTRUCTOR VALUE_ARGUMENT_LIST
PsiElement(this)('this') PsiElement(LPAR)('(')
VALUE_PARAMETER_LIST VALUE_ARGUMENT
PsiElement(LPAR)('(') REFERENCE_EXPRESSION
PsiElement(RPAR)(')') PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ') PsiElement(RPAR)(')')
PsiElement(COLON)(':') PsiWhiteSpace('\n\n ')
PsiWhiteSpace(' ') CONSTRUCTOR
INITIALIZER_LIST PsiElement(this)('this')
THIS_CALL VALUE_PARAMETER_LIST
THIS_CONSTRUCTOR_REFERENCE PsiElement(LPAR)('(')
PsiElement(this)('this') PsiElement(RPAR)(')')
VALUE_ARGUMENT_LIST PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(COLON)(':')
VALUE_ARGUMENT PsiWhiteSpace(' ')
REFERENCE_EXPRESSION INITIALIZER_LIST
PsiElement(IDENTIFIER)('a') THIS_CALL
PsiElement(COMMA)(',') THIS_CONSTRUCTOR_REFERENCE
PsiWhiteSpace(' ') PsiElement(this)('this')
VALUE_ARGUMENT VALUE_ARGUMENT_LIST
REFERENCE_EXPRESSION PsiElement(LPAR)('(')
PsiElement(IDENTIFIER)('b') VALUE_ARGUMENT
PsiElement(COMMA)(',') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('a')
VALUE_ARGUMENT PsiElement(COMMA)(',')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('c') VALUE_ARGUMENT
PsiElement(RPAR)(')') REFERENCE_EXPRESSION
PsiElement(COMMA)(',') PsiElement(IDENTIFIER)('b')
PsiWhiteSpace(' ') PsiElement(COMMA)(',')
DELEGATOR_SUPER_CALL PsiWhiteSpace(' ')
TYPE_REFERENCE VALUE_ARGUMENT
USER_TYPE REFERENCE_EXPRESSION
REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('c')
PsiElement(IDENTIFIER)('Foo') PsiElement(RPAR)(')')
TYPE_ARGUMENT_LIST PsiElement(COMMA)(',')
PsiElement(LT)('<') PsiWhiteSpace(' ')
TYPE_PROJECTION DELEGATOR_SUPER_CALL
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('T') PsiElement(IDENTIFIER)('Foo')
PsiElement(GT)('>') TYPE_ARGUMENT_LIST
VALUE_ARGUMENT_LIST PsiElement(LT)('<')
PsiElement(LPAR)('(') TYPE_PROJECTION
VALUE_ARGUMENT TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('bar') REFERENCE_EXPRESSION
PsiElement(RPAR)(')') PsiElement(IDENTIFIER)('T')
PsiWhiteSpace(' ') PsiElement(GT)('>')
BLOCK VALUE_ARGUMENT_LIST
PsiElement(LBRACE)('{') PsiElement(LPAR)('(')
PsiWhiteSpace('\n\n ') VALUE_ARGUMENT
PsiElement(RBRACE)('}') REFERENCE_EXPRESSION
PsiWhiteSpace('\n\n ') PsiElement(IDENTIFIER)('bar')
CLASS_OBJECT PsiElement(RPAR)(')')
PsiElement(class)('class') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') BLOCK
OBJECT_LITERAL PsiElement(LBRACE)('{')
PsiElement(object)('object') PsiWhiteSpace('\n\n ')
PsiWhiteSpace(' ') PsiElement(RBRACE)('}')
CLASS_BODY PsiWhiteSpace('\n\n ')
PsiElement(LBRACE)('{') CLASS_OBJECT
PsiWhiteSpace('\n\n ') PsiElement(class)('class')
PsiElement(RBRACE)('}') PsiWhiteSpace(' ')
PsiWhiteSpace('\n\n ') OBJECT_LITERAL
CLASS_OBJECT OBJECT_DECLARATION
MODIFIER_LIST PsiElement(object)('object')
PsiElement(private)('private') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') CLASS_BODY
PsiElement(class)('class') PsiElement(LBRACE)('{')
PsiWhiteSpace(' ') PsiWhiteSpace('\n\n ')
OBJECT_LITERAL PsiElement(RBRACE)('}')
PsiElement(object)('object') PsiWhiteSpace('\n\n ')
PsiWhiteSpace(' ') CLASS_OBJECT
CLASS_BODY MODIFIER_LIST
PsiElement(LBRACE)('{') PsiElement(private)('private')
PsiWhiteSpace('\n\n ') PsiWhiteSpace(' ')
PsiElement(RBRACE)('}') PsiElement(class)('class')
PsiWhiteSpace('\n\n ') PsiWhiteSpace(' ')
CLASS_OBJECT OBJECT_LITERAL
MODIFIER_LIST OBJECT_DECLARATION
PsiElement(private)('private') PsiElement(object)('object')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(class)('class') CLASS_BODY
PsiWhiteSpace(' ') PsiElement(LBRACE)('{')
OBJECT_LITERAL PsiWhiteSpace('\n\n ')
PsiElement(object)('object') PsiElement(RBRACE)('}')
PsiWhiteSpace(' ') PsiWhiteSpace('\n\n ')
PsiElement(COLON)(':') CLASS_OBJECT
PsiWhiteSpace(' ') MODIFIER_LIST
DELEGATION_SPECIFIER_LIST PsiElement(private)('private')
DELEGATOR_SUPER_CLASS PsiWhiteSpace(' ')
TYPE_REFERENCE PsiElement(class)('class')
USER_TYPE PsiWhiteSpace(' ')
REFERENCE_EXPRESSION OBJECT_LITERAL
PsiElement(IDENTIFIER)('Fooo') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
CLASS_BODY PsiWhiteSpace(' ')
PsiElement(LBRACE)('{') PsiElement(COLON)(':')
PsiWhiteSpace('\n\n ') PsiWhiteSpace(' ')
PsiElement(RBRACE)('}') DELEGATION_SPECIFIER_LIST
PsiWhiteSpace('\n\n ') DELEGATOR_SUPER_CLASS
CLASS_OBJECT TYPE_REFERENCE
MODIFIER_LIST USER_TYPE
PsiElement(private)('private') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('Fooo')
PsiElement(class)('class') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') CLASS_BODY
OBJECT_LITERAL PsiElement(LBRACE)('{')
PsiElement(object)('object') PsiWhiteSpace('\n\n ')
PsiWhiteSpace(' ') PsiElement(RBRACE)('}')
PsiElement(COLON)(':') PsiWhiteSpace('\n\n ')
PsiWhiteSpace(' ') CLASS_OBJECT
DELEGATION_SPECIFIER_LIST MODIFIER_LIST
DELEGATOR_SUPER_CLASS PsiElement(private)('private')
TYPE_REFERENCE PsiWhiteSpace(' ')
USER_TYPE PsiElement(class)('class')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Fooo') OBJECT_LITERAL
PsiElement(COMMA)(',') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
DELEGATOR_BY PsiWhiteSpace(' ')
TYPE_REFERENCE PsiElement(COLON)(':')
USER_TYPE PsiWhiteSpace(' ')
REFERENCE_EXPRESSION DELEGATION_SPECIFIER_LIST
PsiElement(IDENTIFIER)('Bar') DELEGATOR_SUPER_CLASS
PsiWhiteSpace(' ') TYPE_REFERENCE
PsiElement(by)('by') USER_TYPE
PsiWhiteSpace(' ') REFERENCE_EXPRESSION
REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('Fooo')
PsiElement(IDENTIFIER)('foo') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
CLASS_BODY DELEGATOR_BY
PsiElement(LBRACE)('{') TYPE_REFERENCE
PsiWhiteSpace('\n\n ') USER_TYPE
PsiElement(RBRACE)('}') REFERENCE_EXPRESSION
PsiWhiteSpace('\n\n ') PsiElement(IDENTIFIER)('Bar')
CLASS_OBJECT PsiWhiteSpace(' ')
MODIFIER_LIST PsiElement(by)('by')
PsiElement(private)('private') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') REFERENCE_EXPRESSION
PsiElement(class)('class') PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL CLASS_BODY
PsiElement(object)('object') PsiElement(LBRACE)('{')
PsiWhiteSpace(' ') PsiWhiteSpace('\n\n ')
PsiElement(COLON)(':') PsiElement(RBRACE)('}')
PsiWhiteSpace(' ') PsiWhiteSpace('\n\n ')
DELEGATION_SPECIFIER_LIST CLASS_OBJECT
DELEGATOR_SUPER_CLASS MODIFIER_LIST
TYPE_REFERENCE PsiElement(private)('private')
USER_TYPE PsiWhiteSpace(' ')
REFERENCE_EXPRESSION PsiElement(class)('class')
PsiElement(IDENTIFIER)('Fooo') PsiWhiteSpace(' ')
PsiElement(COMMA)(',') OBJECT_LITERAL
PsiWhiteSpace(' ') OBJECT_DECLARATION
DELEGATOR_BY PsiElement(object)('object')
TYPE_REFERENCE PsiWhiteSpace(' ')
USER_TYPE PsiElement(COLON)(':')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('Bar') DELEGATION_SPECIFIER_LIST
PsiWhiteSpace(' ') DELEGATOR_SUPER_CLASS
PsiElement(by)('by') TYPE_REFERENCE
PsiWhiteSpace(' ') USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo') PsiElement(IDENTIFIER)('Fooo')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL DELEGATOR_BY
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Goo') PsiElement(IDENTIFIER)('Bar')
VALUE_ARGUMENT_LIST PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(by)('by')
PsiElement(RPAR)(')') PsiWhiteSpace(' ')
PsiWhiteSpace('\n\n\n') REFERENCE_EXPRESSION
PsiElement(RBRACE)('}') PsiElement(IDENTIFIER)('foo')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Goo')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n\n')
CLASS_BODY
PsiErrorElement:Expecting a class body
PsiElement(RBRACE)('}')
PsiErrorElement:Missing '}
<empty list>
idea/testData/psi/SimpleExpressions.txt
+14 -13
View File
@@ -485,19 +485,20 @@ JetFile: SimpleExpressions.jet
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
PsiElement(COLON)(':') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(COLON)(':')
DELEGATION_SPECIFIER_LIST PsiWhiteSpace(' ')
DELEGATOR_SUPER_CLASS DELEGATION_SPECIFIER_LIST
TYPE_REFERENCE DELEGATOR_SUPER_CLASS
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('Foo') REFERENCE_EXPRESSION
CLASS_BODY PsiElement(IDENTIFIER)('Foo')
PsiElement(LBRACE)('{') CLASS_BODY
PsiElement(RBRACE)('}') PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiElement(COMMA)(',') PsiElement(COMMA)(',')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
VALUE_PARAMETER VALUE_PARAMETER
idea/testData/psi/examples/AnonymousObjects.txt
+142 -140
View File
@@ -18,106 +18,107 @@ JetFile: AnonymousObjects.jet
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
VALUE_ARGUMENT VALUE_ARGUMENT
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
PsiElement(COLON)(':') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(COLON)(':')
DELEGATION_SPECIFIER_LIST PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL DELEGATION_SPECIFIER_LIST
TYPE_REFERENCE DELEGATOR_SUPER_CALL
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('MouseAdapter') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('MouseAdapter')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(var)('var')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('clickCount')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('0')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n ')
FUN
MODIFIER_LIST
PsiElement(override)('override')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('mouseClicked')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('e')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('MouseEvent')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
POSTFIX_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('clickCount')
OPERATION_REFERENCE
PsiElement(PLUSPLUS)('++')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n ')
IF
PsiElement(if)('if')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
CONDITION
BINARY_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('clickCount')
PsiWhiteSpace(' ')
OPERATION_REFERENCE
PsiElement(GT)('>')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('3')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
THEN CLASS_BODY
DOT_QUALIFIED_EXPRESSION PsiElement(LBRACE)('{')
REFERENCE_EXPRESSION PsiWhiteSpace('\n\n ')
PsiElement(IDENTIFIER)('GOD') PROPERTY
PsiElement(DOT)('.') MODIFIER_LIST
CALL_EXPRESSION PsiElement(private)('private')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('sendMessage') PsiElement(var)('var')
VALUE_ARGUMENT_LIST PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(IDENTIFIER)('clickCount')
VALUE_ARGUMENT PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION PsiElement(EQ)('=')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('GodMEssages') INTEGER_CONSTANT
PsiElement(DOT)('.') PsiElement(INTEGER_LITERAL)('0')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('TOO_MANY_CLICKS')
PsiElement(RPAR)(')')
PsiElement(SEMICOLON)(';') PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}') FUN
PsiWhiteSpace('\n') MODIFIER_LIST
PsiElement(RBRACE)('}') PsiElement(override)('override')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('mouseClicked')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('e')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('MouseEvent')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
POSTFIX_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('clickCount')
OPERATION_REFERENCE
PsiElement(PLUSPLUS)('++')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n ')
IF
PsiElement(if)('if')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
CONDITION
BINARY_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('clickCount')
PsiWhiteSpace(' ')
OPERATION_REFERENCE
PsiElement(GT)('>')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('3')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
THEN
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('GOD')
PsiElement(DOT)('.')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sendMessage')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('GodMEssages')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('TOO_MANY_CLICKS')
PsiElement(RPAR)(')')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n') PsiWhiteSpace('\n\n')
CLASS CLASS
@@ -155,52 +156,53 @@ JetFile: AnonymousObjects.jet
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
CLASS_BODY PsiWhiteSpace(' ')
PsiElement(LBRACE)('{') CLASS_BODY
PsiWhiteSpace('\n ') PsiElement(LBRACE)('{')
FUN PsiWhiteSpace('\n ')
PsiElement(fun)('fun') FUN
PsiWhiteSpace(' ') PsiElement(fun)('fun')
PsiElement(IDENTIFIER)('sendMessage')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('message')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('GodMEssage')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
THROW
PsiElement(throw)('throw')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
NEW PsiElement(IDENTIFIER)('sendMessage')
PsiElement(new)('new') VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('message')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('GodMEssage')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
THROW
PsiElement(throw)('throw')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE NEW
USER_TYPE PsiElement(new)('new')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('RuntimeException') TYPE_REFERENCE
VALUE_ARGUMENT_LIST USER_TYPE
PsiElement(LPAR)('(')
VALUE_ARGUMENT
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('message') PsiElement(IDENTIFIER)('RuntimeException')
PsiElement(DOT)('.') VALUE_ARGUMENT_LIST
REFERENCE_EXPRESSION PsiElement(LPAR)('(')
PsiElement(IDENTIFIER)('name') VALUE_ARGUMENT
PsiElement(RPAR)(')') DOT_QUALIFIED_EXPRESSION
PsiWhiteSpace('\n') REFERENCE_EXPRESSION
PsiElement(RBRACE)('}') PsiElement(IDENTIFIER)('message')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('name')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n')
PsiElement(RBRACE)('}')
PsiElement(SEMICOLON)(';') PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n') PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')
idea/testData/psi/examples/BinaryTree.txt
+636 -635
View File
File diff suppressed because it is too large Load Diff
idea/testData/psi/examples/Builder.txt
+180 -179
View File
@@ -9,194 +9,195 @@ JetFile: Builder.jet
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION DOT_QUALIFIED_EXPRESSION
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
PsiElement(COLON)(':') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(COLON)(':')
DELEGATION_SPECIFIER_LIST PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL DELEGATION_SPECIFIER_LIST
TYPE_REFERENCE DELEGATOR_SUPER_CALL
USER_TYPE TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('AntBuilder')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lazy')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('groovy')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('AntBuilder') PsiElement(IDENTIFIER)('library')
VALUE_ARGUMENT_LIST PsiWhiteSpace(' ')
PsiElement(LPAR)('(') FUNCTION_LITERAL
PsiElement(RPAR)(')') PsiElement(LBRACE)('{')
PsiWhiteSpace(' ') PsiWhiteSpace('\n ')
CLASS_BODY BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lazy')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('groovy')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('library')
PsiWhiteSpace(' ')
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
BODY
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('classpath')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
STRING_CONSTANT
PsiElement(STRING_LITERAL)('"$libs/groovy-..."')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lazy')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('gant')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('library')
PsiWhiteSpace(' ')
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
BODY
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
NEW
PsiElement(new)('new')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('File')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
STRING_CONSTANT
PsiElement(STRING_LITERAL)('"$gantHome/lib"')
PsiElement(RPAR)(')')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('files')
PsiElement(DOT)('.')
CALL_EXPRESSION CALL_EXPRESSION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('each') PsiElement(IDENTIFIER)('classpath')
PsiWhiteSpace(' ') VALUE_ARGUMENT_LIST
FUNCTION_LITERAL PsiElement(LPAR)('(')
PsiElement(LBRACE)('{') VALUE_ARGUMENT
PsiWhiteSpace('\n ') STRING_CONSTANT
BODY PsiElement(STRING_LITERAL)('"$libs/groovy-..."')
CALL_EXPRESSION PsiElement(RPAR)(')')
REFERENCE_EXPRESSION PsiWhiteSpace('\n ')
PsiElement(IDENTIFIER)('classpath') PsiElement(RBRACE)('}')
VALUE_ARGUMENT_LIST PsiWhiteSpace('\n\n ')
PsiElement(LPAR)('(') PROPERTY
VALUE_ARGUMENT MODIFIER_LIST
REFERENCE_EXPRESSION ATTRIBUTE_ANNOTATION
PsiElement(IDENTIFIER)('it') PsiElement(LBRACKET)('[')
PsiElement(RPAR)(')') ATTRIBUTE
PsiWhiteSpace('\n ') TYPE_REFERENCE
PsiElement(RBRACE)('}') USER_TYPE
PsiWhiteSpace('\n ') REFERENCE_EXPRESSION
PsiElement(RBRACE)('}') PsiElement(IDENTIFIER)('lazy')
PsiWhiteSpace('\n\n ') PsiElement(RBRACKET)(']')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('lazy')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('JPS')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('module')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
FUNCTION_LITERAL PsiElement(val)('val')
PsiElement(LBRACE)('{') PsiWhiteSpace(' ')
PsiWhiteSpace('\n ') PsiElement(IDENTIFIER)('gant')
BODY PsiWhiteSpace(' ')
BINARY_EXPRESSION PsiElement(EQ)('=')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('targetLevel') CALL_EXPRESSION
PsiWhiteSpace(' ') REFERENCE_EXPRESSION
OPERATION_REFERENCE PsiElement(IDENTIFIER)('library')
PsiElement(EQ)('=') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') FUNCTION_LITERAL
STRING_CONSTANT PsiElement(LBRACE)('{')
PsiElement(STRING_LITERAL)('"1.5"')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
CALL_EXPRESSION BODY
REFERENCE_EXPRESSION DOT_QUALIFIED_EXPRESSION
PsiElement(IDENTIFIER)('classpath') DOT_QUALIFIED_EXPRESSION
VALUE_ARGUMENT_LIST NEW
PsiElement(LPAR)('(') PsiElement(new)('new')
VALUE_ARGUMENT PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('File')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
STRING_CONSTANT
PsiElement(STRING_LITERAL)('"$gantHome/lib"')
PsiElement(RPAR)(')')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('antLayout') PsiElement(IDENTIFIER)('files')
PsiElement(COMMA)(',') PsiElement(DOT)('.')
PsiWhiteSpace(' ') CALL_EXPRESSION
VALUE_ARGUMENT
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('gant') PsiElement(IDENTIFIER)('each')
PsiElement(COMMA)(',') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') FUNCTION_LITERAL
VALUE_ARGUMENT PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
BODY
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('classpath')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('it')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('groovy') PsiElement(IDENTIFIER)('lazy')
PsiElement(RPAR)(')') PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('JPS')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('module')
PsiWhiteSpace(' ')
FUNCTION_LITERAL
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
CALL_EXPRESSION BODY
REFERENCE_EXPRESSION BINARY_EXPRESSION
PsiElement(IDENTIFIER)('src') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('targetLevel')
PsiElement(LPAR)('(') PsiWhiteSpace(' ')
VALUE_ARGUMENT OPERATION_REFERENCE
STRING_CONSTANT PsiElement(EQ)('=')
PsiElement(STRING_LITERAL)('"$projectHome/antLayout/src"') PsiWhiteSpace(' ')
PsiElement(RPAR)(')') STRING_CONSTANT
PsiWhiteSpace('\n ') PsiElement(STRING_LITERAL)('"1.5"')
PsiElement(RBRACE)('}') PsiWhiteSpace('\n ')
PsiWhiteSpace('\n\n') CALL_EXPRESSION
PsiElement(RBRACE)('}') REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('classpath')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('antLayout')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('gant')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('groovy')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('src')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
STRING_CONSTANT
PsiElement(STRING_LITERAL)('"$projectHome/antLayout/src"')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}')
PsiElement(DOT)('.') PsiElement(DOT)('.')
CALL_EXPRESSION CALL_EXPRESSION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
idea/testData/psi/examples/PolymorphicClassObjects.txt
+57 -56
View File
@@ -135,63 +135,64 @@ JetFile: PolymorphicClassObjects.jet
PsiElement(class)('class') PsiElement(class)('class')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
PsiElement(COLON)(':') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(COLON)(':')
DELEGATION_SPECIFIER_LIST PsiWhiteSpace(' ')
DELEGATOR_SUPER_CLASS DELEGATION_SPECIFIER_LIST
TYPE_REFERENCE DELEGATOR_SUPER_CLASS
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('Buildable') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('Buildable')
CLASS_BODY PsiWhiteSpace(' ')
PsiElement(LBRACE)('{') CLASS_BODY
PsiWhiteSpace('\n ') PsiElement(LBRACE)('{')
FUN PsiWhiteSpace('\n ')
MODIFIER_LIST FUN
PsiElement(override)('override') MODIFIER_LIST
PsiWhiteSpace(' ') PsiElement(override)('override')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('newBuilder')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('E')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_PARAMETER PsiElement(fun)('fun')
PsiElement(IDENTIFIER)('R') PsiWhiteSpace(' ')
PsiElement(GT)('>') PsiElement(IDENTIFIER)('newBuilder')
VALUE_PARAMETER_LIST TYPE_PARAMETER_LIST
PsiElement(LPAR)('(') PsiElement(LT)('<')
PsiElement(RPAR)(')') TYPE_PARAMETER
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('E')
PsiElement(COLON)(':') PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_PARAMETER
USER_TYPE PsiElement(IDENTIFIER)('R')
REFERENCE_EXPRESSION PsiElement(GT)('>')
PsiElement(IDENTIFIER)('Builder') VALUE_PARAMETER_LIST
TYPE_ARGUMENT_LIST PsiElement(LPAR)('(')
PsiElement(LT)('<') PsiElement(RPAR)(')')
TYPE_PROJECTION PsiWhiteSpace(' ')
TYPE_REFERENCE PsiElement(COLON)(':')
USER_TYPE PsiWhiteSpace(' ')
REFERENCE_EXPRESSION TYPE_REFERENCE
PsiElement(IDENTIFIER)('E') USER_TYPE
PsiElement(COMMA)(',') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('Builder')
TYPE_PROJECTION TYPE_ARGUMENT_LIST
TYPE_REFERENCE PsiElement(LT)('<')
USER_TYPE TYPE_PROJECTION
REFERENCE_EXPRESSION TYPE_REFERENCE
PsiElement(IDENTIFIER)('R') USER_TYPE
PsiElement(GT)('>') REFERENCE_EXPRESSION
PsiWhiteSpace('\n\n ') PsiElement(IDENTIFIER)('E')
PsiElement(RBRACE)('}') PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('R')
PsiElement(GT)('>')
PsiWhiteSpace('\n\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n') PsiWhiteSpace('\n\n')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n') PsiWhiteSpace('\n\n')
idea/testData/psi/examples/UpdateOperation.txt
+77 -76
View File
@@ -37,90 +37,91 @@ JetFile: UpdateOperation.jet
PsiElement(class)('class') PsiElement(class)('class')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
CLASS_BODY PsiWhiteSpace(' ')
PsiElement(LBRACE)('{') CLASS_BODY
PsiWhiteSpace('\n ') PsiElement(LBRACE)('{')
FUN PsiWhiteSpace('\n ')
PsiElement(fun)('fun') FUN
PsiWhiteSpace(' ') PsiElement(fun)('fun')
PsiElement(IDENTIFIER)('copy') PsiWhiteSpace(' ')
VALUE_PARAMETER_LIST PsiElement(IDENTIFIER)('copy')
PsiElement(LPAR)('(') VALUE_PARAMETER_LIST
VALUE_PARAMETER PsiElement(LPAR)('(')
PsiElement(IDENTIFIER)('from') VALUE_PARAMETER
PsiElement(IDENTIFIER)('from')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Pair')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(COLON)(':') VALUE_PARAMETER
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('from')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('y')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('from')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
NEW
PsiElement(new)('new')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
TYPE_REFERENCE TYPE_REFERENCE
USER_TYPE USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Pair') PsiElement(IDENTIFIER)('Pair')
PsiElement(COMMA)(',') VALUE_ARGUMENT_LIST
PsiWhiteSpace(' ') PsiElement(LPAR)('(')
VALUE_PARAMETER VALUE_ARGUMENT
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int') PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ') PsiElement(COMMA)(',')
PsiElement(EQ)('=') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') VALUE_ARGUMENT
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('from')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_PARAMETER
PsiElement(IDENTIFIER)('y')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int') PsiElement(IDENTIFIER)('y')
PsiWhiteSpace(' ') PsiElement(RPAR)(')')
PsiElement(EQ)('=') PsiWhiteSpace('\n ')
PsiWhiteSpace(' ') PsiElement(RBRACE)('}')
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('from')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
NEW
PsiElement(new)('new')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Pair')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('x')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('y')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n') PsiWhiteSpace('\n\n')
idea/testData/psi/examples/collections/ArrayList.txt
+232 -231
View File
@@ -140,252 +140,253 @@ JetFile: ArrayList.jet
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
DELEGATION_SPECIFIER_LIST
DELEGATOR_SUPER_CALL
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('IMutableIterator')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiComment(EOL_COMMENT)('// T is inferred') PsiElement(COLON)(':')
PsiWhiteSpace('\n ') PsiWhiteSpace(' ')
PROPERTY DELEGATION_SPECIFIER_LIST
MODIFIER_LIST DELEGATOR_SUPER_CALL
PsiElement(private)('private') TYPE_REFERENCE
PsiWhiteSpace(' ') USER_TYPE
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('index')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('0')
PsiWhiteSpace('\n ')
PROPERTY
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(var)('var')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('myVersion')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('version')
PsiWhiteSpace('\n\n ')
FUN
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('checkVersion')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
IF
PsiElement(if)('if')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
CONDITION
BINARY_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('version')
PsiWhiteSpace(' ')
OPERATION_REFERENCE
PsiElement(EXCLEQ)('!=')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('myVersion')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
THEN
THROW
PsiElement(throw)('throw')
PsiWhiteSpace(' ')
NEW
PsiElement(new)('new')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ConcurrentModificationException')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
FUN
MODIFIER_LIST
PsiElement(override)('override')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('next')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('checkVersion')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
IF
PsiElement(if)('if')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
CONDITION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('hasNext') PsiElement(IDENTIFIER)('IMutableIterator')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace('\n ') PsiWhiteSpace(' ')
THEN CLASS_BODY
THROW PsiElement(LBRACE)('{')
PsiElement(throw)('throw')
PsiWhiteSpace(' ')
NEW
PsiElement(new)('new')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('NoMoreElementsException')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
ARRAY_ACCESS_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('data')
INDICES
PsiElement(LBRACKET)('[')
POSTFIX_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('index')
OPERATION_REFERENCE
PsiElement(PLUSPLUS)('++')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
PsiElement(override)('override')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(val)('val') PsiComment(EOL_COMMENT)('// T is inferred')
PsiWhiteSpace(' ') PsiWhiteSpace('\n ')
PsiElement(IDENTIFIER)('hasNext') PROPERTY
PsiWhiteSpace('\n ') MODIFIER_LIST
PROPERTY_ACCESSOR PsiElement(private)('private')
PsiElement(get)('get') PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(val)('val')
PsiElement(RPAR)(')') PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('index')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION INTEGER_CONSTANT
REFERENCE_EXPRESSION PsiElement(INTEGER_LITERAL)('0')
PsiElement(IDENTIFIER)('index') PsiWhiteSpace('\n ')
PsiWhiteSpace(' ') PROPERTY
OPERATION_REFERENCE MODIFIER_LIST
PsiElement(LT)('<') PsiElement(private)('private')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
REFERENCE_EXPRESSION PsiElement(var)('var')
PsiElement(IDENTIFIER)('used') PsiWhiteSpace(' ')
PsiWhiteSpace('\n\n\n ') PsiElement(IDENTIFIER)('myVersion')
FUN PsiWhiteSpace(' ')
MODIFIER_LIST PsiElement(EQ)('=')
PsiElement(override)('override') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') REFERENCE_EXPRESSION
PsiElement(fun)('fun') PsiElement(IDENTIFIER)('version')
PsiWhiteSpace(' ') PsiWhiteSpace('\n\n ')
PsiElement(IDENTIFIER)('remove') FUN
VALUE_PARAMETER_LIST MODIFIER_LIST
PsiElement(LPAR)('(') PsiElement(private)('private')
PsiElement(RPAR)(')') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(fun)('fun')
BLOCK PsiWhiteSpace(' ')
PsiElement(LBRACE)('{') PsiElement(IDENTIFIER)('checkVersion')
PsiWhiteSpace('\n ') VALUE_PARAMETER_LIST
CALL_EXPRESSION PsiElement(LPAR)('(')
REFERENCE_EXPRESSION PsiElement(RPAR)(')')
PsiElement(IDENTIFIER)('checkVersion') PsiWhiteSpace(' ')
VALUE_ARGUMENT_LIST BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
IF
PsiElement(if)('if')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(') PsiElement(LPAR)('(')
CONDITION
BINARY_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('version')
PsiWhiteSpace(' ')
OPERATION_REFERENCE
PsiElement(EXCLEQ)('!=')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('myVersion')
PsiElement(RPAR)(')') PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
THEN
THROW
PsiElement(throw)('throw')
PsiWhiteSpace(' ')
NEW
PsiElement(new)('new')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ConcurrentModificationException')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
FUN
MODIFIER_LIST
PsiElement(override)('override')
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('next')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('checkVersion')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
IF
PsiElement(if)('if')
PsiWhiteSpace(' ')
PsiElement(LPAR)('(')
CONDITION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('hasNext')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
THEN
THROW
PsiElement(throw)('throw')
PsiWhiteSpace(' ')
NEW
PsiElement(new)('new')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('NoMoreElementsException')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
ARRAY_ACCESS_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('data')
INDICES
PsiElement(LBRACKET)('[')
POSTFIX_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('index')
OPERATION_REFERENCE
PsiElement(PLUSPLUS)('++')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
PsiElement(override)('override')
PsiWhiteSpace(' ')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('hasNext')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PROPERTY PROPERTY_ACCESSOR
PsiElement(val)('val') PsiElement(get)('get')
PsiWhiteSpace(' ') PsiElement(LPAR)('(')
PsiElement(IDENTIFIER)('result') PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION BINARY_EXPRESSION
DOT_QUALIFIED_EXPRESSION REFERENCE_EXPRESSION
REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('index')
PsiElement(IDENTIFIER)('ArrayList') PsiWhiteSpace(' ')
PsiElement(DOT)('.') OPERATION_REFERENCE
THIS_EXPRESSION PsiElement(LT)('<')
REFERENCE_EXPRESSION PsiWhiteSpace(' ')
PsiElement(this)('this') REFERENCE_EXPRESSION
PsiElement(DOT)('.') PsiElement(IDENTIFIER)('used')
CALL_EXPRESSION PsiWhiteSpace('\n\n\n ')
REFERENCE_EXPRESSION FUN
PsiElement(IDENTIFIER)('remove') MODIFIER_LIST
VALUE_ARGUMENT_LIST PsiElement(override)('override')
PsiElement(LPAR)('(') PsiWhiteSpace(' ')
VALUE_ARGUMENT PsiElement(fun)('fun')
BINARY_EXPRESSION PsiWhiteSpace(' ')
REFERENCE_EXPRESSION PsiElement(IDENTIFIER)('remove')
PsiElement(IDENTIFIER)('index') VALUE_PARAMETER_LIST
PsiWhiteSpace(' ') PsiElement(LPAR)('(')
OPERATION_REFERENCE PsiElement(RPAR)(')')
PsiElement(MINUS)('-') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') BLOCK
INTEGER_CONSTANT PsiElement(LBRACE)('{')
PsiElement(INTEGER_LITERAL)('1') PsiWhiteSpace('\n ')
PsiElement(RPAR)(')') CALL_EXPRESSION
PsiWhiteSpace('\n ') REFERENCE_EXPRESSION
BINARY_EXPRESSION PsiElement(IDENTIFIER)('checkVersion')
REFERENCE_EXPRESSION VALUE_ARGUMENT_LIST
PsiElement(IDENTIFIER)('myVersion') PsiElement(LPAR)('(')
PsiWhiteSpace(' ') PsiElement(RPAR)(')')
OPERATION_REFERENCE PsiWhiteSpace('\n ')
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('result')
PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ArrayList')
PsiElement(DOT)('.')
THIS_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(this)('this')
PsiElement(DOT)('.')
CALL_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('remove')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
BINARY_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('index')
PsiWhiteSpace(' ')
OPERATION_REFERENCE
PsiElement(MINUS)('-')
PsiWhiteSpace(' ')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n ')
BINARY_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('myVersion')
PsiWhiteSpace(' ')
OPERATION_REFERENCE
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('version')
PsiWhiteSpace('\n ')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('version') PsiElement(IDENTIFIER)('result')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
REFERENCE_EXPRESSION PsiElement(RBRACE)('}')
PsiElement(IDENTIFIER)('result') PsiWhiteSpace('\n ')
PsiWhiteSpace('\n ') PsiElement(RBRACE)('}')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n\n ') PsiWhiteSpace('\n\n ')
FUN FUN
MODIFIER_LIST MODIFIER_LIST
idea/testData/psi/examples/collections/List.txt
+100 -99
View File
@@ -225,116 +225,117 @@ JetFile: List.jet
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OBJECT_LITERAL OBJECT_LITERAL
PsiElement(object)('object') OBJECT_DECLARATION
PsiWhiteSpace(' ') PsiElement(object)('object')
PsiElement(COLON)(':') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(COLON)(':')
DELEGATION_SPECIFIER_LIST PsiWhiteSpace(' ')
DELEGATOR_SUPER_CALL DELEGATION_SPECIFIER_LIST
TYPE_REFERENCE DELEGATOR_SUPER_CALL
USER_TYPE TYPE_REFERENCE
REFERENCE_EXPRESSION USER_TYPE
PsiElement(IDENTIFIER)('IIterator') REFERENCE_EXPRESSION
VALUE_ARGUMENT_LIST PsiElement(IDENTIFIER)('IIterator')
PsiElement(LPAR)('(') VALUE_ARGUMENT_LIST
PsiElement(RPAR)(')') PsiElement(LPAR)('(')
PsiWhiteSpace(' ') PsiElement(RPAR)(')')
CLASS_BODY PsiWhiteSpace(' ')
PsiElement(LBRACE)('{') CLASS_BODY
PsiWhiteSpace('\n ') PsiElement(LBRACE)('{')
PROPERTY PsiWhiteSpace('\n ')
MODIFIER_LIST PROPERTY
PsiElement(private)('private') MODIFIER_LIST
PsiWhiteSpace(' ') PsiElement(private)('private')
PsiElement(var)('var') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(var)('var')
PsiElement(IDENTIFIER)('current') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('current')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('List')
PsiElement(DOT)('.')
THIS_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(this)('this')
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
PsiElement(override)('override')
PsiWhiteSpace(' ')
PsiElement(val)('val')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('hasNext')
PsiWhiteSpace('\n ')
PROPERTY_ACCESSOR
PsiElement(get)('get')
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
BINARY_EXPRESSION DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('current') PsiElement(IDENTIFIER)('List')
PsiWhiteSpace(' ') PsiElement(DOT)('.')
OPERATION_REFERENCE THIS_EXPRESSION
PsiElement(EQEQ)('==') REFERENCE_EXPRESSION
PsiWhiteSpace(' ') PsiElement(this)('this')
REFERENCE_EXPRESSION PsiWhiteSpace('\n\n ')
PsiElement(IDENTIFIER)('Nil') PROPERTY
PsiWhiteSpace('\n\n ') MODIFIER_LIST
FUN PsiElement(override)('override')
MODIFIER_LIST PsiWhiteSpace(' ')
PsiElement(override)('override') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(fun)('fun') PsiElement(IDENTIFIER)('hasNext')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('next')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
BLOCK
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
PROPERTY PROPERTY_ACCESSOR
PsiElement(val)('val') PsiElement(get)('get')
PsiWhiteSpace(' ') PsiElement(LPAR)('(')
PsiElement(IDENTIFIER)('result') PsiElement(RPAR)(')')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
PsiElement(EQ)('=') PsiElement(EQ)('=')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION BINARY_EXPRESSION
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('current') PsiElement(IDENTIFIER)('current')
PsiElement(DOT)('.') PsiWhiteSpace(' ')
OPERATION_REFERENCE
PsiElement(EQEQ)('==')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('value') PsiElement(IDENTIFIER)('Nil')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n\n ')
BINARY_EXPRESSION FUN
REFERENCE_EXPRESSION MODIFIER_LIST
PsiElement(IDENTIFIER)('current') PsiElement(override)('override')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
OPERATION_REFERENCE PsiElement(fun)('fun')
PsiElement(EQ)('=') PsiWhiteSpace(' ')
PsiWhiteSpace(' ') PsiElement(IDENTIFIER)('next')
DOT_QUALIFIED_EXPRESSION VALUE_PARAMETER_LIST
REFERENCE_EXPRESSION PsiElement(LPAR)('(')
PsiElement(IDENTIFIER)('current') PsiElement(RPAR)(')')
PsiElement(DOT)('.') PsiWhiteSpace(' ')
REFERENCE_EXPRESSION BLOCK
PsiElement(IDENTIFIER)('tail') PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ') PsiWhiteSpace('\n ')
RETURN PROPERTY
PsiElement(return)('return') PsiElement(val)('val')
PsiWhiteSpace(' ') PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('result') PsiElement(IDENTIFIER)('result')
PsiWhiteSpace('\n ') PsiWhiteSpace(' ')
PsiElement(RBRACE)('}') PsiElement(EQ)('=')
PsiWhiteSpace('\n ') PsiWhiteSpace(' ')
PsiElement(RBRACE)('}') DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('current')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('value')
PsiWhiteSpace('\n ')
BINARY_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('current')
PsiWhiteSpace(' ')
OPERATION_REFERENCE
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
DOT_QUALIFIED_EXPRESSION
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('current')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('tail')
PsiWhiteSpace('\n ')
RETURN
PsiElement(return)('return')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('result')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n ')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(RBRACE)('}') PsiElement(RBRACE)('}')