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

errors in annotation methods

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-08-01 11:55:50 +04:00
parent adbe3245c7
commit 3bb3480d6a
3 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
+1
View File
@@ -319,3 +319,4 @@ annotation.field.can.only.be.used.within.a.script=Annotation @Field can only be
public.modifier.is.not.allowed.in.interfaces='public' modifier is not allowed in interfaces
return.type.is.incompatible=The return type of {0} in {1} is incompatible with {2} in {3}
anonymous.class.derived.from=anonymous class derived from
throws.clause.is.not.allowed.in.at.interface='throws' clause is not allowed in @interface members
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/declaration/Declaration.java
+6 -5
View File
@@ -93,7 +93,7 @@ public class Declaration implements GroovyElementTypes {
} else {
checkMarker.drop();
}
IElementType decl = VariableDefinitions.parseDefinitions(builder, isInClass, false, false, true, modifiersParsed, false, parser);
IElementType decl = VariableDefinitions.parseDefinitions(builder, isInClass, isInAnnotation, true, modifiersParsed, false, parser);
if (WRONGWAY.equals(decl)) {
return WRONGWAY;
@@ -115,7 +115,7 @@ public class Declaration implements GroovyElementTypes {
}
//current token isn't identifier
IElementType varDecl = VariableDefinitions.parse(builder, isInClass, modifiersParsed, parser);
IElementType varDecl = VariableDefinitions.parseDefinitions(builder, isInClass, isInAnnotation, false, modifiersParsed, true, parser);
if (WRONGWAY.equals(varDecl)) {
return WRONGWAY;
@@ -123,7 +123,8 @@ public class Declaration implements GroovyElementTypes {
return varDecl;
} else { //type was recognized, identifier here
//starts after type
IElementType varDeclarationTop = VariableDefinitions.parse(builder, isInClass, modifiersParsed, false, parser);
IElementType varDeclarationTop =
VariableDefinitions.parseDefinitions(builder, isInClass, isInAnnotation, false, modifiersParsed, false, parser);
if (WRONGWAY.equals(varDeclarationTop)) {
if (typeResult == mustBeType) {
@@ -138,7 +139,7 @@ public class Declaration implements GroovyElementTypes {
}
//starts before "type" identifier, here can't be tuple, because next token is identifier (we are in "type recognized" branch)
return VariableDefinitions.parse(builder, isInClass, modifiersParsed, false, parser);
return VariableDefinitions.parseDefinitions(builder, isInClass, isInAnnotation, false, modifiersParsed, false, parser);
} else {
checkMarker.drop();
return varDeclarationTop;
@@ -168,7 +169,7 @@ public class Declaration implements GroovyElementTypes {
}
}
IElementType varDef = VariableDefinitions.parseDefinitions(builder, isInClass, false, false, false, typeParsed, false, parser);
IElementType varDef = VariableDefinitions.parseDefinitions(builder, isInClass, isInAnnotation, false, typeParsed, false, parser);
if (varDef != WRONGWAY) {
return varDef;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/declaration/VariableDefinitions.java
+15 -34
View File
@@ -27,7 +27,6 @@ import org.jetbrains.plugins.groovy.lang.parser.parsing.auxiliary.parameters.Par
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.TupleParse;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.blocks.OpenOrClosableBlock;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.expressions.AssignmentExpression;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.expressions.ConditionalExpression;
import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils;
/**
@@ -46,21 +45,14 @@ import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils;
*/
public class VariableDefinitions implements GroovyElementTypes {
public static IElementType parse(PsiBuilder builder, boolean isInClass, boolean hasModifiers, GroovyParser parser) {
return parseDefinitions(builder, isInClass, false, false, false, hasModifiers, true, parser);
}
public static IElementType parse(PsiBuilder builder, boolean isInClass, boolean hasModifiers, boolean canBeTuple, GroovyParser parser) {
return parseDefinitions(builder, isInClass, false, false, false, hasModifiers, canBeTuple, parser);
}
public static IElementType parseDefinitions(PsiBuilder builder,
boolean isInClass,
boolean isEnumConstantMember,
boolean isAnnotationMember,
boolean mustBeMethod,
boolean hasModifiers,
boolean canBeTuple, GroovyParser parser) {
boolean canBeTuple,
GroovyParser parser) {
boolean isLParen = builder.getTokenType() == mLPAREN;
boolean isStringName = builder.getTokenType() == mSTRING_LITERAL || builder.getTokenType() == mGSTRING_LITERAL;
@@ -106,18 +98,14 @@ public class VariableDefinitions implements GroovyElementTypes {
ParameterList.parse(builder, mRPAREN, parser);
if (isEnumConstantMember && !isStringName) {
builder.error(GroovyBundle.message("string.name.unexpected"));
}
ParserUtils.getToken(builder, mNLS);
if (!ParserUtils.getToken(builder, mRPAREN)) {
builder.error(GroovyBundle.message("rparen.expected"));
ThrowClause.parse(builder);
return METHOD_DEFINITION;
return isAnnotationMember ? ANNOTATION_METHOD : METHOD_DEFINITION;
}
if (builder.getTokenType() == kDEFAULT) {
if (isAnnotationMember && builder.getTokenType() == kDEFAULT) {
PsiBuilder.Marker defaultValueMarker = builder.mark();
ParserUtils.getToken(builder, kDEFAULT);
ParserUtils.getToken(builder, mNLS);
@@ -127,32 +115,33 @@ public class VariableDefinitions implements GroovyElementTypes {
}
defaultValueMarker.done(DEFAULT_ANNOTATION_VALUE);
ThrowClause.parse(builder); //every method must have a throws clause, so says the Java API
return ANNOTATION_METHOD;
}
if (ParserUtils.lookAhead(builder, mNLS, kTHROWS) || ParserUtils.lookAhead(builder, mNLS, mLCURLY)) {
ParserUtils.getToken(builder, mNLS);
}
if (isAnnotationMember && builder.getTokenType() == kTHROWS) {
builder.error(GroovyBundle.message("throws.clause.is.not.allowed.in.at.interface"));
}
ThrowClause.parse(builder);
if (builder.getTokenType() == mLCURLY || ParserUtils.lookAhead(builder, mNLS, mLCURLY)) {
ParserUtils.getToken(builder, mNLS);
if (isAnnotationMember) {
builder.error(GroovyBundle.message("separator.or.rcurly.expected"));
}
OpenOrClosableBlock.parseOpenBlock(builder, parser);
}
// if (isAnnotationMember && !NONE.equals(paramDeclList) && OPEN_BLOCK.equals(openBlock)) {
// builder.error(GroovyBundle.message("empty.parameter.list.expected"));
// }
return METHOD_DEFINITION;
return isAnnotationMember ? ANNOTATION_METHOD : METHOD_DEFINITION;
}
}
// a = b, c = d
PsiBuilder.Marker varAssMarker = builder.mark();
final IElementType declarator = parseDeclarator(builder, isLParen, hasModifiers);
final IElementType declarator = parseDeclarator(builder, isLParen);
if (declarator != WRONGWAY) {
final boolean wasAssingment = parseAssignment(builder, parser);
@@ -210,12 +199,12 @@ public class VariableDefinitions implements GroovyElementTypes {
}
}
private static IElementType parseDeclarator(PsiBuilder builder, boolean isTuple, boolean hasModifiers) {
private static IElementType parseDeclarator(PsiBuilder builder, boolean isTuple) {
if (!isTuple) {
if (builder.getTokenType() == mIDENT) {
ParserUtils.getToken(builder, mIDENT);
return mIDENT;
}
}
} else if (builder.getTokenType() == mLPAREN && isTuple) {
if (TupleParse.parseTuple(builder, TUPLE_DECLARATION, VARIABLE)) {
return TUPLE_DECLARATION;
@@ -241,12 +230,4 @@ public class VariableDefinitions implements GroovyElementTypes {
}
return false;
}
// private static boolean parseAnnotationMemberValueInitializer(PsiBuilder builder) {
// return !WRONGWAY.equals(Annotation.parse(builder)) || !WRONGWAY.equals(ConditionalExpression.parse(builder));
// }
// public static GroovyElementType parseAnnotationMember(PsiBuilder builder) {
// return parseDefinitions(builder, false, false, true);
// }
}