change signature: refresh type element after normalizeDeclaration for old style arrays

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

@@ -827,11 +827,12 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
           parameter.getNameIdentifier().replace(newIdentifier);
         }
 
-        final PsiTypeElement typeElement = parameter.getTypeElement();
+        PsiTypeElement typeElement = parameter.getTypeElement();
         if (typeElement != null) {
+          parameter.normalizeDeclaration();
+          typeElement = parameter.getTypeElement();
           String oldType = oldParameterTypes[index];
           if (!oldType.equals(info.getTypeText())) {
-            parameter.normalizeDeclaration();
             PsiType newType =
               substitutor.substitute(info.createType(changeInfo.getMethod().getParameterList(), changeInfo.getMethod().getManager()));
             typeElement.replace(factory.createTypeElement(newType));

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

@@ -0,0 +1,3 @@
+class Test {
+  void <caret>foo(int a[]) {}
+}

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

@@ -0,0 +1,3 @@
+class Test {
+  void foo(int... a) {}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -355,6 +355,10 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest {
     }, false);
   }
 
+  public void testReplaceOldStyleArrayWithVarargs() throws Exception {
+    doTest(null, new ParameterInfoImpl[] {new ParameterInfoImpl(0, "a", new PsiEllipsisType(PsiType.INT))}, false);
+  }
+
   public void testReorderParamsOfFunctionalInterface() {
     doTest(null, null, null, method -> new ParameterInfoImpl[]{
       new ParameterInfoImpl(1, "b", PsiType.INT),