Multiple templates with concatenation generator should add spaces after commas (KT-27954)

This commit is contained in:
technoir
2018-11-07 15:52:46 +03:00
committed by asedunov
parent 798b4a8164
commit 6bb5e028a5
7 changed files with 11 additions and 11 deletions
@@ -94,7 +94,7 @@ class KotlinGenerateToStringAction : KotlinGenerateMemberActionBase<KotlinGenera
val ref = (DescriptorToSourceUtilsIde.getAnyDeclaration(info.project, it) as PsiNameIdentifierOwner).nameIdentifier!!.text val ref = (DescriptorToSourceUtilsIde.getAnyDeclaration(info.project, it) as PsiNameIdentifierOwner).nameIdentifier!!.text
append("\"$ref=${renderVariableValue(it, ref)}") append("\"$ref=${renderVariableValue(it, ref)}")
if (varIterator.hasNext()) { if (varIterator.hasNext()) {
append(',') append(", ")
} }
append("\" +\n") append("\" +\n")
} }
@@ -10,8 +10,8 @@ class A(val n: IntArray, val s: Array<String>) {
override fun toString(): String { override fun toString(): String {
return "A(" + return "A(" +
"n=${Arrays.toString(n)}," + "n=${Arrays.toString(n)}, " +
"s=${Arrays.toString(s)}," + "s=${Arrays.toString(s)}, " +
"f=$f" + "f=$f" +
")" ")"
} }
@@ -7,7 +7,7 @@ class Test {
var name: String = "" var name: String = ""
<caret>override fun toString(): String { <caret>override fun toString(): String {
return "Test(" + return "Test(" +
"serial='$serial'," + "serial='$serial', " +
"name='$name'" + "name='$name'" +
")" ")"
} }
@@ -2,7 +2,7 @@
data class A(val n: Int, val s: String?) { data class A(val n: Int, val s: String?) {
override fun toString(): String { override fun toString(): String {
return "A(" + return "A(" +
"n=$n," + "n=$n, " +
"s=$s" + "s=$s" +
")" ")"
} }
@@ -2,8 +2,8 @@
class Example(val `in`: String, val `cl ass`: String, val `valid`: Boolean) { class Example(val `in`: String, val `cl ass`: String, val `valid`: Boolean) {
override fun toString(): String { override fun toString(): String {
return "Example(" + return "Example(" +
"`in`='$`in`'," + "`in`='$`in`', " +
"`cl ass`='$`cl ass`'," + "`cl ass`='$`cl ass`', " +
"`valid`=$`valid`" + "`valid`=$`valid`" +
")" ")"
} }
@@ -8,8 +8,8 @@ class A(val n: Int, val s: String) {
override fun toString(): String { override fun toString(): String {
return "A(" + return "A(" +
"n=$n," + "n=$n, " +
"s='$s'," + "s='$s', " +
"f=$f" + "f=$f" +
")" ")"
} }
@@ -13,8 +13,8 @@ class A(val n: Int, val s: String) : X() {
override fun toString(): String { override fun toString(): String {
return "A(" + return "A(" +
"n=$n," + "n=$n, " +
"s='$s'," + "s='$s', " +
"f=$f" + "f=$f" +
")" + ")" +
" ${super.toString()}" " ${super.toString()}"