From 6bb5e028a5c7dd0eaa520a295965c2a05db2ecc5 Mon Sep 17 00:00:00 2001
From: technoir <sergey.chelombitko@gmail.com>
Date: Wed, 7 Nov 2018 15:52:46 +0300
Subject: [PATCH] Multiple templates with concatenation generator should add
 spaces after commas (KT-27954)

---
 .../idea/actions/generate/KotlinGenerateToStringAction.kt     | 2 +-
 .../generate/toString/multipeTemplates/arrays.kt.after        | 4 ++--
 .../toString/multipeTemplates/customAccessors.kt.after        | 2 +-
 .../generate/toString/multipeTemplates/dataClass.kt.after     | 2 +-
 .../generate/toString/multipeTemplates/keepQuotes.kt.after    | 4 ++--
 .../generate/toString/multipeTemplates/multipleVars.kt.after  | 4 ++--
 .../multipeTemplates/multipleVarsWithSuperClass.kt.after      | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt
index 2138146adbe..c91fdfc002b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateToStringAction.kt
@@ -94,7 +94,7 @@ class KotlinGenerateToStringAction : KotlinGenerateMemberActionBase<KotlinGenera
                             val ref = (DescriptorToSourceUtilsIde.getAnyDeclaration(info.project, it) as PsiNameIdentifierOwner).nameIdentifier!!.text
                             append("\"$ref=${renderVariableValue(it, ref)}")
                             if (varIterator.hasNext()) {
-                                append(',')
+                                append(", ")
                             }
                             append("\" +\n")
                         }
diff --git a/idea/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after b/idea/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after
index 52a9700e6f2..bce33a0746b 100644
--- a/idea/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after
+++ b/idea/testData/codeInsight/generate/toString/multipeTemplates/arrays.kt.after
@@ -10,8 +10,8 @@ class A(val n: IntArray, val s: Array<String>) {
 
     override fun toString(): String {
         return "A(" +
-                "n=${Arrays.toString(n)}," +
-                "s=${Arrays.toString(s)}," +
+                "n=${Arrays.toString(n)}, " +
+                "s=${Arrays.toString(s)}, " +
                 "f=$f" +
                 ")"
     }
diff --git a/idea/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after b/idea/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after
index d52ad22b32e..d34f18d212e 100644
--- a/idea/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after
+++ b/idea/testData/codeInsight/generate/toString/multipeTemplates/customAccessors.kt.after
@@ -7,7 +7,7 @@ class Test {
     var name: String = ""
     <caret>override fun toString(): String {
         return "Test(" +
-                "serial='$serial'," +
+                "serial='$serial', " +
                 "name='$name'" +
                 ")"
     }
diff --git a/idea/testData/codeInsight/generate/toString/multipeTemplates/dataClass.kt.after b/idea/testData/codeInsight/generate/toString/multipeTemplates/dataClass.kt.after
index 0c91a98b32b..49fa4db1853 100644
--- a/idea/testData/codeInsight/generate/toString/multipeTemplates/dataClass.kt.after
+++ b/idea/testData/codeInsight/generate/toString/multipeTemplates/dataClass.kt.after
@@ -2,7 +2,7 @@
 data class A(val n: Int, val s: String?) {
     override fun toString(): String {
         return "A(" +
-                "n=$n," +
+                "n=$n, " +
                 "s=$s" +
                 ")"
     }
diff --git a/idea/testData/codeInsight/generate/toString/multipeTemplates/keepQuotes.kt.after b/idea/testData/codeInsight/generate/toString/multipeTemplates/keepQuotes.kt.after
index e0fabf9c7ba..4efb2f931a9 100644
--- a/idea/testData/codeInsight/generate/toString/multipeTemplates/keepQuotes.kt.after
+++ b/idea/testData/codeInsight/generate/toString/multipeTemplates/keepQuotes.kt.after
@@ -2,8 +2,8 @@
 class Example(val `in`: String, val `cl ass`: String, val `valid`: Boolean) {
     override fun toString(): String {
         return "Example(" +
-                "`in`='$`in`'," +
-                "`cl ass`='$`cl ass`'," +
+                "`in`='$`in`', " +
+                "`cl ass`='$`cl ass`', " +
                 "`valid`=$`valid`" +
                 ")"
     }
diff --git a/idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after b/idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after
index 2a8f0c41293..9c15a6d9c1c 100644
--- a/idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after
+++ b/idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVars.kt.after
@@ -8,8 +8,8 @@ class A(val n: Int, val s: String) {
 
     override fun toString(): String {
         return "A(" +
-                "n=$n," +
-                "s='$s'," +
+                "n=$n, " +
+                "s='$s', " +
                 "f=$f" +
                 ")"
     }
diff --git a/idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after b/idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after
index 2b4af609acd..c5bd23696c5 100644
--- a/idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after
+++ b/idea/testData/codeInsight/generate/toString/multipeTemplates/multipleVarsWithSuperClass.kt.after
@@ -13,8 +13,8 @@ class A(val n: Int, val s: String) : X() {
 
     override fun toString(): String {
         return "A(" +
-                "n=$n," +
-                "s='$s'," +
+                "n=$n, " +
+                "s='$s', " +
                 "f=$f" +
                 ")" +
                 " ${super.toString()}"