IDEA-69972 Smart Complete Statement: Leave code block if the action is called for the complete statement

Don't leave method code block on smart completion

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

@@ -51,7 +51,12 @@ public class LeaveCodeBlockEnterProcessor implements EnterProcessor {
     if (!(parent instanceof PsiCodeBlock)) {
       return false;
     }
-    
+
+    final ASTNode node = psiElement.getNode();
+    if (node != null && CONTROL_FLOW_ELEMENT_TYPES.contains(node.getElementType())) {
+      return false;
+    } 
+
     boolean leaveCodeBlock = isControlFlowBreak(psiElement) || isValidStatementInsideControlFlowOperator(psiElement, isModified);
     if (!leaveCodeBlock) {
       return false;
@@ -106,15 +111,25 @@ public class LeaveCodeBlockEnterProcessor implements EnterProcessor {
     return element instanceof PsiReturnStatement || element instanceof PsiThrowStatement;
   }
   
-  private static boolean isValidStatementInsideControlFlowOperator(@Nullable PsiElement element, boolean modified) {
+  private static boolean isValidStatementInsideControlFlowOperator(final @Nullable PsiElement element, boolean modified) {
     if (modified || element == null || PsiTreeUtil.hasErrorElements(element)) {
       return false;
     }
-    final ASTNode node = element.getNode();
-    if (node == null) {
-      return false;
-    }
+    
+    for (PsiElement e = element; e != null; e = e.getParent()) {
+      final ASTNode node = e.getNode();
+      if (node == null) {
+        return false;
+      }
 
-    return !CONTROL_FLOW_ELEMENT_TYPES.contains(node.getElementType());
+      if (node.getElementType() == JavaElementType.METHOD) {
+        return false;
+      }
+      
+      if (CONTROL_FLOW_ELEMENT_TYPES.contains(node.getElementType())) {
+        return true;
+      } 
+    }
+    return false;
   }
 }

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

@@ -2,6 +2,6 @@
 public class Foo {
     {
         foo(x);
+        <caret>
     }
-    <caret>
 }

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

@@ -1,6 +1,6 @@
 public class Foo {
     public void foo() {
         String s = "abcdef";
+        <caret>
     }
-    <caret>
 }

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

@@ -2,6 +2,6 @@
 public class Test {
     public void foo() {
         int x = 2;
+        <caret>
     }
-    <caret>
 }