Fix brace node extraction from class initializer

This commit is contained in:
Alexey Sedunov
2013-06-05 16:03:51 +04:00
parent 62bdb37014
commit ef2af3a4e8
2 changed files with 7 additions and 5 deletions
@@ -44,10 +44,9 @@ public class JetClassInitializer extends JetDeclarationImpl implements JetStatem
return body; return body;
} }
@NotNull @Nullable
public PsiElement getOpenBraceNode() { public PsiElement getOpenBraceNode() {
ASTNode openBraceNode = getNode().findChildByType(JetTokens.LBRACE); JetExpression body = getBody();
assert openBraceNode != null; return (body instanceof JetBlockExpression) ? ((JetBlockExpression) body).getLBrace() : null;
return openBraceNode.getPsi();
} }
} }
@@ -35,7 +35,10 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
new JetVisitorVoid() { new JetVisitorVoid() {
@Override @Override
public void visitAnonymousInitializer(JetClassInitializer initializer) { public void visitAnonymousInitializer(JetClassInitializer initializer) {
memberSuspects.add(initializer.getOpenBraceNode()); PsiElement brace = initializer.getOpenBraceNode();
if (brace != null) {
memberSuspects.add(brace);
}
} }
@Override @Override