From 06d339639fe659d3076642c14ba0f98826faccdd Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 6 Aug 2018 16:35:01 +0300
Subject: [PATCH] Fix "Add name to argument" (disable reformatting in quick-fix
 text)

Four relevant quick-fix tests should be fixed after it
---
 .../psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt | 12 +++++++++---
 .../kotlin/idea/quickfix/AddNameToArgumentFix.kt     |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
index 13da8534d8e..62bd56b132e 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
@@ -482,13 +482,19 @@ class KtPsiFactory @JvmOverloads constructor(private val project: Project, val m
             createExpressionByPattern("if ($0) $1", condition, thenExpr)) as KtIfExpression
     }
 
-    fun createArgument(expression: KtExpression?, name: Name? = null, isSpread: Boolean = false): KtValueArgument {
-        val argumentList = buildByPattern({ pattern, args -> createByPattern(pattern, *args) { createCallArguments(it) } }) {
+    fun createArgument(
+        expression: KtExpression?,
+        name: Name? = null,
+        isSpread: Boolean = false,
+        reformat: Boolean = true
+    ): KtValueArgument {
+        val argumentList = buildByPattern(
+            { pattern, args -> createByPattern(pattern, *args, reformat = reformat) { createCallArguments(it) } }) {
             appendFixedText("(")
 
             if (name != null) {
                 appendName(name)
-                appendFixedText("=")
+                appendFixedText(" = ")
             }
 
             if (isSpread) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt
index 4555aebb705..e958266aa35 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt
@@ -60,7 +60,7 @@ class AddNameToArgumentFix(argument: KtValueArgument) : KotlinQuickFixAction<KtV
     override fun getText(): String {
         return calculatePossibleArgumentNames()
                        .singleOrNull()
-                       ?.let { "Add name to argument: '${createArgumentWithName(it).text}'" }
+                       ?.let { "Add name to argument: '${createArgumentWithName(it, reformat = false).text}'" }
                ?: "Add name to argument..."
     }
 
@@ -92,9 +92,9 @@ class AddNameToArgumentFix(argument: KtValueArgument) : KotlinQuickFixAction<KtV
         }
     }
 
-    private fun createArgumentWithName(name: Name): KtValueArgument {
+    private fun createArgumentWithName(name: Name, reformat: Boolean = true): KtValueArgument {
         val argumentExpression = element!!.getArgumentExpression()!!
-        return KtPsiFactory(element!!).createArgument(argumentExpression, name, element!!.getSpreadElement() != null)
+        return KtPsiFactory(element!!).createArgument(argumentExpression, name, element!!.getSpreadElement() != null, reformat = reformat)
     }
 
     private fun chooseNameAndAdd(project: Project, editor: Editor, names: List<Name>) {