extract method: skip parenthesis as they are skipped by control flow (IDEA-134904)

java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java

@@ -142,8 +142,9 @@ public class ExtractMethodProcessor implements MatchProvider {
                                 String helpId) {
     myProject = project;
     myEditor = editor;
-    if (elements.length != 1 || elements.length == 1 && !(elements[0] instanceof PsiBlockStatement)) {
-      myElements = elements;
+    if (elements.length != 1 || !(elements[0] instanceof PsiBlockStatement)) {
+      myElements = elements.length == 1 && elements[0] instanceof PsiParenthesizedExpression 
+                   ? new PsiElement[] {PsiUtil.skipParenthesizedExprDown((PsiExpression)elements[0])} : elements;
       myEnclosingBlockStatement = null;
     }
     else {

java/java-tests/testData/refactoring/extractMethod/TheOnlyParenthesisExpressionWhichIsSkippedInControlFlow.java

@@ -0,0 +1,7 @@
+class Test {
+  {
+    int i = 2;
+    int n = 5;
+    boolean b = !<selection>(i < n)</selection>;
+  }
+}

java/java-tests/testData/refactoring/extractMethod/TheOnlyParenthesisExpressionWhichIsSkippedInControlFlow_after.java

@@ -0,0 +1,11 @@
+class Test {
+  {
+    int i = 2;
+    int n = 5;
+    boolean b = !newMethod(i, n);
+  }
+
+    private boolean newMethod(int i, int n) {
+        return i < n;
+    }
+}

java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java

@@ -657,6 +657,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
     doTest();
   }
 
+  public void testTheOnlyParenthesisExpressionWhichIsSkippedInControlFlow() throws Exception {
+    doTest();
+  }
+
   public void testExpression() throws Exception {
     doTest();
   }