Java: Restored folding of nested function calls when extracting method (IDEA-175221, IDEA-167255)

java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java

@@ -245,7 +245,7 @@ public class ParametersFolder {
           if (!isMethodNameExpression(expression)) {
             expressions.add((PsiExpression)expression);
           }
-          expression = parent instanceof PsiExpression ? parent : null;
+          expression = PsiTreeUtil.getParentOfType(expression, PsiExpression.class);
         }
       }
       else {

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

@@ -0,0 +1,12 @@
+import java.util.List;
+class C {
+    void foo(int[] a, List<Integer> b) {
+        int i = 1;
+        int n = <selection>bar(a[i], b.get(i))</selection>;
+        System.out.println(n);
+    }
+
+    int bar(int a, int b) {
+        return a + b;
+    }
+}

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

@@ -0,0 +1,16 @@
+import java.util.List;
+class C {
+    void foo(int[] a, List<Integer> b) {
+        int i = 1;
+        int n = newMethod(bar(a[i], b.get(i)));
+        System.out.println(n);
+    }
+
+    private int newMethod(int bar) {
+        return bar;
+    }
+
+    int bar(int a, int b) {
+        return a + b;
+    }
+}

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

@@ -448,6 +448,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
     doTest();
   }
 
+  public void testFoldingWithFunctionCall() throws Exception {
+    doTest();
+  }
+
   public void testDontSkipVariablesUsedInLeftSideOfAssignments() throws Exception {
     doTest();
   }