change signature: copy non varargs arg to varargs position (IDEA-65913)

java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java

@@ -452,7 +452,15 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
         else {
           final int newVarargCount = newArgsLength - newNonVarargCount;
           LOG.assertTrue(newVarargCount == 0 || newVarargCount == varargCount);
-          System.arraycopy(args, nonVarargCount, newArgs, newNonVarargCount, newVarargCount);
+          for (int i = newNonVarargCount; i < newArgsLength; i++){
+            final int oldIndex = newParms[newNonVarargCount].getOldIndex();
+            if (oldIndex >= 0 && oldIndex != nonVarargCount) {
+              newArgs[i] = createActualArgument(changeInfo, list, newParms[newNonVarargCount], toInsertDefaultValue, args);
+            } else {
+              System.arraycopy(args, nonVarargCount, newArgs, newNonVarargCount, newVarargCount);
+              break;
+            }
+          }
         }
         ChangeSignatureUtil.synchronizeList(list, Arrays.asList(newArgs), ExpressionList.INSTANCE, changeInfo.toRemoveParm());
       }

java/java-tests/testData/refactoring/changeSignature/Varargs2.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class C {
+    void do<caret>Smth(boolean b, int... i) {
+    }
+
+    void m() {
+        doSmth(true, 1);
+    }
+}

java/java-tests/testData/refactoring/changeSignature/Varargs2_after.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class C {
+    void doSmth(int i, boolean... b) {
+    }
+
+    void m() {
+        doSmth(1, true);
+    }
+}

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

@@ -187,6 +187,13 @@ public class ChangeSignatureTest extends LightCodeInsightTestCase {
     }, false);
   }
 
+  public void testVarargs2() throws Exception {
+    doTest(null, new ParameterInfoImpl[] {
+      new ParameterInfoImpl(1, "i", PsiType.INT),
+      new ParameterInfoImpl(0, "b", new PsiEllipsisType(PsiType.BOOLEAN))
+    }, false);
+  }
+
   public void testCovariantReturnType() throws Exception {
     doTest("java.lang.Runnable", new ParameterInfoImpl[0], false);
   }