IDEA-119926 Completing Statements doesn't go to next line for non conditional statements

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

@@ -44,8 +44,8 @@ public class AfterSemicolonEnterProcessor implements EnterProcessor {
                                             ((PsiMethod) psiElement).hasModifierProperty(PsiModifier.NATIVE))) {
       int errorOffset = getErrorElementOffset(psiElement);
       int elementEndOffset = psiElement.getTextRange().getEndOffset();
+      final CharSequence text = editor.getDocument().getCharsSequence();
       if (psiElement instanceof PsiEnumConstant) {
-        final CharSequence text = editor.getDocument().getCharsSequence();
         final int commaOffset = CharArrayUtil.shiftForwardUntil(text, elementEndOffset, ",");
         if (commaOffset < text.length()) {
           elementEndOffset = commaOffset + 1;
@@ -53,13 +53,18 @@ public class AfterSemicolonEnterProcessor implements EnterProcessor {
       }
 
       if (errorOffset >= 0 && errorOffset < elementEndOffset) {
-        final CharSequence text = editor.getDocument().getCharsSequence();
         if (text.charAt(errorOffset) == ' ' && text.charAt(errorOffset + 1) == ';') {
           errorOffset++;
         }
       }
 
       editor.getCaretModel().moveToOffset(errorOffset >= 0 ? errorOffset : elementEndOffset);
+      if (errorOffset < 0 &&
+          isModified &&
+          (elementEndOffset == text.length() || text.charAt(elementEndOffset) == '\n') &&
+          (psiElement instanceof PsiExpressionStatement || psiElement instanceof PsiDeclarationStatement)) {
+        JavaSmartEnterProcessor.plainEnter(editor);
+      }
       return isModified;
     }
     return false;

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

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

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

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

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

@@ -1,5 +1,6 @@
 public class Foo {
     public void fails() {
-        boolean[] a = new boolean[f()];<caret>
+        boolean[] a = new boolean[f()];
+        <caret>
     }
 }

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

@@ -3,6 +3,7 @@ public class test {
         int k1 = 1;
         int k2 = 2;
         int[] array = new int[]{k1, k2};
+        <caret>
 
         System.out.print(k1);
     }

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

@@ -1,5 +1,6 @@
 public class Test {
     public int foo(int i) {
-        int ii = foo(0);<caret>
+        int ii = foo(0);
+        <caret>
     }
 }

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

@@ -1,6 +1,7 @@
 public class Foo {
    public void foo() {
-       foo();<caret>
+       foo();
+       <caret>
        // some line comment
    }
 }

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

@@ -1,6 +1,7 @@
 
 public class Junk {
     public static void main(String[] args) {
-        int i = 1; // comment<caret>
+        int i = 1; // comment
+        <caret>
     }
 }

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

@@ -1,6 +1,7 @@
 
 public class Junk {
     public static void main(String[] args) {
-        int[] arr = new int[]{1, 2, 3};<caret>
+        int[] arr = new int[]{1, 2, 3};
+        <caret>
     }
 }

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

@@ -1,7 +1,8 @@
 
 public class Foo {
     {
-        foo();<caret>
+        foo();
+        <caret>
         foo();
     }
 }

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

@@ -1,6 +1,7 @@
 class Test {
   Object method() {
       method(
-              factory());<caret>
+              factory());
+      <caret>
   }
 }

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

@@ -1,6 +1,7 @@
 
 class foo {
     {
-        Object d = ((String) new String());<caret>
+        Object d = ((String) new String());
+        <caret>
     }
 }

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

@@ -1,6 +1,7 @@
 
 class Foo {
     {
-        tx2 = (long) (vcx + vw);<caret>
+        tx2 = (long) (vcx + vw);
+        <caret>
     }
 }

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

@@ -1,6 +1,7 @@
 
 class foo {
     {
-        String s = "a";<caret>
+        String s = "a";
+        <caret>
     }
 }

java/java-tests/testData/codeInsight/completion/normal/SmartEnterWrapsConstructorCall_after.java

@@ -8,6 +8,7 @@ class Tester {
   }
 
   public void test1() {
-      build(new EntityBuilder());<caret>
+      build(new EntityBuilder());
+      <caret>
   }
 }

java/java-tests/testData/codeInsight/completion/smartType/ConstructorArgsSmartEnter-out.java

@@ -5,6 +5,7 @@ public class MyJavaClass {
 
     {
 
-        List l = new ArrayList(239);<caret>
+        List l = new ArrayList(239);
+        <caret>
     }
 }

java/java-tests/testData/codeInsight/completion/smartType/SmartFinish-out.java

@@ -2,7 +2,8 @@ public class Foo {
 
     {
         Foo foo = null;
-        Foo bar = id(foo);<caret>
+        Foo bar = id(foo);
+        <caret>
     }
 
     Foo id(Foo foo) {return foo;}