Change Signature: Do not report conflict when parameter name clashes with suggested name of the receiver

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java

@@ -359,8 +359,8 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
             }
         }
 
-        for (ParameterInfo parameter : info.getNewParameters()) {
+        for (JetParameterInfo parameter : changeInfo.getNonReceiverParameters()) {
-            JetValVar valOrVar = ((JetParameterInfo) parameter).getValOrVar();
+            JetValVar valOrVar = parameter.getValOrVar();
             String parameterName = parameter.getName();
 
             if (!parameterNames.add(parameterName)) {

idea/testData/refactoring/changeSignature/NoConflictWithReceiverNameAfter.kt

@@ -0,0 +1,3 @@
+fun Int.<caret>foo(i: Int) {
+
+}

idea/testData/refactoring/changeSignature/NoConflictWithReceiverNameBefore.kt

@@ -0,0 +1,3 @@
+fun Int.<caret>foo() {
+
+}

idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java

@@ -794,6 +794,12 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
         );
     }
 
+    public void testNoConflictWithReceiverName() throws Exception {
+        JetChangeInfo changeInfo = getChangeInfo();
+        changeInfo.addParameter(new JetParameterInfo(-1, "i", KotlinBuiltIns.getInstance().getIntType(), null, "0", null, null));
+        doTest(changeInfo);
+    }
+
     @NotNull
     @Override
     protected String getTestDataPath() {