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

Short annotations supported in parser for toplevel declarations

Browse Source 
Error recovery tests fail
This commit is contained in:
Andrey Breslav
2011-07-13 23:22:50 +04:00
parent 252086263c
commit 3ead58dc78
49 changed files with 618 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grammar/src/attributes.grm
+3 -2
View File
@@ -7,9 +7,10 @@ annotations
;
annotation
: "[" annotationEntry{","} "]"
: "[" annotationEntry+ "]"
: annotationEntry
;
annotationEntry
: SimpleName{"."} (valueArguments | "=" expression)?
: SimpleName{"."} typeArguments? valueArguments?
;
grammar/src/types.grm
+1 -1
View File
@@ -43,7 +43,7 @@ simpleUserType
;
optionalProjection
: modifiers
: varianceAnnotation
;
functionType
idea/src/org/jetbrains/jet/JetNodeTypes.java
+3 -2
View File
@@ -37,8 +37,9 @@ public interface JetNodeTypes {
JetNodeType NAMESPACE_BODY = new JetNodeType("NAMESPACE_BODY", JetNamespaceBody.class);
JetNodeType MODIFIER_LIST = new JetNodeType("MODIFIER_LIST", JetModifierList.class);
JetNodeType PRIMARY_CONSTRUCTOR_MODIFIER_LIST = new JetNodeType("PRIMARY_CONSTRUCTOR_MODIFIER_LIST", JetModifierList.class);
JetNodeType ATTRIBUTE_ANNOTATION = new JetNodeType("ATTRIBUTE_ANNOTATION", JetAttributeAnnotation.class);
JetNodeType ATTRIBUTE = new JetNodeType("ATTRIBUTE", JetAttribute.class);
JetNodeType ANNOTATION = new JetNodeType("ANNOTATION", JetAnnotation.class);
JetNodeType ANNOTATION_ENTRY = new JetNodeType("ANNOTATION_ENTRY", JetAnnotationEntry.class);
JetNodeType TYPE_ARGUMENT_LIST = new JetNodeType("TYPE_ARGUMENT_LIST", JetTypeArgumentList.class);
JetNodeType VALUE_ARGUMENT_LIST = new JetNodeType("VALUE_ARGUMENT_LIST", JetArgumentList.class);
JetNodeType VALUE_ARGUMENT = new JetNodeType("VALUE_ARGUMENT", JetArgument.class);
idea/src/org/jetbrains/jet/lang/ErrorHandler.java
+1 -1
View File
@@ -21,7 +21,7 @@ public class ErrorHandler {
@Override
public void genericError(@NotNull ASTNode node, @NotNull String errorMessage) {
throw new IllegalStateException(errorMessage);
throw new IllegalStateException(errorMessage + " at " + node.getText());
}
@Override
idea/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java
+4 -1
View File
@@ -287,12 +287,15 @@ import static org.jetbrains.jet.lexer.JetTokens.*;
*
* Returns -1 if no occurrence is found
*
* TODO: Migrate to predicates
*/
protected int findLastBefore(TokenSet lookFor, TokenSet stopAt, boolean dontStopRightAfterOccurrence) {
return matchTokenStreamPredicate(new LastBefore(new AtSet(lookFor), new AtSet(stopAt), dontStopRightAfterOccurrence));
}
protected int findLastBefore(IElementType lookFor, TokenSet stopAt, boolean dontStopRightAfterOccurrence) {
return matchTokenStreamPredicate(new LastBefore(new At(lookFor), new AtSet(stopAt), dontStopRightAfterOccurrence));
}
protected boolean eol() {
return myBuilder.newlineBeforeCurrentToken() || eof();
}
idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+9 -6
View File
@@ -291,7 +291,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
if (at(LBRACKET)) {
if (!parseLocalDeclaration()) {
PsiBuilder.Marker expression = mark();
myJetParsing.parseAttributeList();
myJetParsing.parseAnnotations(false);
parsePrefixExpression();
expression.done(ANNOTATED_EXPRESSION);
} else {
@@ -678,7 +678,10 @@ public class JetExpressionParsing extends AbstractJetParsing {
int valPos = matchTokenStreamPredicate(new FirstBefore(new At(VAL_KEYWORD), new AtSet(RPAR, LBRACE, RBRACE, SEMICOLON, EQ)));
if (valPos >= 0) {
PsiBuilder.Marker property = mark();
myJetParsing.parseModifierList(MODIFIER_LIST, true);
myJetParsing.parseProperty(true);
property.done(PROPERTY);
} else {
parseExpression();
}
@@ -826,7 +829,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
private void parsePattern() {
PsiBuilder.Marker pattern = mark();
myJetParsing.parseAttributeList();
myJetParsing.parseAnnotations(false);
if (at(NAMESPACE_KEYWORD) || at(IDENTIFIER) || at(FUN_KEYWORD) || at(THIS_KEYWORD)) {
PsiBuilder.Marker rollbackMarker = mark();
@@ -1011,7 +1014,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
private boolean parseLocalDeclaration() {
PsiBuilder.Marker decl = mark();
JetParsing.TokenDetector enumDetector = new JetParsing.TokenDetector(ENUM_KEYWORD);
myJetParsing.parseModifierList(MODIFIER_LIST, enumDetector);
myJetParsing.parseModifierList(MODIFIER_LIST, enumDetector, false);
JetNodeType declType = parseLocalDeclarationRest(enumDetector.isDetected());
@@ -1089,9 +1092,9 @@ public class JetExpressionParsing extends AbstractJetParsing {
while (!eof()) {
PsiBuilder.Marker parameter = mark();
int parameterNamePos = matchTokenStreamPredicate(new LastBefore(new At(IDENTIFIER), new AtOffset(doubleArrowPos)));
createTruncatedBuilder(parameterNamePos).parseModifierList(MODIFIER_LIST);
int parameterNamePos = matchTokenStreamPredicate(new LastBefore(new At(IDENTIFIER), new AtOffset(doubleArrowPos)));
createTruncatedBuilder(parameterNamePos).parseModifierList(MODIFIER_LIST, false);
expect(IDENTIFIER, "Expecting parameter name", TokenSet.create(DOUBLE_ARROW));
@@ -1143,7 +1146,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
PsiBuilder.Marker parameter = mark();
int parameterNamePos = matchTokenStreamPredicate(new LastBefore(new At(IDENTIFIER), new AtSet(COMMA, RPAR, COLON, DOUBLE_ARROW)));
createTruncatedBuilder(parameterNamePos).parseModifierList(MODIFIER_LIST);
createTruncatedBuilder(parameterNamePos).parseModifierList(MODIFIER_LIST, false);
expect(IDENTIFIER, "Expecting parameter declaration");
idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+87 -70
View File
@@ -116,7 +116,7 @@ public class JetParsing extends AbstractJetParsing {
* ;
*/
PsiBuilder.Marker firstEntry = mark();
parseModifierList(MODIFIER_LIST);
parseModifierList(MODIFIER_LIST, true);
if (at(NAMESPACE_KEYWORD)) {
advance(); // NAMESPACE_KEYWORD
@@ -220,7 +220,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker decl = mark();
TokenDetector detector = new TokenDetector(ENUM_KEYWORD);
parseModifierList(MODIFIER_LIST, detector);
parseModifierList(MODIFIER_LIST, detector, true);
IElementType keywordToken = tt();
JetNodeType declType = null;
@@ -256,8 +256,8 @@ public class JetParsing extends AbstractJetParsing {
/*
* (modifier | attribute)*
*/
public boolean parseModifierList(JetNodeType nodeType) {
return parseModifierList(nodeType, null);
public boolean parseModifierList(JetNodeType nodeType, boolean allowShortAnnotations) {
return parseModifierList(nodeType, null, allowShortAnnotations);
}
/**
@@ -265,16 +265,17 @@ public class JetParsing extends AbstractJetParsing {
*
* Feeds modifiers (not attributes) into the passed consumer, if it is not null
*/
public boolean parseModifierList(JetNodeType nodeType, Consumer<IElementType> tokenConsumer) {
public boolean parseModifierList(JetNodeType nodeType, Consumer<IElementType> tokenConsumer, boolean allowShortAnnotations) {
PsiBuilder.Marker list = mark();
boolean empty = true;
while (!eof()) {
if (at(LBRACKET)) {
parseAttributeAnnotation();
} else if (atSet(MODIFIER_KEYWORDS)) {
if (atSet(MODIFIER_KEYWORDS)) {
if (tokenConsumer != null) tokenConsumer.consume(tt());
advance(); // MODIFIER
}
else if (at(LBRACKET) || (allowShortAnnotations && at(IDENTIFIER))) {
parseAnnotation(allowShortAnnotations);
}
else {
break;
}
@@ -289,54 +290,77 @@ public class JetParsing extends AbstractJetParsing {
}
/*
* attributeAnnotation
* : "[" attribute{","} "]"
* annotations
* : annotation*
* ;
*/
private void parseAttributeAnnotation() {
assert _at(LBRACKET);
PsiBuilder.Marker annotation = mark();
myBuilder.disableNewlines();
advance(); // LBRACKET
while (true) {
if (at(IDENTIFIER)) {
parseAttribute();
if (!at(COMMA)) break;
advance(); // COMMA
}
else {
error("Expecting a comma-separated list of attributes");
break;
}
}
expect(RBRACKET, "Expecting ']' to close an attribute annotation");
myBuilder.restoreNewlinesState();
annotation.done(ATTRIBUTE_ANNOTATION);
public void parseAnnotations(boolean allowShortAnnotations) {
while (parseAnnotation(allowShortAnnotations));
}
/*
* attribute
* // : SimpleName{"."} (valueArguments | "=" element)?
* [for recovery: userType valueArguments?]
* annotation
* : "[" annotationEntry+ "]"
* : annotationEntry
* ;
*/
private void parseAttribute() {
private boolean parseAnnotation(boolean allowShortAnnotations) {
if (at(LBRACKET)) {
PsiBuilder.Marker annotation = mark();
myBuilder.disableNewlines();
advance(); // LBRACKET
if (!at(IDENTIFIER)) {
error("Expecting a list of attributes");
}
else {
parseAnnotationEntry();
while (at(COMMA)) {
errorAndAdvance("No commas needed to separate attributes");
}
while (at(IDENTIFIER)) {
parseAnnotationEntry();
while (at(COMMA)) {
errorAndAdvance("No commas needed to separate attributes");
}
}
}
expect(RBRACKET, "Expecting ']' to close an attribute annotation");
myBuilder.restoreNewlinesState();
annotation.done(ANNOTATION);
return true;
}
else if (allowShortAnnotations && at(IDENTIFIER)) {
parseAnnotationEntry();
return true;
}
return false;
}
/*
* annotationEntry
* : SimpleName{"."} typeArguments? valueArguments?
* ;
*/
private void parseAnnotationEntry() {
assert _at(IDENTIFIER);
PsiBuilder.Marker attribute = mark();
PsiBuilder.Marker typeReference = mark();
parseUserType();
typeReference.done(TYPE_REFERENCE);
parseTypeArgumentList(-1);
if (at(LPAR)) {
myExpressionParsing.parseValueArgumentList();
} else if (at(EQ)) {
advance(); // EQ
myExpressionParsing.parseExpression();
}
attribute.done(ATTRIBUTE);
attribute.done(ANNOTATION_ENTRY);
}
/*
@@ -400,7 +424,7 @@ public class JetParsing extends AbstractJetParsing {
parseValueParameterList(false, TokenSet.create(COLON, LBRACE));
}
else {
if (parseModifierList(PRIMARY_CONSTRUCTOR_MODIFIER_LIST)) {
if (parseModifierList(PRIMARY_CONSTRUCTOR_MODIFIER_LIST, false)) {
parseValueParameterList(false, TokenSet.create(COLON, LBRACE));
}
else {
@@ -448,7 +472,7 @@ public class JetParsing extends AbstractJetParsing {
TokenSet constructorNameFollow = TokenSet.create(SEMICOLON, COLON, LPAR, LT, LBRACE);
int lastId = findLastBefore(ENUM_MEMBER_FIRST, constructorNameFollow, false);
TokenDetector enumDetector = new TokenDetector(ENUM_KEYWORD);
createTruncatedBuilder(lastId).parseModifierList(MODIFIER_LIST, enumDetector);
createTruncatedBuilder(lastId).parseModifierList(MODIFIER_LIST, enumDetector, false);
IElementType type;
if (at(IDENTIFIER)) {
@@ -551,7 +575,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker decl = mark();
TokenDetector enumDetector = new TokenDetector(ENUM_KEYWORD);
parseModifierList(MODIFIER_LIST, enumDetector);
parseModifierList(MODIFIER_LIST, enumDetector, true);
JetNodeType declType = parseMemberDeclarationRest(enumDetector.isDetected());
@@ -689,7 +713,7 @@ public class JetParsing extends AbstractJetParsing {
*/
private void parseInitializer() {
PsiBuilder.Marker initializer = mark();
parseAttributeList();
parseAnnotations(false);
IElementType type;
if (at(THIS_KEYWORD)) {
@@ -846,7 +870,7 @@ public class JetParsing extends AbstractJetParsing {
private boolean parsePropertyGetterOrSetter() {
PsiBuilder.Marker getterOrSetter = mark();
parseModifierList(MODIFIER_LIST);
parseModifierList(MODIFIER_LIST, false);
if (!at(GET_KEYWORD) && !at(SET_KEYWORD)) {
getterOrSetter.rollbackTo();
@@ -873,8 +897,7 @@ public class JetParsing extends AbstractJetParsing {
if (setter) {
PsiBuilder.Marker parameterList = mark();
PsiBuilder.Marker setterParameter = mark();
int lastId = findLastBefore(TokenSet.create(IDENTIFIER), TokenSet.create(RPAR, COMMA, COLON), false);
createTruncatedBuilder(lastId).parseModifierList(MODIFIER_LIST);
parseModifierListWithShortAnnotations(MODIFIER_LIST, TokenSet.create(IDENTIFIER), TokenSet.create(RPAR, COMMA, COLON));
expect(IDENTIFIER, "Expecting parameter name", TokenSet.create(RPAR, COLON, LBRACE, EQ));
if (at(COLON)) {
@@ -973,7 +996,7 @@ public class JetParsing extends AbstractJetParsing {
private void parseReceiverType(String title, TokenSet nameFollow, int lastDot) {
if (lastDot == -1) { // There's no explicit receiver type specified
parseAttributeList();
parseAnnotations(false);
expect(IDENTIFIER, "Expecting " + title + " name or receiver type", nameFollow);
} else {
PsiBuilder.Marker typeRefMarker = mark();
@@ -1070,7 +1093,7 @@ public class JetParsing extends AbstractJetParsing {
*/
private void parseDelegationSpecifier() {
PsiBuilder.Marker delegator = mark();
parseAttributeList();
parseAnnotations(false);
parseTypeRef();
if (at(BY_KEYWORD)) {
@@ -1087,16 +1110,6 @@ public class JetParsing extends AbstractJetParsing {
}
}
/*
* attributes
* : attributeAnnotation*
* ;
*/
public void parseAttributeList() {
while (at(LBRACKET)) parseAttributeAnnotation();
}
/*
* typeParameters
* : ("<" typeParameter{","} ">"
@@ -1179,7 +1192,7 @@ public class JetParsing extends AbstractJetParsing {
private void parseTypeConstraint() {
PsiBuilder.Marker constraint = mark();
parseAttributeList();
parseAnnotations(false);
if (at(CLASS_KEYWORD)) {
advance(); // CLASS_KEYWORD
@@ -1212,8 +1225,7 @@ public class JetParsing extends AbstractJetParsing {
PsiBuilder.Marker mark = mark();
int lastId = findLastBefore(TokenSet.create(IDENTIFIER), TokenSet.create(COMMA, GT, COLON), false);
createTruncatedBuilder(lastId).parseModifierList(MODIFIER_LIST);
parseModifierListWithShortAnnotations(MODIFIER_LIST, TokenSet.create(IDENTIFIER), TokenSet.create(COMMA, GT, COLON));
expect(IDENTIFIER, "Type parameter name expected", TokenSet.EMPTY);
@@ -1246,7 +1258,7 @@ public class JetParsing extends AbstractJetParsing {
}
private PsiBuilder.Marker parseTypeRefContents(PsiBuilder.Marker typeRefMarker) {
parseAttributeList();
parseAnnotations(false);
if (at(IDENTIFIER) || at(NAMESPACE_KEYWORD)) {
parseUserType();
@@ -1338,8 +1350,9 @@ public class JetParsing extends AbstractJetParsing {
while (true) {
PsiBuilder.Marker projection = mark();
int lastId = findLastBefore(TokenSet.create(IDENTIFIER), TokenSet.create(COMMA, COLON, GT), false);
createTruncatedBuilder(lastId).parseModifierList(MODIFIER_LIST);
TokenSet lookFor = TokenSet.create(IDENTIFIER);
TokenSet stopAt = TokenSet.create(COMMA, COLON, GT);
parseModifierListWithShortAnnotations(MODIFIER_LIST, lookFor, stopAt);
if (at(MUL)) {
advance(); // MUL
@@ -1366,6 +1379,11 @@ public class JetParsing extends AbstractJetParsing {
return list;
}
private void parseModifierListWithShortAnnotations(JetNodeType modifierList, TokenSet lookFor, TokenSet stopAt) {
int lastId = findLastBefore(lookFor, stopAt, false);
createTruncatedBuilder(lastId).parseModifierList(modifierList, false);
}
/*
* tupleType
* : "(" type{","}? ")"
@@ -1480,7 +1498,7 @@ public class JetParsing extends AbstractJetParsing {
if (isFunctionTypeContents) {
if (!tryParseValueParameter()) {
PsiBuilder.Marker valueParameter = mark();
parseModifierList(MODIFIER_LIST); // lazy, out, ref
parseModifierList(MODIFIER_LIST, false); // lazy, out, ref
parseTypeRef();
valueParameter.done(VALUE_PARAMETER);
}
@@ -1513,8 +1531,7 @@ public class JetParsing extends AbstractJetParsing {
private boolean parseValueParameter(boolean rollbackOnFailure) {
PsiBuilder.Marker parameter = mark();
int lastId = findLastBefore(TokenSet.create(IDENTIFIER), TokenSet.create(COMMA, RPAR, COLON), false);
createTruncatedBuilder(lastId).parseModifierList(MODIFIER_LIST);
parseModifierListWithShortAnnotations(MODIFIER_LIST, TokenSet.create(IDENTIFIER), TokenSet.create(COMMA, RPAR, COLON));
if (at(VAR_KEYWORD) || at(VAL_KEYWORD)) {
advance(); // VAR_KEYWORD | VAL_KEYWORD
@@ -1582,4 +1599,4 @@ public class JetParsing extends AbstractJetParsing {
return detected;
}
}
}
}
idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java
+8 -8
View File
@@ -25,16 +25,16 @@ public class JetAnnotatedExpression extends JetExpression {
return findChildByClass(JetExpression.class);
}
public List<JetAttributeAnnotation> getAttributeAnnotations() {
return findChildrenByType(JetNodeTypes.ATTRIBUTE_ANNOTATION);
public List<JetAnnotation> getAttributeAnnotations() {
return findChildrenByType(JetNodeTypes.ANNOTATION);
}
public List<JetAttribute> getAttributes() {
List<JetAttribute> answer = null;
for (JetAttributeAnnotation annotation : getAttributeAnnotations()) {
if (answer == null) answer = new ArrayList<JetAttribute>();
answer.addAll(annotation.getAttributes());
public List<JetAnnotationEntry> getAttributes() {
List<JetAnnotationEntry> answer = null;
for (JetAnnotation annotation : getAttributeAnnotations()) {
if (answer == null) answer = new ArrayList<JetAnnotationEntry>();
answer.addAll(annotation.getEntries());
}
return answer != null ? answer : Collections.<JetAttribute>emptyList();
return answer != null ? answer : Collections.<JetAnnotationEntry>emptyList();
}
}
idea/src/org/jetbrains/jet/lang/psi/JetAttributeAnnotation.java → idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java
+4 -4
View File
@@ -9,8 +9,8 @@ import java.util.List;
/**
* @author max
*/
public class JetAttributeAnnotation extends JetElement {
public JetAttributeAnnotation(@NotNull ASTNode node) {
public class JetAnnotation extends JetElement {
public JetAnnotation(@NotNull ASTNode node) {
super(node);
}
@@ -19,7 +19,7 @@ public class JetAttributeAnnotation extends JetElement {
visitor.visitAttributeAnnotation(this);
}
public List<JetAttribute> getAttributes() {
return findChildrenByType(JetNodeTypes.ATTRIBUTE);
public List<JetAnnotationEntry> getEntries() {
return findChildrenByType(JetNodeTypes.ANNOTATION_ENTRY);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetAttribute.java → idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
+2 -2
View File
@@ -11,8 +11,8 @@ import java.util.List;
/**
* @author max
*/
public class JetAttribute extends JetElement {
public JetAttribute(@NotNull ASTNode node) {
public class JetAnnotationEntry extends JetElement {
public JetAnnotationEntry(@NotNull ASTNode node) {
super(node);
}
idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java
+8 -8
View File
@@ -24,17 +24,17 @@ public class JetModifierList extends JetElement {
}
@NotNull
public List<JetAttributeAnnotation> getAttributeAnnotations() {
return findChildrenByType(JetNodeTypes.ATTRIBUTE_ANNOTATION);
public List<JetAnnotation> getAttributeAnnotations() {
return findChildrenByType(JetNodeTypes.ANNOTATION);
}
public List<JetAttribute> getAttributes() {
List<JetAttribute> answer = null;
for (JetAttributeAnnotation annotation : getAttributeAnnotations()) {
if (answer == null) answer = new ArrayList<JetAttribute>();
answer.addAll(annotation.getAttributes());
public List<JetAnnotationEntry> getAttributes() {
List<JetAnnotationEntry> answer = null;
for (JetAnnotation annotation : getAttributeAnnotations()) {
if (answer == null) answer = new ArrayList<JetAnnotationEntry>();
answer.addAll(annotation.getEntries());
}
return answer != null ? answer : Collections.<JetAttribute>emptyList();
return answer != null ? answer : Collections.<JetAnnotationEntry>emptyList();
}
public boolean hasModifier(JetToken token) {
idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java
+8 -8
View File
@@ -22,8 +22,8 @@ public class JetTypeReference extends JetElement {
visitor.visitTypeReference(this);
}
public List<JetAttributeAnnotation> getAttributeAnnotations() {
return findChildrenByType(JetNodeTypes.ATTRIBUTE_ANNOTATION);
public List<JetAnnotation> getAttributeAnnotations() {
return findChildrenByType(JetNodeTypes.ANNOTATION);
}
@Nullable
@@ -31,12 +31,12 @@ public class JetTypeReference extends JetElement {
return findChildByClass(JetTypeElement.class);
}
public List<JetAttribute> getAttributes() {
List<JetAttribute> answer = null;
for (JetAttributeAnnotation annotation : getAttributeAnnotations()) {
if (answer == null) answer = new ArrayList<JetAttribute>();
answer.addAll(annotation.getAttributes());
public List<JetAnnotationEntry> getAttributes() {
List<JetAnnotationEntry> answer = null;
for (JetAnnotation annotation : getAttributeAnnotations()) {
if (answer == null) answer = new ArrayList<JetAnnotationEntry>();
answer.addAll(annotation.getEntries());
}
return answer != null ? answer : Collections.<JetAttribute>emptyList();
return answer != null ? answer : Collections.<JetAnnotationEntry>emptyList();
}
}
idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java
+3 -3
View File
@@ -62,12 +62,12 @@ public class JetVisitor extends PsiElementVisitor {
visitJetElement(list);
}
public void visitAttributeAnnotation(JetAttributeAnnotation annotation) {
public void visitAttributeAnnotation(JetAnnotation annotation) {
visitJetElement(annotation);
}
public void visitAttribute(JetAttribute attribute) {
visitJetElement(attribute);
public void visitAttribute(JetAnnotationEntry annotationEntry) {
visitJetElement(annotationEntry);
}
public void visitTypeParameterList(JetTypeParameterList list) {
idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+3 -3
View File
@@ -3,7 +3,7 @@ package org.jetbrains.jet.lang.resolve;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.Annotation;
import org.jetbrains.jet.lang.psi.JetAttribute;
import org.jetbrains.jet.lang.psi.JetAnnotationEntry;
import org.jetbrains.jet.lang.psi.JetModifierList;
import java.util.Collections;
@@ -18,9 +18,9 @@ public class AnnotationResolver {
private AnnotationResolver() {}
@NotNull
public List<Annotation> resolveAnnotations(@NotNull List<JetAttribute> attributeElements) {
public List<Annotation> resolveAnnotations(@NotNull List<JetAnnotationEntry> annotationEntryElements) {
return Collections.emptyList(); // TODO
// if (attributeElements.isEmpty()) {
// if (annotationEntryElements.isEmpty()) {
// }
// throw new UnsupportedOperationException(); // TODO
}
idea/src/org/jetbrains/jet/plugin/JetHighlighter.java
+8 -2
View File
@@ -11,6 +11,7 @@ import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
import com.intellij.psi.TokenType;
import com.intellij.psi.tree.IElementType;
import com.intellij.ui.Colors;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lexer.JetLexer;
import org.jetbrains.jet.lexer.JetTokens;
@@ -28,10 +29,15 @@ public class JetHighlighter extends SyntaxHighlighterBase {
SyntaxHighlighterColors.KEYWORD.getDefaultAttributes()
);
public static final TextAttributesKey JET_SOFT_KEYWORD = TextAttributesKey.createTextAttributesKey(
public static final TextAttributesKey JET_SOFT_KEYWORD;
static {
TextAttributes attributes = SyntaxHighlighterColors.KEYWORD.getDefaultAttributes().clone();
attributes.setForegroundColor(Colors.DARK_RED);
JET_SOFT_KEYWORD = TextAttributesKey.createTextAttributesKey(
"JET.SOFT.KEYWORD",
SyntaxHighlighterColors.KEYWORD.getDefaultAttributes()
attributes
);
}
public static final TextAttributesKey JET_FIELD_IDENTIFIER = TextAttributesKey.createTextAttributesKey(
"JET.FIELD.IDENTIFIER",
idea/src/org/jetbrains/jet/plugin/annotations/SoftKeywordsAnnotator.java
+21
View File
@@ -8,6 +8,7 @@ import com.intellij.lang.annotation.Annotator;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.source.tree.LeafPsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.plugin.JetHighlighter;
import org.jetbrains.jet.lexer.JetTokens;
@@ -18,5 +19,25 @@ public class SoftKeywordsAnnotator implements Annotator {
holder.createInfoAnnotation(element, null).setTextAttributes(JetHighlighter.JET_SOFT_KEYWORD);
}
}
else if (element instanceof JetAnnotationEntry) {
JetAnnotationEntry entry = (JetAnnotationEntry) element;
JetTypeReference typeReference = entry.getTypeReference();
if (typeReference != null) {
JetTypeElement typeElement = typeReference.getTypeElement();
markAnnotationIdentifiers(typeElement, holder);
}
}
}
private void markAnnotationIdentifiers(JetTypeElement typeElement, @NotNull AnnotationHolder holder) {
if (typeElement instanceof JetUserType) {
JetUserType userType = (JetUserType) typeElement;
if (userType.getQualifier() == null) {
JetSimpleNameExpression referenceExpression = userType.getReferenceExpression();
if (referenceExpression != null) {
holder.createInfoAnnotation(referenceExpression.getNode(), "Annotation").setTextAttributes(JetHighlighter.JET_SOFT_KEYWORD);
}
}
}
}
}
idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManagerFactory.java
+3 -3
View File
@@ -1,14 +1,14 @@
package org.jetbrains.jet.plugin.debugger;
import com.intellij.debugger.PositionManager;
import com.intellij.debugger.PositionManagerFactory;
//import com.intellij.debugger.PositionManagerFactory;
import com.intellij.debugger.engine.DebugProcess;
/**
* @author yole
*/
public class JetPositionManagerFactory implements PositionManagerFactory {
@Override
public class JetPositionManagerFactory { //implements PositionManagerFactory {
// @Override
public PositionManager create(DebugProcess debugProcess) {
return new JetPositionManager(debugProcess);
}
idea/testData/psi/AnnotatedExpressions.txt
+4 -4
View File
@@ -12,9 +12,9 @@ JetFile: AnnotatedExpressions.jet
PsiElement(LBRACE)('{')
PsiWhiteSpace('\n ')
ANNOTATED_EXPRESSION
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -28,9 +28,9 @@ JetFile: AnnotatedExpressions.jet
PsiElement(INTEGER_LITERAL)('1')
PsiWhiteSpace('\n ')
ANNOTATED_EXPRESSION
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/Attributes.jet
+5 -5
View File
@@ -12,7 +12,7 @@ private
protected
public
internal
[foo<A, B>(a, b),ina,foo.bar.goo.doo<f>.foo<bar, goo>.foo]
[foo<A, B>(a, b) ina foo.bar.goo.doo<f>.foo<bar, goo>.foo]
[df]
in
[sdfsdf]
@@ -20,16 +20,16 @@ out
ref
class Bar<abstract
virtual
[sdfsdf=1+1, a]
[sdfsdf=1+1]
[a(), sdfsdf=1+1]
[sdfsdf(1+1) a]
[sdfsdf(1+1)]
[a() sdfsdf(1+1)]
enum
open
attribute
override
virtual
abstract
[sdfsd, sdfsd, a.b.f.c]
[sdfsd sdfsd a.b.f.c]
private
protected
public
idea/testData/psi/Attributes.txt
+55 -50
View File
@@ -35,9 +35,9 @@ JetFile: Attributes.jet
PsiWhiteSpace('\n')
PsiElement(internal)('internal')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -68,14 +68,14 @@ JetFile: Attributes.jet
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
ATTRIBUTE
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ina')
PsiElement(COMMA)(',')
ATTRIBUTE
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
USER_TYPE
@@ -125,9 +125,9 @@ JetFile: Attributes.jet
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -136,9 +136,9 @@ JetFile: Attributes.jet
PsiWhiteSpace('\n')
PsiElement(in)('in')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -160,50 +160,55 @@ JetFile: Attributes.jet
PsiWhiteSpace('\n')
PsiElement(virtual)('virtual')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsdf')
PsiElement(EQ)('=')
BINARY_EXPRESSION
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
OPERATION_REFERENCE
PsiElement(PLUS)('+')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(COMMA)(',')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
BINARY_EXPRESSION
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
OPERATION_REFERENCE
PsiElement(PLUS)('+')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsdf')
PsiElement(EQ)('=')
BINARY_EXPRESSION
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
OPERATION_REFERENCE
PsiElement(PLUS)('+')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
BINARY_EXPRESSION
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
OPERATION_REFERENCE
PsiElement(PLUS)('+')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -211,21 +216,23 @@ JetFile: Attributes.jet
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsdf')
PsiElement(EQ)('=')
BINARY_EXPRESSION
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
OPERATION_REFERENCE
PsiElement(PLUS)('+')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
BINARY_EXPRESSION
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
OPERATION_REFERENCE
PsiElement(PLUS)('+')
INTEGER_CONSTANT
PsiElement(INTEGER_LITERAL)('1')
PsiElement(RPAR)(')')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(enum)('enum')
@@ -240,23 +247,21 @@ JetFile: Attributes.jet
PsiWhiteSpace('\n')
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsd')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsd')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
USER_TYPE
idea/testData/psi/AttributesOnPatterns.txt
+12 -12
View File
@@ -26,9 +26,9 @@ JetFile: AttributesOnPatterns.jet
PsiElement(is)('is')
PsiWhiteSpace(' ')
BINDING_PATTERN
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -50,9 +50,9 @@ JetFile: AttributesOnPatterns.jet
PsiElement(is)('is')
PsiWhiteSpace(' ')
BINDING_PATTERN
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -83,9 +83,9 @@ JetFile: AttributesOnPatterns.jet
PsiElement(is)('is')
PsiWhiteSpace(' ')
WILDCARD_PATTERN
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -104,9 +104,9 @@ JetFile: AttributesOnPatterns.jet
PsiElement(is)('is')
PsiWhiteSpace(' ')
EXPRESSION_PATTERN
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -126,9 +126,9 @@ JetFile: AttributesOnPatterns.jet
PsiElement(is)('is')
PsiWhiteSpace(' ')
TYPE_PATTERN
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -150,9 +150,9 @@ JetFile: AttributesOnPatterns.jet
PsiElement(is)('is')
PsiWhiteSpace(' ')
DECOMPOSER_PATTERN
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/Attributes_ERR.jet
+4 -4
View File
@@ -13,11 +13,11 @@ private
protected
public
internal
[foo<A, B>(a, b), ina,foo.bar.goo.doo<f>.foo<bar, goo>.foo]
[foo<A, B>(a, b), ina foo.bar.goo.doo<f>.foo<bar, goo>.foo]
[df]
in
[sdfsdf,]
[s,fd d]
[sdfsdf ]
[s fd d, ]
out
ref
class Bar<abstract
@@ -28,7 +28,7 @@ attribute
override
virtual
abstract
[sdfsd, sdfsd, a.b.f.c]
[sdfsd sdfsd a.b.f.c]
private
protected
public
idea/testData/psi/Attributes_ERR.txt
+157 -158
View File
@@ -9,106 +9,43 @@ JetFile: Attributes_ERR.jet
PsiElement(DOT)('.')
PsiElement(IDENTIFIER)('goo')
PsiWhiteSpace('\n\n')
MODIFIER_LIST
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
PsiElement(virtual)('virtual')
PsiWhiteSpace('\n')
PsiElement(enum)('enum')
PsiWhiteSpace('\n')
PsiElement(open)('open')
PsiWhiteSpace('\n')
PsiElement(attribute)('attribute')
PsiWhiteSpace('\n')
PsiElement(override)('override')
PsiWhiteSpace('\n')
PsiElement(virtual)('virtual')
PsiWhiteSpace('\n')
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:Expecting a comma-separated list of attributes
<empty list>
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(private)('private')
PsiWhiteSpace('\n')
PsiElement(protected)('protected')
PsiWhiteSpace('\n')
PsiElement(public)('public')
PsiWhiteSpace('\n')
PsiElement(internal)('internal')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('A')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('B')
PsiElement(GT)('>')
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ina')
PsiElement(COMMA)(',')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
CLASS
MODIFIER_LIST
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
PsiElement(virtual)('virtual')
PsiWhiteSpace('\n')
PsiElement(enum)('enum')
PsiWhiteSpace('\n')
PsiElement(open)('open')
PsiWhiteSpace('\n')
PsiElement(attribute)('attribute')
PsiWhiteSpace('\n')
PsiElement(override)('override')
PsiWhiteSpace('\n')
PsiElement(virtual)('virtual')
PsiWhiteSpace('\n')
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
PsiErrorElement:Expecting a list of attributes
<empty list>
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(private)('private')
PsiWhiteSpace('\n')
PsiElement(protected)('protected')
PsiWhiteSpace('\n')
PsiElement(public)('public')
PsiWhiteSpace('\n')
PsiElement(internal)('internal')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('goo')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('doo')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('f')
PsiElement(GT)('>')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
TYPE_ARGUMENT_LIST
@@ -117,66 +54,130 @@ JetFile: Attributes_ERR.jet
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(IDENTIFIER)('A')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('goo')
PsiElement(IDENTIFIER)('B')
PsiElement(GT)('>')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('df')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(in)('in')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsdf')
PsiElement(COMMA)(',')
PsiErrorElement:Expecting a comma-separated list of attributes
<empty list>
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('s')
PsiElement(COMMA)(',')
ATTRIBUTE
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('fd')
PsiErrorElement:Expecting ']' to close an attribute annotation
<empty list>
PsiWhiteSpace(' ')
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(IDENTIFIER)('d')
PsiErrorElement:Expecting namespace or top level declaration
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
CLASS
MODIFIER_LIST
VALUE_ARGUMENT_LIST
PsiElement(LPAR)('(')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
VALUE_ARGUMENT
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(RPAR)(')')
PsiErrorElement:No commas needed to separate attributes
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('ina')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('goo')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('doo')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('f')
PsiElement(GT)('>')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
TYPE_ARGUMENT_LIST
PsiElement(LT)('<')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_PROJECTION
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('goo')
PsiElement(GT)('>')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('df')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(in)('in')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsdf')
PsiWhiteSpace(' ')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
ANNOTATION
PsiElement(LBRACKET)('[')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('s')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('fd')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('d')
PsiErrorElement:No commas needed to separate attributes
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
PsiElement(RBRACKET)(']')
PsiWhiteSpace('\n')
PsiElement(out)('out')
PsiWhiteSpace('\n')
PsiElement(ref)('ref')
@@ -204,23 +205,21 @@ JetFile: Attributes_ERR.jet
PsiWhiteSpace('\n')
PsiElement(abstract)('abstract')
PsiWhiteSpace('\n')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsd')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('sdfsd')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
USER_TYPE
idea/testData/psi/EOLsOnRollback.txt
+4 -4
View File
@@ -54,9 +54,9 @@ JetFile: EOLsOnRollback.jet
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -77,9 +77,9 @@ JetFile: EOLsOnRollback.jet
PsiWhiteSpace('\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/Extensions.txt
-284
View File
@@ -1,284 +0,0 @@
JetFile: Extensions.jet
NAMESPACE
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('foo')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
FUNCTION_TYPE
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
TUPLE_TYPE
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace('\n\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('foo')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
FUNCTION_TYPE
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
TUPLE_TYPE
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiElement(SEMICOLON)(';')
PsiWhiteSpace('\n\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('foo')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
FUNCTION_TYPE
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
TUPLE_TYPE
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
idea/testData/psi/Extensions_ERR.txt
-88
View File
@@ -1,88 +0,0 @@
JetFile: Extensions_ERR.jet
NAMESPACE
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiElement(for)('for')
PsiWhiteSpace('\n')
TYPE_REFERENCE
PsiErrorElement:Type expected
<empty list>
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
<empty list>
PsiErrorElement:Expecting 'for' to specify the type that is being extended
<empty list>
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('foo')
PsiErrorElement:Missing '>'
<empty list>
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('bar')
PsiWhiteSpace('\n')
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace('\n')
TYPE_REFERENCE
PsiErrorElement:Type expected
<empty list>
EXTENSION
PsiElement(extension)('extension')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
TYPE_PARAMETER_LIST
PsiElement(LT)('<')
TYPE_PARAMETER
PsiElement(IDENTIFIER)('A')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
PsiElement(for)('for')
PsiWhiteSpace(' ')
TYPE_REFERENCE
FUNCTION_TYPE
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
TUPLE_TYPE
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
PsiWhiteSpace(' ')
CLASS_BODY
PsiElement(LBRACE)('{')
PsiElement(RBRACE)('}')
idea/testData/psi/FunctionLiterals.txt
+6 -6
View File
@@ -460,9 +460,9 @@ JetFile: FunctionLiterals.jet
VALUE_PARAMETER_LIST
VALUE_PARAMETER
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -474,9 +474,9 @@ JetFile: FunctionLiterals.jet
PsiWhiteSpace(' ')
VALUE_PARAMETER
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -488,9 +488,9 @@ JetFile: FunctionLiterals.jet
PsiWhiteSpace(' ')
VALUE_PARAMETER
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/FunctionTypes.txt
+14 -14
View File
@@ -17,9 +17,9 @@ JetFile: FunctionTypes.jet
PsiElement(LPAR)('(')
VALUE_PARAMETER
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -88,9 +88,9 @@ JetFile: FunctionTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -146,9 +146,9 @@ JetFile: FunctionTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -269,9 +269,9 @@ JetFile: FunctionTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -670,9 +670,9 @@ JetFile: FunctionTypes.jet
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -708,9 +708,9 @@ JetFile: FunctionTypes.jet
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -750,9 +750,9 @@ JetFile: FunctionTypes.jet
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/Functions.txt
+28 -28
View File
@@ -11,9 +11,9 @@ JetFile: Functions.jet
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -29,9 +29,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -51,9 +51,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -89,9 +89,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -165,9 +165,9 @@ JetFile: Functions.jet
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -184,9 +184,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -207,9 +207,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -246,9 +246,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -326,9 +326,9 @@ JetFile: Functions.jet
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -348,9 +348,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -374,9 +374,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -416,9 +416,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -488,9 +488,9 @@ JetFile: Functions.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -513,9 +513,9 @@ JetFile: Functions.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/Functions_ERR.txt
+12 -12
View File
@@ -12,9 +12,9 @@ JetFile: Functions_ERR.jet
FUN
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -37,9 +37,9 @@ JetFile: Functions_ERR.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -74,9 +74,9 @@ JetFile: Functions_ERR.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -120,9 +120,9 @@ JetFile: Functions_ERR.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -173,9 +173,9 @@ JetFile: Functions_ERR.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -229,9 +229,9 @@ JetFile: Functions_ERR.jet
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/LocalDeclarations.txt
+6 -6
View File
@@ -19,9 +19,9 @@ JetFile: LocalDeclarations.jet
PsiWhiteSpace('\n ')
CLASS
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -44,9 +44,9 @@ JetFile: LocalDeclarations.jet
MODIFIER_LIST
PsiElement(abstract)('abstract')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -78,9 +78,9 @@ JetFile: LocalDeclarations.jet
PsiWhiteSpace('\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/NamespaceModifiers.txt
+4 -4
View File
@@ -3,9 +3,9 @@ JetFile: NamespaceModifiers.jet
MODIFIER_LIST
PsiElement(public)('public')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -20,9 +20,9 @@ JetFile: NamespaceModifiers.jet
PsiWhiteSpace('\n\n')
NAMESPACE
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/Properties.txt
+4 -4
View File
@@ -26,9 +26,9 @@ JetFile: Properties.jet
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -62,9 +62,9 @@ JetFile: Properties.jet
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/PropertiesFollowedByInitializers.txt
+2 -2
View File
@@ -220,9 +220,9 @@ JetFile: PropertiesFollowedByInitializers.jet
PsiWhiteSpace(' ')
PROPERTY_ACCESSOR
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/Properties_ERR.txt
+10 -6
View File
@@ -42,18 +42,22 @@ JetFile: Properties_ERR.jet
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('foo')
PsiErrorElement:Expecting ']' to close an attribute annotation
<empty list>
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('foo')
PsiWhiteSpace(' ')
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
REFERENCE_EXPRESSION
@@ -74,9 +78,9 @@ JetFile: Properties_ERR.jet
PROPERTY
PsiElement(val)('val')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/QuotedIdentifiers.txt
+2 -2
View File
@@ -2,9 +2,9 @@ JetFile: QuotedIdentifiers.jet
NAMESPACE
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/ShortAnnotations.jet
+29
View File
@@ -0,0 +1,29 @@
foo bar(1) buzz<T>(1) zoo namespace aa
foo bar(1) buzz<T>(1) zoo namespace a {}
foo bar(1) buzz<T>(1) zoo class A
foo bar(1) buzz<T>(1) zoo object B
foo bar(1) buzz<T>(1) zoo fun a() {}
foo bar(1) buzz<T>(1) zoo val c : Int = 0
foo bar(1) buzz<T>(1) zoo var v : Int = 0
foo bar(1) buzz<T>(1) zoo type T = Int
class Foo {
foo bar(1) buzz<T>(1) zoo class object {}
foo bar(1) buzz<T>(1) zoo class A
foo bar(1) buzz<T>(1) zoo object B
foo bar(1) buzz<T>(1) zoo fun a() {}
foo bar(1) buzz<T>(1) zoo val c : Int = 0
foo bar(1) buzz<T>(1) zoo var v : Int = 0
foo bar(1) buzz<T>(1) zoo type T = Int
foo bar(1) buzz<T>(1) zoo this(x : Int) : this() {}
foo bar(1) buzz<T>(1) zoo {}
}
fun test() {
when (foo bar(1) buzz<T>(1) zoo val a = 1) {
1 => 1
}
}
idea/testData/psi/TupleTypes.txt
+18 -18
View File
@@ -93,9 +93,9 @@ JetFile: TupleTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -113,9 +113,9 @@ JetFile: TupleTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -124,9 +124,9 @@ JetFile: TupleTypes.jet
TUPLE_TYPE
PsiElement(LPAR)('(')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -145,9 +145,9 @@ JetFile: TupleTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -157,9 +157,9 @@ JetFile: TupleTypes.jet
TUPLE_TYPE
PsiElement(LPAR)('(')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -172,9 +172,9 @@ JetFile: TupleTypes.jet
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -192,9 +192,9 @@ JetFile: TupleTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -209,9 +209,9 @@ JetFile: TupleTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -229,9 +229,9 @@ JetFile: TupleTypes.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/TupleTypes_ERR.txt
+24 -22
View File
@@ -88,9 +88,9 @@ JetFile: TupleTypes_ERR.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -108,9 +108,9 @@ JetFile: TupleTypes_ERR.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -119,19 +119,21 @@ JetFile: TupleTypes_ERR.jet
TUPLE_TYPE
PsiElement(LPAR)('(')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('x')
PsiWhiteSpace(' ')
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('X')
PsiErrorElement:Expecting ']' to close an attribute annotation
<empty list>
PsiWhiteSpace(' ')
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('X')
PsiElement(RPAR)(')')
PsiElement(COMMA)(',')
PsiWhiteSpace('\n ')
@@ -141,9 +143,9 @@ JetFile: TupleTypes_ERR.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -153,9 +155,9 @@ JetFile: TupleTypes_ERR.jet
TUPLE_TYPE
PsiElement(LPAR)('(')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -168,9 +170,9 @@ JetFile: TupleTypes_ERR.jet
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -188,9 +190,9 @@ JetFile: TupleTypes_ERR.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -205,9 +207,9 @@ JetFile: TupleTypes_ERR.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -225,9 +227,9 @@ JetFile: TupleTypes_ERR.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/TypeAnnotations.txt
+10 -10
View File
@@ -14,18 +14,18 @@ JetFile: TypeAnnotations.jet
PsiElement(COLON)(':')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('a')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -47,18 +47,18 @@ JetFile: TypeAnnotations.jet
PsiElement(EQ)('=')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('b')
PsiElement(RBRACKET)(']')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -72,9 +72,9 @@ JetFile: TypeAnnotations.jet
PsiElement(LT)('<')
TYPE_PROJECTION
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/TypeParametersBeforeName.txt
+4 -4
View File
@@ -31,9 +31,9 @@ JetFile: TypeParametersBeforeName.jet
PsiElement(IDENTIFIER)('B')
PsiElement(GT)('>')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -59,9 +59,9 @@ JetFile: TypeParametersBeforeName.jet
PsiElement(GT)('>')
PsiWhiteSpace(' ')
TYPE_REFERENCE
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/examples/BinaryTree.txt
+2 -2
View File
@@ -241,9 +241,9 @@ JetFile: BinaryTree.jet
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/examples/BitArith.txt
+4 -4
View File
@@ -558,9 +558,9 @@ JetFile: BitArith.jet
PsiWhiteSpace('\n ')
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -590,9 +590,9 @@ JetFile: BitArith.jet
PsiWhiteSpace('\n ')
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/examples/Builder.txt
+6 -6
View File
@@ -29,9 +29,9 @@ JetFile: Builder.jet
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -74,9 +74,9 @@ JetFile: Builder.jet
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -145,9 +145,9 @@ JetFile: Builder.jet
PsiWhiteSpace('\n\n ')
PROPERTY
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/examples/PolymorphicClassObjects.txt
+2 -2
View File
@@ -22,9 +22,9 @@ JetFile: PolymorphicClassObjects.jet
PsiWhiteSpace('\n ')
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/examples/With.txt
+2 -2
View File
@@ -2,9 +2,9 @@ JetFile: With.jet
NAMESPACE
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/examples/array/MutableArray.txt
+4 -4
View File
@@ -32,9 +32,9 @@ JetFile: MutableArray.jet
PsiWhiteSpace('\n ')
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -98,9 +98,9 @@ JetFile: MutableArray.jet
PsiWhiteSpace('\n ')
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/examples/collections/HashMap.txt
+6 -6
View File
@@ -334,9 +334,9 @@ JetFile: HashMap.jet
PsiWhiteSpace('\n\n')
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -767,9 +767,9 @@ JetFile: HashMap.jet
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
@@ -813,9 +813,9 @@ JetFile: HashMap.jet
MODIFIER_LIST
PsiElement(private)('private')
PsiWhiteSpace(' ')
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION
idea/testData/psi/examples/collections/IList.txt
+2 -2
View File
@@ -45,9 +45,9 @@ JetFile: IList.jet
PsiWhiteSpace('\n ')
FUN
MODIFIER_LIST
ATTRIBUTE_ANNOTATION
ANNOTATION
PsiElement(LBRACKET)('[')
ATTRIBUTE
ANNOTATION_ENTRY
TYPE_REFERENCE
USER_TYPE
REFERENCE_EXPRESSION