Do not reformat parent code block on "complete current statement" action (IDEA-102479)

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

@@ -189,13 +189,7 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor {
       return;
     }
     PsiElement parent = atCaret.getParent();
-    if (parent instanceof PsiCodeBlock) {
-      final PsiCodeBlock block = (PsiCodeBlock) parent;
-      if (block.getStatements().length > 0 && block.getStatements()[0] == atCaret) {
-        atCaret = block;
-      }
-    }
-    else if (parent instanceof PsiForStatement) {
+    if (parent instanceof PsiForStatement) {
       atCaret = parent;
     }
 

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

@@ -1,8 +1,7 @@
 
 class Foo {
     abstract void a();
-    
     {
-        a();<caret>
+        a();
     }
 }

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

@@ -1,8 +1,7 @@
 
 class Foo {
     abstract void a();
-    
     {
-        a();<caret>
+        a();
     }
 }

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

@@ -1,6 +1,5 @@
 class Foo {
     boolean a;
-
     {
         if (a) {
         } else {

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

@@ -0,0 +1,9 @@
+public class Test {
+  public void foo(int x) {
+      int a = 2<caret>
+
+           System.out.println("");
+            System.out.println("");
+             System.out.println("");
+  }
+}

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

@@ -0,0 +1,9 @@
+public class Test {
+  public void foo(int x) {
+      int a = 2;
+
+           System.out.println("");
+            System.out.println("");
+             System.out.println("");
+  }
+}

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

@@ -67,6 +67,8 @@ public class CompleteStatementTest extends EditorActionTestCase {
     }
   }
 
+  public void testNoBlockReformat() { doTest(); }
+
   public void testCompleteCatchWithExpression() throws Exception { doTest(); }
 
   public void testCompleteCatchBody() throws Exception { doTest(); }