[extract method] IDEA-278872: fix missed return variable

GitOrigin-RevId: 55ffed6010a531c34dfa18e22ad5b82ced9599ba

java/java-impl/src/com/intellij/refactoring/extractMethod/newImpl/CodeFragmentAnalyzer.kt

@@ -83,9 +83,7 @@ class CodeFragmentAnalyzer(val elements: List<PsiElement>) {
   }
 
   fun findOutputVariables(): List<PsiVariable> {
-    val exitPoints = IntArrayList()
-    ControlFlowUtil.findExitPointsAndStatements(flow, flowRange.first, flowRange.last, exitPoints, *DEFAULT_EXIT_STATEMENTS_CLASSES)
-    return ControlFlowUtil.getOutputVariables(flow, flowRange.first, flowRange.last, exitPoints.toIntArray()).distinct()
+    return ControlFlowUtil.getOutputVariables(flow, flowRange.first, flowRange.last, findExitPoints().toIntArray()).distinct()
   }
 
   fun findUndeclaredVariables(): List<PsiVariable> {

java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872.java

@@ -0,0 +1,10 @@
+class Test {
+    void test() {
+        <selection>final String str = "atata";
+        do {
+          System.out.println();
+        } while (Math.random() > 0.5);</selection>
+
+        System.out.println(str);
+    }
+}

java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java

@@ -0,0 +1,18 @@
+import org.jetbrains.annotations.NotNull;
+
+class Test {
+    void test() {
+        final String str = getString();
+
+        System.out.println(str);
+    }
+
+    @NotNull
+    private String getString() {
+        final String str = "atata";
+        do {
+          System.out.println();
+        } while (Math.random() > 0.5);
+        return str;
+    }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodAndDuplicatesInplaceTest.kt

@@ -158,6 +158,10 @@ class ExtractMethodAndDuplicatesInplaceTest: LightJavaCodeInsightTestCase() {
     doTest()
   }
 
+  fun testIDEA278872(){
+    doTest()
+  }
+
   fun testRefactoringListener(){
     templateTest {
       configureByFile("$BASE_PATH/${getTestName(false)}.java")