From 3ead58dc78237134f155b7617755164b22b2c889 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 13 Jul 2011 23:22:50 +0400 Subject: [PATCH] Short annotations supported in parser for toplevel declarations Error recovery tests fail --- grammar/src/attributes.grm | 5 +- grammar/src/types.grm | 2 +- idea/src/org/jetbrains/jet/JetNodeTypes.java | 5 +- .../org/jetbrains/jet/lang/ErrorHandler.java | 2 +- .../jet/lang/parsing/AbstractJetParsing.java | 5 +- .../lang/parsing/JetExpressionParsing.java | 15 +- .../jet/lang/parsing/JetParsing.java | 157 +++++---- .../jet/lang/psi/JetAnnotatedExpression.java | 16 +- ...buteAnnotation.java => JetAnnotation.java} | 8 +- ...Attribute.java => JetAnnotationEntry.java} | 4 +- .../jet/lang/psi/JetModifierList.java | 16 +- .../jet/lang/psi/JetTypeReference.java | 16 +- .../jetbrains/jet/lang/psi/JetVisitor.java | 6 +- .../jet/lang/resolve/AnnotationResolver.java | 6 +- .../jetbrains/jet/plugin/JetHighlighter.java | 10 +- .../annotations/SoftKeywordsAnnotator.java | 21 ++ .../debugger/JetPositionManagerFactory.java | 6 +- idea/testData/psi/AnnotatedExpressions.txt | 8 +- idea/testData/psi/Attributes.jet | 10 +- idea/testData/psi/Attributes.txt | 105 +++--- idea/testData/psi/AttributesOnPatterns.txt | 24 +- idea/testData/psi/Attributes_ERR.jet | 8 +- idea/testData/psi/Attributes_ERR.txt | 315 +++++++++--------- idea/testData/psi/EOLsOnRollback.txt | 8 +- idea/testData/psi/Extensions.txt | 284 ---------------- idea/testData/psi/Extensions_ERR.txt | 88 ----- idea/testData/psi/FunctionLiterals.txt | 12 +- idea/testData/psi/FunctionTypes.txt | 28 +- idea/testData/psi/Functions.txt | 56 ++-- idea/testData/psi/Functions_ERR.txt | 24 +- idea/testData/psi/LocalDeclarations.txt | 12 +- idea/testData/psi/NamespaceModifiers.txt | 8 +- idea/testData/psi/Properties.txt | 8 +- .../psi/PropertiesFollowedByInitializers.txt | 4 +- idea/testData/psi/Properties_ERR.txt | 16 +- idea/testData/psi/QuotedIdentifiers.txt | 4 +- idea/testData/psi/ShortAnnotations.jet | 29 ++ idea/testData/psi/TupleTypes.txt | 36 +- idea/testData/psi/TupleTypes_ERR.txt | 46 +-- idea/testData/psi/TypeAnnotations.txt | 20 +- .../testData/psi/TypeParametersBeforeName.txt | 8 +- idea/testData/psi/examples/BinaryTree.txt | 4 +- idea/testData/psi/examples/BitArith.txt | 8 +- idea/testData/psi/examples/Builder.txt | 12 +- .../psi/examples/PolymorphicClassObjects.txt | 4 +- idea/testData/psi/examples/With.txt | 4 +- .../psi/examples/array/MutableArray.txt | 8 +- .../psi/examples/collections/HashMap.txt | 12 +- .../psi/examples/collections/IList.txt | 4 +- 49 files changed, 618 insertions(+), 899 deletions(-) rename idea/src/org/jetbrains/jet/lang/psi/{JetAttributeAnnotation.java => JetAnnotation.java} (61%) rename idea/src/org/jetbrains/jet/lang/psi/{JetAttribute.java => JetAnnotationEntry.java} (89%) delete mode 100644 idea/testData/psi/Extensions.txt delete mode 100644 idea/testData/psi/Extensions_ERR.txt create mode 100644 idea/testData/psi/ShortAnnotations.jet diff --git a/grammar/src/attributes.grm b/grammar/src/attributes.grm index 44dd29a4215..1bcf87c4341 100644 --- a/grammar/src/attributes.grm +++ b/grammar/src/attributes.grm @@ -7,9 +7,10 @@ annotations ; annotation - : "[" annotationEntry{","} "]" + : "[" annotationEntry+ "]" + : annotationEntry ; annotationEntry - : SimpleName{"."} (valueArguments | "=" expression)? + : SimpleName{"."} typeArguments? valueArguments? ; \ No newline at end of file diff --git a/grammar/src/types.grm b/grammar/src/types.grm index 9166ca8c65a..a0c3ce44679 100644 --- a/grammar/src/types.grm +++ b/grammar/src/types.grm @@ -43,7 +43,7 @@ simpleUserType ; optionalProjection - : modifiers + : varianceAnnotation ; functionType diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java index 94676d424b9..b56dcb9adf5 100644 --- a/idea/src/org/jetbrains/jet/JetNodeTypes.java +++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java @@ -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); diff --git a/idea/src/org/jetbrains/jet/lang/ErrorHandler.java b/idea/src/org/jetbrains/jet/lang/ErrorHandler.java index c221939ca63..6bddbc45a4e 100644 --- a/idea/src/org/jetbrains/jet/lang/ErrorHandler.java +++ b/idea/src/org/jetbrains/jet/lang/ErrorHandler.java @@ -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 diff --git a/idea/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java index ba35a61c879..ce98f3a4d46 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java @@ -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(); } diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java index 35bc3dcf8dd..26a3a27925b 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java @@ -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"); diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java index 11cb53c0987..5f969141043 100644 --- a/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -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 tokenConsumer) { + public boolean parseModifierList(JetNodeType nodeType, Consumer 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; } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java index a9d5389ddad..fb2ee0a6e18 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java @@ -25,16 +25,16 @@ public class JetAnnotatedExpression extends JetExpression { return findChildByClass(JetExpression.class); } - public List getAttributeAnnotations() { - return findChildrenByType(JetNodeTypes.ATTRIBUTE_ANNOTATION); + public List getAttributeAnnotations() { + return findChildrenByType(JetNodeTypes.ANNOTATION); } - public List getAttributes() { - List answer = null; - for (JetAttributeAnnotation annotation : getAttributeAnnotations()) { - if (answer == null) answer = new ArrayList(); - answer.addAll(annotation.getAttributes()); + public List getAttributes() { + List answer = null; + for (JetAnnotation annotation : getAttributeAnnotations()) { + if (answer == null) answer = new ArrayList(); + answer.addAll(annotation.getEntries()); } - return answer != null ? answer : Collections.emptyList(); + return answer != null ? answer : Collections.emptyList(); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAttributeAnnotation.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java similarity index 61% rename from idea/src/org/jetbrains/jet/lang/psi/JetAttributeAnnotation.java rename to idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java index 1488d3db220..7e1a6c004c8 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAttributeAnnotation.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotation.java @@ -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 getAttributes() { - return findChildrenByType(JetNodeTypes.ATTRIBUTE); + public List getEntries() { + return findChildrenByType(JetNodeTypes.ANNOTATION_ENTRY); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetAttribute.java b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java similarity index 89% rename from idea/src/org/jetbrains/jet/lang/psi/JetAttribute.java rename to idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java index 45bd5501dd6..2ce7d2a39ff 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetAttribute.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java @@ -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); } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java b/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java index a28caea1d0f..433cd92a9e7 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java @@ -24,17 +24,17 @@ public class JetModifierList extends JetElement { } @NotNull - public List getAttributeAnnotations() { - return findChildrenByType(JetNodeTypes.ATTRIBUTE_ANNOTATION); + public List getAttributeAnnotations() { + return findChildrenByType(JetNodeTypes.ANNOTATION); } - public List getAttributes() { - List answer = null; - for (JetAttributeAnnotation annotation : getAttributeAnnotations()) { - if (answer == null) answer = new ArrayList(); - answer.addAll(annotation.getAttributes()); + public List getAttributes() { + List answer = null; + for (JetAnnotation annotation : getAttributeAnnotations()) { + if (answer == null) answer = new ArrayList(); + answer.addAll(annotation.getEntries()); } - return answer != null ? answer : Collections.emptyList(); + return answer != null ? answer : Collections.emptyList(); } public boolean hasModifier(JetToken token) { diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java b/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java index abc84e3e270..f6d03ea172c 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetTypeReference.java @@ -22,8 +22,8 @@ public class JetTypeReference extends JetElement { visitor.visitTypeReference(this); } - public List getAttributeAnnotations() { - return findChildrenByType(JetNodeTypes.ATTRIBUTE_ANNOTATION); + public List getAttributeAnnotations() { + return findChildrenByType(JetNodeTypes.ANNOTATION); } @Nullable @@ -31,12 +31,12 @@ public class JetTypeReference extends JetElement { return findChildByClass(JetTypeElement.class); } - public List getAttributes() { - List answer = null; - for (JetAttributeAnnotation annotation : getAttributeAnnotations()) { - if (answer == null) answer = new ArrayList(); - answer.addAll(annotation.getAttributes()); + public List getAttributes() { + List answer = null; + for (JetAnnotation annotation : getAttributeAnnotations()) { + if (answer == null) answer = new ArrayList(); + answer.addAll(annotation.getEntries()); } - return answer != null ? answer : Collections.emptyList(); + return answer != null ? answer : Collections.emptyList(); } } diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java index fbb90c85a38..a487d529eb4 100644 --- a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java +++ b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java @@ -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) { diff --git a/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index 96cb9e7a549..fb35e30de23 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -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 resolveAnnotations(@NotNull List attributeElements) { + public List resolveAnnotations(@NotNull List annotationEntryElements) { return Collections.emptyList(); // TODO -// if (attributeElements.isEmpty()) { +// if (annotationEntryElements.isEmpty()) { // } // throw new UnsupportedOperationException(); // TODO } diff --git a/idea/src/org/jetbrains/jet/plugin/JetHighlighter.java b/idea/src/org/jetbrains/jet/plugin/JetHighlighter.java index 60bc4859c11..f19fdee2fab 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetHighlighter.java +++ b/idea/src/org/jetbrains/jet/plugin/JetHighlighter.java @@ -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", diff --git a/idea/src/org/jetbrains/jet/plugin/annotations/SoftKeywordsAnnotator.java b/idea/src/org/jetbrains/jet/plugin/annotations/SoftKeywordsAnnotator.java index ceddb4feff6..77aa4d0eac4 100644 --- a/idea/src/org/jetbrains/jet/plugin/annotations/SoftKeywordsAnnotator.java +++ b/idea/src/org/jetbrains/jet/plugin/annotations/SoftKeywordsAnnotator.java @@ -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); + } + } + } } } diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManagerFactory.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManagerFactory.java index 9cef8c7adc7..6fdddeba724 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManagerFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManagerFactory.java @@ -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); } diff --git a/idea/testData/psi/AnnotatedExpressions.txt b/idea/testData/psi/AnnotatedExpressions.txt index 43a7ec5594f..51d957f298f 100644 --- a/idea/testData/psi/AnnotatedExpressions.txt +++ b/idea/testData/psi/AnnotatedExpressions.txt @@ -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 diff --git a/idea/testData/psi/Attributes.jet b/idea/testData/psi/Attributes.jet index 125c9417961..1302b343c9d 100644 --- a/idea/testData/psi/Attributes.jet +++ b/idea/testData/psi/Attributes.jet @@ -12,7 +12,7 @@ private protected public internal -[foo(a, b),ina,foo.bar.goo.doo.foo.foo] +[foo(a, b) ina foo.bar.goo.doo.foo.foo] [df] in [sdfsdf] @@ -20,16 +20,16 @@ out ref class Bar(a, b), ina,foo.bar.goo.doo.foo.foo] +[foo(a, b), ina foo.bar.goo.doo.foo.foo] [df] in -[sdfsdf,] -[s,fd d] +[sdfsdf ] +[s fd d, ] out ref class Bar - 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 + + 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 - - 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 - - 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 diff --git a/idea/testData/psi/EOLsOnRollback.txt b/idea/testData/psi/EOLsOnRollback.txt index 9716abed628..7efa0f3a876 100644 --- a/idea/testData/psi/EOLsOnRollback.txt +++ b/idea/testData/psi/EOLsOnRollback.txt @@ -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 diff --git a/idea/testData/psi/Extensions.txt b/idea/testData/psi/Extensions.txt deleted file mode 100644 index 8dcf1ac83e2..00000000000 --- a/idea/testData/psi/Extensions.txt +++ /dev/null @@ -1,284 +0,0 @@ -JetFile: Extensions.jet - NAMESPACE - EXTENSION - PsiElement(extension)('extension') - PsiWhiteSpace(' ') - TYPE_PARAMETER_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 - - 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 - - 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 - - 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 - - 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 - - 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)('}') \ No newline at end of file diff --git a/idea/testData/psi/Extensions_ERR.txt b/idea/testData/psi/Extensions_ERR.txt deleted file mode 100644 index 357a8e68de8..00000000000 --- a/idea/testData/psi/Extensions_ERR.txt +++ /dev/null @@ -1,88 +0,0 @@ -JetFile: Extensions_ERR.jet - NAMESPACE - EXTENSION - PsiElement(extension)('extension') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiElement(for)('for') - PsiWhiteSpace('\n') - TYPE_REFERENCE - PsiErrorElement:Type expected - - EXTENSION - PsiElement(extension)('extension') - PsiWhiteSpace(' ') - PsiElement(IDENTIFIER)('foo') - PsiWhiteSpace(' ') - TYPE_PARAMETER_LIST - - PsiErrorElement:Expecting 'for' to specify the type that is being extended - - 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 '>' - - 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 - - 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)('}') \ No newline at end of file diff --git a/idea/testData/psi/FunctionLiterals.txt b/idea/testData/psi/FunctionLiterals.txt index dbeaa327c51..1345d185d8a 100644 --- a/idea/testData/psi/FunctionLiterals.txt +++ b/idea/testData/psi/FunctionLiterals.txt @@ -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 diff --git a/idea/testData/psi/FunctionTypes.txt b/idea/testData/psi/FunctionTypes.txt index da47f49234c..83484a56d85 100644 --- a/idea/testData/psi/FunctionTypes.txt +++ b/idea/testData/psi/FunctionTypes.txt @@ -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 diff --git a/idea/testData/psi/Functions.txt b/idea/testData/psi/Functions.txt index 93b700cd930..a32f14bfeea 100644 --- a/idea/testData/psi/Functions.txt +++ b/idea/testData/psi/Functions.txt @@ -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 diff --git a/idea/testData/psi/Functions_ERR.txt b/idea/testData/psi/Functions_ERR.txt index 789c5227747..24c494ef142 100644 --- a/idea/testData/psi/Functions_ERR.txt +++ b/idea/testData/psi/Functions_ERR.txt @@ -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 diff --git a/idea/testData/psi/LocalDeclarations.txt b/idea/testData/psi/LocalDeclarations.txt index 521c1fb6674..6e4861e3263 100644 --- a/idea/testData/psi/LocalDeclarations.txt +++ b/idea/testData/psi/LocalDeclarations.txt @@ -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 diff --git a/idea/testData/psi/NamespaceModifiers.txt b/idea/testData/psi/NamespaceModifiers.txt index b2ed1775490..d5954be35c1 100644 --- a/idea/testData/psi/NamespaceModifiers.txt +++ b/idea/testData/psi/NamespaceModifiers.txt @@ -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 diff --git a/idea/testData/psi/Properties.txt b/idea/testData/psi/Properties.txt index d5456af8d40..c51efa1e7d3 100644 --- a/idea/testData/psi/Properties.txt +++ b/idea/testData/psi/Properties.txt @@ -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 diff --git a/idea/testData/psi/PropertiesFollowedByInitializers.txt b/idea/testData/psi/PropertiesFollowedByInitializers.txt index a9f443ab13c..c7a148781ba 100644 --- a/idea/testData/psi/PropertiesFollowedByInitializers.txt +++ b/idea/testData/psi/PropertiesFollowedByInitializers.txt @@ -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 diff --git a/idea/testData/psi/Properties_ERR.txt b/idea/testData/psi/Properties_ERR.txt index b753d1a8d38..a87ccf29d6f 100644 --- a/idea/testData/psi/Properties_ERR.txt +++ b/idea/testData/psi/Properties_ERR.txt @@ -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 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 diff --git a/idea/testData/psi/QuotedIdentifiers.txt b/idea/testData/psi/QuotedIdentifiers.txt index 82c11dee630..91897a74b3b 100644 --- a/idea/testData/psi/QuotedIdentifiers.txt +++ b/idea/testData/psi/QuotedIdentifiers.txt @@ -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 diff --git a/idea/testData/psi/ShortAnnotations.jet b/idea/testData/psi/ShortAnnotations.jet new file mode 100644 index 00000000000..b05a2c3863c --- /dev/null +++ b/idea/testData/psi/ShortAnnotations.jet @@ -0,0 +1,29 @@ +foo bar(1) buzz(1) zoo namespace aa + +foo bar(1) buzz(1) zoo namespace a {} +foo bar(1) buzz(1) zoo class A +foo bar(1) buzz(1) zoo object B +foo bar(1) buzz(1) zoo fun a() {} +foo bar(1) buzz(1) zoo val c : Int = 0 +foo bar(1) buzz(1) zoo var v : Int = 0 +foo bar(1) buzz(1) zoo type T = Int + + +class Foo { + foo bar(1) buzz(1) zoo class object {} + foo bar(1) buzz(1) zoo class A + foo bar(1) buzz(1) zoo object B + foo bar(1) buzz(1) zoo fun a() {} + foo bar(1) buzz(1) zoo val c : Int = 0 + foo bar(1) buzz(1) zoo var v : Int = 0 + foo bar(1) buzz(1) zoo type T = Int + foo bar(1) buzz(1) zoo this(x : Int) : this() {} + + foo bar(1) buzz(1) zoo {} +} + +fun test() { + when (foo bar(1) buzz(1) zoo val a = 1) { + 1 => 1 + } +} \ No newline at end of file diff --git a/idea/testData/psi/TupleTypes.txt b/idea/testData/psi/TupleTypes.txt index b4cccf85d44..f47f0dfd725 100644 --- a/idea/testData/psi/TupleTypes.txt +++ b/idea/testData/psi/TupleTypes.txt @@ -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 diff --git a/idea/testData/psi/TupleTypes_ERR.txt b/idea/testData/psi/TupleTypes_ERR.txt index 199bc4f5f11..5b926e044c1 100644 --- a/idea/testData/psi/TupleTypes_ERR.txt +++ b/idea/testData/psi/TupleTypes_ERR.txt @@ -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 - 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 diff --git a/idea/testData/psi/TypeAnnotations.txt b/idea/testData/psi/TypeAnnotations.txt index 275436d5eb3..2768a6f49b7 100644 --- a/idea/testData/psi/TypeAnnotations.txt +++ b/idea/testData/psi/TypeAnnotations.txt @@ -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 diff --git a/idea/testData/psi/TypeParametersBeforeName.txt b/idea/testData/psi/TypeParametersBeforeName.txt index bd3a4300807..27eb886afbd 100644 --- a/idea/testData/psi/TypeParametersBeforeName.txt +++ b/idea/testData/psi/TypeParametersBeforeName.txt @@ -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 diff --git a/idea/testData/psi/examples/BinaryTree.txt b/idea/testData/psi/examples/BinaryTree.txt index da8feb54c4f..726cdc87bc6 100644 --- a/idea/testData/psi/examples/BinaryTree.txt +++ b/idea/testData/psi/examples/BinaryTree.txt @@ -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 diff --git a/idea/testData/psi/examples/BitArith.txt b/idea/testData/psi/examples/BitArith.txt index 9dc3414bead..78b27536eb5 100644 --- a/idea/testData/psi/examples/BitArith.txt +++ b/idea/testData/psi/examples/BitArith.txt @@ -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 diff --git a/idea/testData/psi/examples/Builder.txt b/idea/testData/psi/examples/Builder.txt index 759507358f2..4a5462bc384 100644 --- a/idea/testData/psi/examples/Builder.txt +++ b/idea/testData/psi/examples/Builder.txt @@ -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 diff --git a/idea/testData/psi/examples/PolymorphicClassObjects.txt b/idea/testData/psi/examples/PolymorphicClassObjects.txt index 1dba45398c1..bda7e5cbe59 100644 --- a/idea/testData/psi/examples/PolymorphicClassObjects.txt +++ b/idea/testData/psi/examples/PolymorphicClassObjects.txt @@ -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 diff --git a/idea/testData/psi/examples/With.txt b/idea/testData/psi/examples/With.txt index 4297666ad47..4bfd48cf261 100644 --- a/idea/testData/psi/examples/With.txt +++ b/idea/testData/psi/examples/With.txt @@ -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 diff --git a/idea/testData/psi/examples/array/MutableArray.txt b/idea/testData/psi/examples/array/MutableArray.txt index abdd694b61d..2adc65fefc5 100644 --- a/idea/testData/psi/examples/array/MutableArray.txt +++ b/idea/testData/psi/examples/array/MutableArray.txt @@ -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 diff --git a/idea/testData/psi/examples/collections/HashMap.txt b/idea/testData/psi/examples/collections/HashMap.txt index 058a0951dc3..358402d0087 100644 --- a/idea/testData/psi/examples/collections/HashMap.txt +++ b/idea/testData/psi/examples/collections/HashMap.txt @@ -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 diff --git a/idea/testData/psi/examples/collections/IList.txt b/idea/testData/psi/examples/collections/IList.txt index b4fbd703ec8..59733e48dac 100644 --- a/idea/testData/psi/examples/collections/IList.txt +++ b/idea/testData/psi/examples/collections/IList.txt @@ -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