From 7a538accff7388f2a02ca7fe34ff1b3303a1990c Mon Sep 17 00:00:00 2001 From: "J.T. Gilkeson" Date: Tue, 17 Apr 2018 17:06:35 -0700 Subject: [PATCH] Fix problem with trimEnd wiping out spans in SpannableStringBuilder If I pass in a CharSequence with different spans, the original trimEnd using substring incorrectly wiped out the spans. changing to subSequence correctly preserves the span data #KT-23920 Fixed --- libraries/stdlib/src/kotlin/text/Strings.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index ad788ea0018..a7add5756cd 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -83,7 +83,7 @@ public inline fun String.trimStart(predicate: (Char) -> Boolean): String public inline fun CharSequence.trimEnd(predicate: (Char) -> Boolean): CharSequence { for (index in this.indices.reversed()) if (!predicate(this[index])) - return substring(0, index + 1) + return subSequence(0, index + 1) return "" }