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 incomplete annotated type casts

Browse Source
This commit is contained in:
Roman Shevchenko
2013-02-14 20:15:42 +01:00
parent 6eb7008a67
commit e207f4806e
2 changed files with 11 additions and 7 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
+2 -2
View File
@@ -266,8 +266,8 @@ public class ExpressionParser {
final PsiBuilder.Marker typeCast = builder.mark();
builder.advanceLexer();
final ReferenceParser.TypeInfo typeInfo =
myParser.getReferenceParser().parseTypeInfo(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD | ReferenceParser.CONJUNCTIONS);
ReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(
builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD | ReferenceParser.CONJUNCTIONS | ReferenceParser.INCOMPLETE_ANNO);
if (typeInfo == null || !expect(builder, JavaTokenType.RPARENTH)) {
typeCast.rollbackTo();
return parsePostfix(builder);
java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
+9 -5
View File
@@ -27,9 +27,7 @@ import org.jetbrains.annotations.Nullable;
import static com.intellij.lang.PsiBuilderUtil.expect;
import static com.intellij.lang.java.parser.JavaParserUtil.*;
import static com.intellij.util.BitUtil.isSet;
import static com.intellij.util.BitUtil.notSet;
import static com.intellij.util.BitUtil.set;
import static com.intellij.util.BitUtil.*;
public class ReferenceParser {
public static final int EAT_LAST_DOT = 0x01;
@@ -38,6 +36,7 @@ public class ReferenceParser {
public static final int DIAMONDS = 0x08;
public static final int DISJUNCTIONS = 0x10;
public static final int CONJUNCTIONS = 0x20;
public static final int INCOMPLETE_ANNO = 0x40;
public static class TypeInfo {
public boolean isPrimitive = false;
@@ -89,13 +88,13 @@ public class ReferenceParser {
}
@Nullable
private TypeInfo parseTypeInfo(final PsiBuilder builder, final int flags, final boolean badWildcard) {
private TypeInfo parseTypeInfo(PsiBuilder builder, int flags, boolean badWildcard) {
if (builder.getTokenType() == null) return null;
final TypeInfo typeInfo = new TypeInfo();
PsiBuilder.Marker type = builder.mark();
myParser.getDeclarationParser().parseAnnotations(builder);
PsiBuilder.Marker anno = myParser.getDeclarationParser().parseAnnotations(builder);
final IElementType tokenType = builder.getTokenType();
if (expect(builder, ElementType.PRIMITIVE_TYPE_BIT_SET)) {
@@ -117,6 +116,11 @@ public class ReferenceParser {
}
else {
type.drop();
if (anno != null && isSet(flags, INCOMPLETE_ANNO)) {
error(builder, JavaErrorMessages.message("expected.type"));
typeInfo.hasErrors = true;
return typeInfo;
}
return null;
}