azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

joinTo/joinToString: Do not call toString on elements that are already CharSequence or Char.

Browse Source 
#KT-15557
This commit is contained in:
Ilya Gorbunov
2017-01-12 00:55:17 +03:00
parent 0c27e07e8c
commit 80f2efb625
13 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.libraries/src/core/generated/_ArraysJs.kt
+2 -5
View File
@@ -12158,10 +12158,7 @@ public fun <T, A : Appendable> Array<out T>.joinTo(buffer: A, separator: CharSeq
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
@@ -12345,7 +12342,7 @@ public fun <A : Appendable> CharArray.joinTo(buffer: A, separator: CharSequence
if (transform != null)
buffer.append(transform(element))
else
buffer.append(element.toString())
buffer.append(element)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
js/js.libraries/src/core/generated/_CollectionsJs.kt
+1 -4
View File
@@ -2000,10 +2000,7 @@ public fun <T, A : Appendable> Iterable<T>.joinTo(buffer: A, separator: CharSequ
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
js/js.libraries/src/core/generated/_SequencesJs.kt
+1 -4
View File
@@ -1271,10 +1271,7 @@ public fun <T, A : Appendable> Sequence<T>.joinTo(buffer: A, separator: CharSequ
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/common/src/generated/_Arrays.kt
+2 -5
View File
@@ -6812,10 +6812,7 @@ public fun <T, A : Appendable> Array<out T>.joinTo(buffer: A, separator: CharSeq
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
@@ -6999,7 +6996,7 @@ public fun <A : Appendable> CharArray.joinTo(buffer: A, separator: CharSequence
if (transform != null)
buffer.append(transform(element))
else
buffer.append(element.toString())
buffer.append(element)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/common/src/generated/_Collections.kt
+1 -4
View File
@@ -1013,10 +1013,7 @@ public fun <T, A : Appendable> Iterable<T>.joinTo(buffer: A, separator: CharSequ
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/common/src/generated/_Sequences.kt
+1 -4
View File
@@ -705,10 +705,7 @@ public fun <T, A : Appendable> Sequence<T>.joinTo(buffer: A, separator: CharSequ
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/src/generated/_Arrays.kt
+2 -5
View File
@@ -12241,10 +12241,7 @@ public fun <T, A : Appendable> Array<out T>.joinTo(buffer: A, separator: CharSeq
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
@@ -12428,7 +12425,7 @@ public fun <A : Appendable> CharArray.joinTo(buffer: A, separator: CharSequence
if (transform != null)
buffer.append(transform(element))
else
buffer.append(element.toString())
buffer.append(element)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/src/generated/_Collections.kt
+1 -4
View File
@@ -2011,10 +2011,7 @@ public fun <T, A : Appendable> Iterable<T>.joinTo(buffer: A, separator: CharSequ
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/src/generated/_Sequences.kt
+1 -4
View File
@@ -1290,10 +1290,7 @@ public fun <T, A : Appendable> Sequence<T>.joinTo(buffer: A, separator: CharSequ
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
libraries/stdlib/src/kotlin/text/StringBuilder.kt
+10
View File
@@ -53,3 +53,13 @@ public fun StringBuilder.append(vararg value: Any?): StringBuilder {
@kotlin.jvm.JvmVersion
@kotlin.internal.InlineOnly
public inline operator fun StringBuilder.set(index: Int, value: Char): Unit = this.setCharAt(index, value)
internal fun <T> Appendable.appendElement(element: T, transform: ((T) -> CharSequence)?) {
when {
transform != null -> append(transform(element))
element is CharSequence? -> append(element)
element is Char -> append(element)
else -> append(element.toString())
}
}
libraries/stdlib/test/collections/ArraysTest.kt
+16
View File
@@ -259,6 +259,22 @@ class ArraysTest {
}
@Test fun joinToString() {
val text = arrayOf("foo", "bar").joinToString("-", "<", ">")
assertEquals("<foo-bar>", text)
val text2 = arrayOf('a', "b", StringBuilder("c"), null, "d", 'e', 'f').joinToString(limit = 4, truncated = "*")
assertEquals("a, b, c, null, *", text2)
val text3 = intArrayOf(1, 2, 5, 8).joinToString("+", "[", "]")
assertEquals("[1+2+5+8]", text3)
val text4 = charArrayOf('f', 'o', 'o').joinToString()
assertEquals("f, o, o", text4)
}
@Test fun min() {
expect(null, { arrayOf<Int>().min() })
expect(1, { arrayOf(1).min() })
libraries/stdlib/test/collections/CollectionTest.kt
+3 -3
View File
@@ -42,9 +42,9 @@ class CollectionTest {
val text = data.joinToString("-", "<", ">")
assertEquals("<foo-bar>", text)
val big = listOf("a", "b", "c", "d", "e", "f")
val text2 = big.joinToString(limit = 3, truncated = "*")
assertEquals("a, b, c, *", text2)
val mixed = listOf('a', "b", StringBuilder("c"), null, "d", 'e', 'f')
val text2 = mixed.joinToString(limit = 4, truncated = "*")
assertEquals("a, b, c, null, *", text2)
}
@Test fun filterNotNull() {
libraries/tools/kotlin-stdlib-gen/src/templates/Strings.kt
+3 -6
View File
@@ -23,10 +23,7 @@ fun strings(): List<GenericFunction> {
for (element in this) {
if (++count > 1) buffer.append(separator)
if (limit < 0 || count <= limit) {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(if (element == null) "null" else element.toString())
buffer.appendElement(element, transform)
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)
@@ -35,7 +32,7 @@ fun strings(): List<GenericFunction> {
"""
}
exclude(Strings)
body(ArraysOfPrimitives) {
bodyForTypes(ArraysOfPrimitives, *defaultPrimitives.toTypedArray()) { primitive ->
"""
buffer.append(prefix)
var count = 0
@@ -45,7 +42,7 @@ fun strings(): List<GenericFunction> {
if (transform != null)
buffer.append(transform(element))
else
buffer.append(element.toString())
buffer.append(${if (primitive == PrimitiveType.Char) "element" else "element.toString()"})
} else break
}
if (limit >= 0 && count > limit) buffer.append(truncated)