extract method: don't include predefined 0 into exit points when try/finally is processed (IDEA-146332)

java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java

@@ -326,7 +326,7 @@ public class ControlFlowUtil {
       // process chain of goto's
       gotoOffset = promoteThroughGotoChain(flow, gotoOffset);
 
-      if (!exitPoints.contains(gotoOffset) && (gotoOffset >= end || gotoOffset < start)) {
+      if (!exitPoints.contains(gotoOffset) && (gotoOffset >= end || gotoOffset < start) && gotoOffset > 0) {
         exitPoints.add(gotoOffset);
       }
       if (gotoOffset >= end || gotoOffset < start) {

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

@@ -0,0 +1,12 @@
+class C {
+  private void foo() {
+    System.out.println();
+    <selection>try {}
+    finally {
+      while (true) {
+        break;
+      }
+    }
+    </selection>
+  }
+}

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

@@ -0,0 +1,16 @@
+class C {
+  private void foo() {
+    System.out.println();
+      newMethod();
+
+  }
+
+    private void newMethod() {
+        try {}
+        finally {
+          while (true) {
+            break;
+          }
+        }
+    }
+}

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

@@ -20,7 +20,6 @@ import com.intellij.codeInsight.CodeInsightUtil;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
@@ -36,7 +35,6 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class ExtractMethodTest extends LightCodeInsightTestCase {
@@ -769,6 +767,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
     doTest();
   }
 
+  public void testSingleExitPOintWithTryFinally() throws Exception {
+    doTest();
+  }
+
   private void doTestDisabledParam() throws PrepareFailedException {
     final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
     settings.ELSE_ON_NEW_LINE = true;