MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Parse annotations in new expressions

Browse Source
This commit is contained in:
Roman Shevchenko
2013-03-13 11:15:41 +01:00
parent 9774bc356a
commit 9daf85536c
4 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+5 -2
View File
@@ -696,9 +696,12 @@ public class ExpressionParser {
myParser.getReferenceParser().parseReferenceParameterList(builder, false, true);
PsiBuilder.Marker refOrType;
PsiBuilder.Marker anno = myParser.getDeclarationParser().parseAnnotations(builder);
IElementType tokenType = builder.getTokenType();
if (tokenType == JavaTokenType.IDENTIFIER || tokenType == JavaTokenType.AT) {
if (tokenType == JavaTokenType.IDENTIFIER) {
if (anno != null) {
anno.rollbackTo();
}
refOrType = myParser.getReferenceParser().parseJavaCodeReference(builder, true, true, true, true);
if (refOrType == null) {
error(builder, JavaErrorMessages.message("expected.identifier"));
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/typeAnnotations.java
+1
View File
@@ -104,6 +104,7 @@ class Outer {
void arrays(String @TA ... docs) {
//todo[r.sh]
//@TA String @TA [] @TA [] docs1 = new @TA String @TA [2] @TA [2];
//@TA int @TA [] ints = new @TA int @TA [2];
}
@TA Outer() { }
java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.java
+2
View File
@@ -61,6 +61,8 @@ class SpecSamples {
@Readonly Document [][] docs1 = new @Readonly Document [2][12]; // array of arrays of read-only documents
Document @Readonly [][] docs2 = new Document @Readonly [2][12]; // read-only array of arrays of documents
Document[] @Readonly [] docs3 = new Document[2] @Readonly [12]; // array of read-only arrays of documents
@NonNegative int @NonEmpty [] ints = new @NonNegative int @MinSize(2) [2];
}
//
java/java-tests/testData/psi/parser-full/annotationParsing/annotation/TypeAnnotations.txt
+67
View File
@@ -1334,6 +1334,73 @@ PsiJavaFile:TypeAnnotations.java
PsiJavaToken:SEMICOLON(';')
PsiWhiteSpace(' ')
PsiComment(END_OF_LINE_COMMENT)('// array of read-only arrays of documents')
PsiWhiteSpace('\n\n ')
PsiDeclarationStatement
PsiLocalVariable:ints
PsiModifierList:@NonNegative
PsiAnnotation
PsiJavaToken:AT('@')
PsiJavaCodeReferenceElement:NonNegative
PsiIdentifier:NonNegative('NonNegative')
PsiReferenceParameterList
<empty list>
PsiAnnotationParameterList
<empty list>
PsiWhiteSpace(' ')
PsiTypeElement:int @NonEmpty []
PsiTypeElement:int
PsiKeyword:int('int')
PsiWhiteSpace(' ')
PsiAnnotation
PsiJavaToken:AT('@')
PsiJavaCodeReferenceElement:NonEmpty
PsiIdentifier:NonEmpty('NonEmpty')
PsiReferenceParameterList
<empty list>
PsiAnnotationParameterList
<empty list>
PsiWhiteSpace(' ')
PsiJavaToken:LBRACKET('[')
PsiJavaToken:RBRACKET(']')
PsiWhiteSpace(' ')
PsiIdentifier:ints('ints')
PsiWhiteSpace(' ')
PsiJavaToken:EQ('=')
PsiWhiteSpace(' ')
PsiNewExpression:new @NonNegative int @MinSize(2) [2]
PsiKeyword:new('new')
PsiReferenceParameterList
<empty list>
PsiWhiteSpace(' ')
PsiAnnotation
PsiJavaToken:AT('@')
PsiJavaCodeReferenceElement:NonNegative
PsiIdentifier:NonNegative('NonNegative')
PsiReferenceParameterList
<empty list>
PsiAnnotationParameterList
<empty list>
PsiWhiteSpace(' ')
PsiKeyword:int('int')
PsiWhiteSpace(' ')
PsiAnnotation
PsiJavaToken:AT('@')
PsiJavaCodeReferenceElement:MinSize
PsiIdentifier:MinSize('MinSize')
PsiReferenceParameterList
<empty list>
PsiAnnotationParameterList
PsiJavaToken:LPARENTH('(')
PsiNameValuePair
PsiLiteralExpression:2
PsiJavaToken:INTEGER_LITERAL('2')
PsiJavaToken:RPARENTH(')')
PsiWhiteSpace(' ')
PsiJavaToken:LBRACKET('[')
PsiLiteralExpression:2
PsiJavaToken:INTEGER_LITERAL('2')
PsiJavaToken:RBRACKET(']')
PsiJavaToken:SEMICOLON(';')
PsiWhiteSpace('\n ')
PsiJavaToken:RBRACE('}')
PsiWhiteSpace('\n\n ')