IDEA-142439 Wrong cursor placement when creating a class after brackets autocomplete

java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java

@@ -309,7 +309,11 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
       final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(file.getProject());
       final boolean old = settings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE;
       settings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = false;
-      PsiElement elt = PsiTreeUtil.getParentOfType(file.findElementAt(caretOffset - 1), PsiCodeBlock.class);
+      PsiElement leaf = file.findElementAt(caretOffset - 1);
+      PsiElement elt = PsiTreeUtil.getParentOfType(leaf, PsiCodeBlock.class);
+      if (elt == null && leaf != null && leaf.getParent() instanceof PsiClass) {
+        elt = leaf.getParent();
+      }
       reformat(elt);
       settings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = old;
       editor.getCaretModel().moveToOffset(caretOffset - 1);

java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingClassBodyFixer.java

@@ -17,7 +17,7 @@ public class MissingClassBodyFixer implements Fixer {
 
     if (psiClass.getLBrace() == null) {
       int offset = psiClass.getTextRange().getEndOffset();
-      editor.getDocument().insertString(offset, " {\n}");
+      editor.getDocument().insertString(offset, "{\n}");
       editor.getCaretModel().moveToOffset(offset);
     }
   }

java/java-tests/testData/codeInsight/completeStatement/ClassBracesNextLine.java

@@ -0,0 +1,4 @@
+class Test
+{
+    class Foo<caret>
+}

java/java-tests/testData/codeInsight/completeStatement/ClassBracesNextLine_after.java

@@ -0,0 +1,7 @@
+class Test
+{
+    class Foo
+    {
+        <caret>
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java

@@ -232,7 +232,11 @@ public class CompleteStatementTest extends EditorActionTestCase {
   public void testIDEA25139() throws Exception {
     doTestBracesNextLineStyle();
   }
-  
+
+  public void testClassBracesNextLine() throws Exception {
+    doTestBracesNextLineStyle();
+  }
+
   public void testBeforeIfRBrace() throws Exception {
     CodeStyleSettingsManager.getSettings(getProject()).KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true;
     doTest();