cs: do not compare parameters length of caller and primary method's old parameter idx (IDEA-58352)

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

@@ -115,8 +115,8 @@ class JavaChangeSignatureUsageSearcher {
     for (ParameterInfo parameterInfo : myChangeInfo.getNewParameters()) {
       final int oldParameterIndex = parameterInfo.getOldIndex();
       final String newName = parameterInfo.getName();
-      if (oldParameterIndex >= 0 && oldParameterIndex < parameters.length) {
-        if (isOriginal) {   //Name changes take place only in primary method
+      if (oldParameterIndex >= 0 ) {
+        if (isOriginal&& oldParameterIndex < parameters.length) {   //Name changes take place only in primary method
           final PsiParameter parameter = parameters[oldParameterIndex];
           if (!newName.equals(parameter.getName())) {
             JavaUnresolvableLocalCollisionDetector.visitLocalsCollisions(

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

@@ -0,0 +1,9 @@
+public class C {
+    void su<caret>bject(String s) {
+    }
+
+    void caller() {
+        int s;
+        subject(null);
+    }
+}

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

@@ -0,0 +1,9 @@
+public class C {
+    void subject(String s, boolean b) {
+    }
+
+    void caller(boolean b) {
+        int s;
+        subject(null, b);
+    }
+}

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

@@ -3,14 +3,19 @@ package com.intellij.refactoring;
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInsight.TargetElementUtilBase;
 import com.intellij.psi.*;
+import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.refactoring.changeSignature.ChangeSignatureProcessor;
 import com.intellij.refactoring.changeSignature.JavaThrownExceptionInfo;
 import com.intellij.refactoring.changeSignature.ParameterInfoImpl;
 import com.intellij.refactoring.changeSignature.ThrownExceptionInfo;
+import com.intellij.refactoring.util.CanonicalTypes;
 import com.intellij.testFramework.LightCodeInsightTestCase;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * @author dsl
  */
@@ -316,6 +321,31 @@ public class ChangeSignatureTest extends LightCodeInsightTestCase {
     checkResultByFile(after);
   }
 
+  public void testPropagateParameter() throws Exception {
+    String basePath = "/refactoring/changeSignature/" + getTestName(false);
+    @NonNls final String filePath = basePath + ".java";
+    configureByFile(filePath);
+    final PsiElement targetElement = TargetElementUtilBase.findTargetElement(getEditor(), TargetElementUtilBase.ELEMENT_NAME_ACCEPTED);
+    assertTrue("<caret> is not on method name", targetElement instanceof PsiMethod);
+    PsiMethod method = (PsiMethod) targetElement;
+    final PsiClass containingClass = method.getContainingClass();
+    assertTrue(containingClass != null);
+    final PsiMethod[] callers = containingClass.findMethodsByName("caller", false);
+    assertTrue(callers.length > 0);
+    final PsiMethod caller = callers[0];
+    final HashSet<PsiMethod> propagateParametersMethods = new HashSet<PsiMethod>();
+    propagateParametersMethods.add(caller);
+    final PsiParameter[] parameters = method.getParameterList().getParameters();
+    new ChangeSignatureProcessor(getProject(), method, false, null,
+                                 method.getName(),
+                                 CanonicalTypes.createTypeWrapper(PsiType.VOID), new ParameterInfoImpl[]{
+        new ParameterInfoImpl(0, parameters[0].getName(), parameters[0].getType()),
+        new ParameterInfoImpl(-1, "b", PsiType.BOOLEAN, "true")}, null,
+                                 propagateParametersMethods, null).run();
+    @NonNls String after = basePath + "_after.java";
+    checkResultByFile(after);
+  }
+
   private interface GenParams {
     ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException;
   }