From 606fad64ad66a47f05e1dd1f9abaa49d6ad5dc5d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 18 Jun 2020 09:52:23 +0300 Subject: [PATCH] Leave StringBuilder.append/insert with non-nullable String parameter Leave these methods as hidden in order to preserve binary compatibility. #KT-39504 --- libraries/stdlib/api/js-v1/kotlin.text.kt | 6 ++++++ libraries/stdlib/api/js/kotlin.text.kt | 6 ++++++ libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libraries/stdlib/api/js-v1/kotlin.text.kt b/libraries/stdlib/api/js-v1/kotlin.text.kt index 8a0c673fa64..22399a316ac 100644 --- a/libraries/stdlib/api/js-v1/kotlin.text.kt +++ b/libraries/stdlib/api/js-v1/kotlin.text.kt @@ -1225,6 +1225,9 @@ public final class StringBuilder : kotlin.text.Appendable, kotlin.CharSequence { public open override fun append(value: kotlin.CharSequence?, startIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.text.StringBuilder + @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "Provided for binary compatibility.") + public final fun append(value: kotlin.String): kotlin.text.StringBuilder + @kotlin.SinceKotlin(version = "1.3") public final fun append(value: kotlin.String?): kotlin.text.StringBuilder @@ -1285,6 +1288,9 @@ public final class StringBuilder : kotlin.text.Appendable, kotlin.CharSequence { @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final fun insert(index: kotlin.Int, value: kotlin.CharSequence?): kotlin.text.StringBuilder + @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "Provided for binary compatibility.") + public final fun insert(index: kotlin.Int, value: kotlin.String): kotlin.text.StringBuilder + @kotlin.SinceKotlin(version = "1.4") @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final fun insert(index: kotlin.Int, value: kotlin.String?): kotlin.text.StringBuilder diff --git a/libraries/stdlib/api/js/kotlin.text.kt b/libraries/stdlib/api/js/kotlin.text.kt index 8a0c673fa64..22399a316ac 100644 --- a/libraries/stdlib/api/js/kotlin.text.kt +++ b/libraries/stdlib/api/js/kotlin.text.kt @@ -1225,6 +1225,9 @@ public final class StringBuilder : kotlin.text.Appendable, kotlin.CharSequence { public open override fun append(value: kotlin.CharSequence?, startIndex: kotlin.Int, endIndex: kotlin.Int): kotlin.text.StringBuilder + @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "Provided for binary compatibility.") + public final fun append(value: kotlin.String): kotlin.text.StringBuilder + @kotlin.SinceKotlin(version = "1.3") public final fun append(value: kotlin.String?): kotlin.text.StringBuilder @@ -1285,6 +1288,9 @@ public final class StringBuilder : kotlin.text.Appendable, kotlin.CharSequence { @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final fun insert(index: kotlin.Int, value: kotlin.CharSequence?): kotlin.text.StringBuilder + @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "Provided for binary compatibility.") + public final fun insert(index: kotlin.Int, value: kotlin.String): kotlin.text.StringBuilder + @kotlin.SinceKotlin(version = "1.4") @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final fun insert(index: kotlin.Int, value: kotlin.String?): kotlin.text.StringBuilder diff --git a/libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt b/libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt index 8141e6e13fe..28e72acd311 100644 --- a/libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt +++ b/libraries/stdlib/js/src/kotlin/text/StringBuilderJs.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -114,6 +114,9 @@ public actual class StringBuilder actual constructor(content: String) : Appendab return this } + @Deprecated("Provided for binary compatibility.", level = DeprecationLevel.HIDDEN) + fun append(value: String): StringBuilder = append(value) + /** * Appends the specified string [value] to this string builder and returns this instance. * @@ -279,6 +282,9 @@ public actual class StringBuilder actual constructor(content: String) : Appendab return this } + @Deprecated("Provided for binary compatibility.", level = DeprecationLevel.HIDDEN) + fun insert(index: Int, value: String): StringBuilder = insert(index, value) + /** * Inserts the string [value] into this string builder at the specified [index] and returns this instance. *