MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (rearranging conditions for readability)

Browse Source 
GitOrigin-RevId: 060602129057458c4171b89dd53db32f6e7e70ac
This commit is contained in:
Roman Shevchenko
2020-01-29 21:29:34 +01:00
committed by intellij-monorepo-bot
parent 515c4b54cc
commit cfb283ebd9
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java
View File

@@ -162,29 +162,22 @@ public class StatementParser {
refPos.rollbackTo();
if (suspectedLT == JavaTokenType.LT || suspectedLT == JavaTokenType.DOT && next == JavaTokenType.AT) {
final boolean constructorRef;
PsiBuilder.Marker declStatement = builder.mark();
PsiBuilder.Marker decl = myParser.getDeclarationParser().parse(builder, DeclarationParser.Context.CODE_BLOCK);
if (decl == null) {
PsiBuilder.Marker marker = myParser.getReferenceParser().parseType(builder, 0);
// if the type declaration ends with "::" then it is a method reference to a constructor
constructorRef = builder.getTokenType() == JavaTokenType.DOUBLE_COLON;
if (!constructorRef) {
error(builder, JavaErrorBundle.message("expected.identifier"));
if (marker == null) builder.advanceLexer();
}
}
else {
constructorRef = false;
}
if (!constructorRef) {
if (myParser.getDeclarationParser().parse(builder, DeclarationParser.Context.CODE_BLOCK) != null) {
done(declStatement, JavaElementType.DECLARATION_STATEMENT);
return declStatement;
}
declStatement.rollbackTo();
PsiBuilder.Marker type = myParser.getReferenceParser().parseType(builder, 0);
if (type == null || builder.getTokenType() != JavaTokenType.DOUBLE_COLON) {
error(builder, JavaErrorBundle.message("expected.identifier"));
if (type == null) builder.advanceLexer();
done(declStatement, JavaElementType.DECLARATION_STATEMENT);
return declStatement;
}
declStatement.rollbackTo(); // generic type followed by the double colon is a good candidate for being a constructor reference
}
}