From ef2af3a4e8b2297d0042d4b8a913ca9505733681 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Wed, 5 Jun 2013 16:03:51 +0400
Subject: [PATCH] Fix brace node extraction from class initializer

---
 .../org/jetbrains/jet/lang/psi/JetClassInitializer.java    | 7 +++----
 .../codeInsight/upDownMover/JetDeclarationMover.java       | 5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java
index 3d40cdd11c1..0f681f4ba1e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java
@@ -44,10 +44,9 @@ public class JetClassInitializer extends JetDeclarationImpl implements JetStatem
         return body;
     }
 
-    @NotNull
+    @Nullable
     public PsiElement getOpenBraceNode() {
-        ASTNode openBraceNode = getNode().findChildByType(JetTokens.LBRACE);
-        assert openBraceNode != null;
-        return openBraceNode.getPsi();
+        JetExpression body = getBody();
+        return (body instanceof JetBlockExpression) ? ((JetBlockExpression) body).getLBrace() : null;
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java
index eb5fdc3cfeb..ae95da053c8 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java
@@ -35,7 +35,10 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
                 new JetVisitorVoid() {
                     @Override
                     public void visitAnonymousInitializer(JetClassInitializer initializer) {
-                        memberSuspects.add(initializer.getOpenBraceNode());
+                        PsiElement brace = initializer.getOpenBraceNode();
+                        if (brace != null) {
+                            memberSuspects.add(brace);
+                        }
                     }
 
                     @Override