This commit is contained in:
Roman Shevchenko
2010-07-28 11:36:09 +04:00
parent 46dad645d8
commit fb03ab9d6d
@@ -111,6 +111,7 @@ public class StatementParsing extends Parsing {
return dummyRoot.getFirstChildNode();
}
@Nullable
public TreeElement parseCodeBlock(Lexer lexer, boolean deep) {
if (lexer.getTokenType() != JavaTokenType.LBRACE) return null;
Lexer badLexer = lexer instanceof StoppableLexerAdapter ? ((StoppableLexerAdapter)lexer).getDelegate() : lexer;
@@ -151,11 +152,10 @@ public class StatementParsing extends Parsing {
List<IElementType> list = new SmartList<IElementType>();
while (true) {
final IElementType type = lexer.getTokenType();
if (ElementType.PRIMITIVE_TYPE_BIT_SET.contains(type) || type == JavaTokenType.IDENTIFIER || ElementType.MODIFIER_BIT_SET.contains(type) ||
type == JavaTokenType.LT || type == JavaTokenType.GT || type == JavaTokenType.GTGT || type == JavaTokenType.GTGTGT || type ==
JavaTokenType.COMMA || type ==
JavaTokenType.DOT ||
type == JavaTokenType.EXTENDS_KEYWORD || type == JavaTokenType.IMPLEMENTS_KEYWORD) {
if (ElementType.PRIMITIVE_TYPE_BIT_SET.contains(type) || ElementType.MODIFIER_BIT_SET.contains(type) ||
type == JavaTokenType.IDENTIFIER || type == JavaTokenType.LT || type == JavaTokenType.GT ||
type == JavaTokenType.GTGT || type == JavaTokenType.GTGTGT || type == JavaTokenType.COMMA ||
type == JavaTokenType.DOT || type == JavaTokenType.EXTENDS_KEYWORD || type == JavaTokenType.IMPLEMENTS_KEYWORD) {
list.add(type);
lexer.advance();
} else {