IDEA-118194 complete statement works strange for inner classes / enums

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

@@ -123,7 +123,7 @@ public class PlainEnterProcessor implements EnterProcessor {
   private static boolean processExistingBlankLine(@NotNull Editor editor, @Nullable PsiCodeBlock codeBlock, @Nullable PsiElement element) {
     PsiWhiteSpace whiteSpace = null;
     if (codeBlock == null) {
-      if (element != null) {
+      if (element != null && !(element instanceof PsiMember)) {
         final PsiElement next = PsiTreeUtil.nextLeaf(element);
         if (next instanceof PsiWhiteSpace) {
           whiteSpace = (PsiWhiteSpace)next;

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

@@ -0,0 +1,6 @@
+public class Foo {
+    public static enum MyEnum<caret>
+
+    public void foo() {
+    }
+}

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

@@ -0,0 +1,8 @@
+public class Foo {
+    public static enum MyEnum {
+        <caret>
+    }
+
+    public void foo() {
+    }
+}

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

@@ -107,6 +107,8 @@ public class CompleteStatementTest extends EditorActionTestCase {
   public void testMethod() throws Exception { doTest(); }
 
   public void testClass() throws Exception { doTest(); }
+  
+  public void testInnerEnumBeforeMethod() { doTest(); }
 
   public void testCompleteElseIf() throws Exception { doTest(); }
 
@@ -269,11 +271,11 @@ public class CompleteStatementTest extends EditorActionTestCase {
     }
   }
 
-  private void doTest() throws Exception {
+  private void doTest() {
     doTest("java");
   }
 
-  private void doTest(String ext) throws Exception {
+  private void doTest(String ext) {
     String path = "/codeInsight/completeStatement/";
     doFileTest(path + getTestName(false) + "." + ext, path + getTestName(false) + "_after." + ext, true);
   }

java/testFramework/src/com/intellij/testFramework/EditorActionTestCase.java

@@ -79,7 +79,7 @@ public abstract class EditorActionTestCase extends LightCodeInsightTestCase {
    * @param ignoreTrailingSpaces  true if trailing spaces should be ignored.
    * @throws Exception
    */
-  protected void doFileTest(String filePathBefore, String filePathAfter, boolean ignoreTrailingSpaces) throws Exception {
+  protected void doFileTest(String filePathBefore, String filePathAfter, boolean ignoreTrailingSpaces) {
     configureByFile(filePathBefore);
     invokeAction();
     checkResultByFile(null, filePathAfter, ignoreTrailingSpaces);