Change Signature: Fix transfer of argument to receiver position

#KT-7987 Fixed

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java

@@ -415,14 +415,12 @@ public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
                 ValueArgument receiverArgument = argumentMap.get(newReceiverInfo.getOldIndex());
                 JetExpression extensionReceiverExpression = receiverArgument != null ? receiverArgument.getArgumentExpression() : null;
                 JetExpression defaultValueForCall = newReceiverInfo.getDefaultValueForCall();
-                String receiverText = extensionReceiverExpression != null
+                JetExpression receiver =
-                                      ? extensionReceiverExpression.getText()
+                        extensionReceiverExpression != null ? psiFactory.createExpression(extensionReceiverExpression.getText())
-                                      : defaultValueForCall != null ? defaultValueForCall.getText() : "";
+                        : defaultValueForCall != null ? defaultValueForCall
-                if (receiverText.isEmpty()) {
+                        : psiFactory.createExpression("_");
-                    receiverText = "_";
-                }
 
-                replacingElement = psiFactory.createExpression(receiverText + "." + element.getText());
+                replacingElement = PsiPackage.createExpressionByPattern(psiFactory, "$0.$1", receiver, element);
             }
 
             newElement = (JetElement) elementToReplace.replace(replacingElement);

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverAddParensAfter.kt

@@ -0,0 +1,5 @@
+fun f(list: List<Any>) {
+    list.filter { (it as String).foo() }
+}
+
+fun String.foo(): Boolean = true

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverAddParensBefore.kt

@@ -0,0 +1,5 @@
+fun f(list: List<Any>) {
+    list.filter { foo(it as String) }
+}
+
+fun <caret>foo(s: String): Boolean = true

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

@@ -924,6 +924,12 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
         doTest(changeInfo);
     }
 
+    public void testConvertParameterToReceiverAddParens() throws Exception {
+        JetChangeInfo changeInfo = getChangeInfo();
+        changeInfo.setReceiverParameterInfo(changeInfo.getNewParameters()[0]);
+        doTest(changeInfo);
+    }
+
     @NotNull
     @Override
     protected String getTestDataPath() {