pull up: ensure varargs as last parameter (IDEA-193132)

java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java

@@ -408,6 +408,8 @@ public class JavaPullUpHelper implements PullUpHelper<MemberInfo> {
       Initializer i2 = fieldsToInitializers.get(field2);
       if(i1.movedFieldsUsed.contains(field2)) return 1;
       if(i2.movedFieldsUsed.contains(field1)) return -1;
+      if (i1.usedParameters.stream().anyMatch(p -> p.isVarArgs())) return 1;
+      if (i2.usedParameters.stream().anyMatch(p -> p.isVarArgs())) return -1;
       return 0;
     });
 

java/java-tests/testData/refactoring/pullUp/OrderVarargsParameterLast.java

@@ -0,0 +1,10 @@
+class Super {}
+class Test extends Super{
+  String[] f2;
+  String   f<caret>1;
+
+  public Test(String f1, String... f2) {
+    this.f2 = f2;
+    this.f1 = f1;
+  }
+}

java/java-tests/testData/refactoring/pullUp/OrderVarargsParameterLast_after.java

@@ -0,0 +1,15 @@
+class Super {
+    String[] f2;
+    String   f1;
+
+    Super(String f1, String... f2) {
+        this.f1 = f1;
+        this.f2 = f2;
+    }
+}
+class Test extends Super{
+
+    public Test(String f1, String... f2) {
+        super(f1, f2);
+    }
+}

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

@@ -185,6 +185,10 @@ public class PullUpTest extends LightRefactoringTestCase {
     doTest(false, new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
   }
 
+  public void testOrderVarargsParameterLast() {
+    doTest(false, new RefactoringTestUtil.MemberDescriptor("f2", PsiField.class), new RefactoringTestUtil.MemberDescriptor("f1", PsiField.class));
+  }
+
   public void testOuterClassRefsNoConflictIfAsAbstract() {
     doTest(false, new RefactoringTestUtil.MemberDescriptor("bar", PsiMethod.class, true));
   }