From af5ec9d289c733aa2b058abd246269ec8d3d32b5 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 27 Sep 2021 10:48:50 +0300 Subject: [PATCH] Fix a typo in Typography object constants KT-46243 --- libraries/stdlib/api/js-v1/kotlin.text.kt | 10 ++++++++++ libraries/stdlib/api/js/kotlin.text.kt | 10 ++++++++++ libraries/stdlib/src/kotlin/text/Typography.kt | 16 ++++++++++++++-- .../kotlin-stdlib-runtime-merged.txt | 2 ++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/libraries/stdlib/api/js-v1/kotlin.text.kt b/libraries/stdlib/api/js-v1/kotlin.text.kt index c5e5d3691f1..16e8bd7b6a8 100644 --- a/libraries/stdlib/api/js-v1/kotlin.text.kt +++ b/libraries/stdlib/api/js-v1/kotlin.text.kt @@ -1635,6 +1635,11 @@ public object Typography { public const final val leftDoubleQuote: kotlin.Char = \u201C ('“') { get; } + @kotlin.SinceKotlin(version = "1.6") + public const final val leftGuillemet: kotlin.Char = \u00AB ('«') { get; } + + @kotlin.Deprecated(message = "This constant has a typo in the name. Use leftGuillemet instead.", replaceWith = kotlin.ReplaceWith(expression = "Typography.leftGuillemet", imports = {})) + @kotlin.DeprecatedSinceKotlin(warningSince = "1.6") public const final val leftGuillemete: kotlin.Char = \u00AB ('«') { get; } public const final val leftSingleQuote: kotlin.Char = \u2018 ('‘') { get; } @@ -1671,6 +1676,11 @@ public object Typography { public const final val rightDoubleQuote: kotlin.Char = \u201D ('”') { get; } + @kotlin.SinceKotlin(version = "1.6") + public const final val rightGuillemet: kotlin.Char = \u00BB ('»') { get; } + + @kotlin.Deprecated(message = "This constant has a typo in the name. Use rightGuillemet instead.", replaceWith = kotlin.ReplaceWith(expression = "Typography.rightGuillemet", imports = {})) + @kotlin.DeprecatedSinceKotlin(warningSince = "1.6") public const final val rightGuillemete: kotlin.Char = \u00BB ('»') { get; } public const final val rightSingleQuote: kotlin.Char = \u2019 ('’') { get; } diff --git a/libraries/stdlib/api/js/kotlin.text.kt b/libraries/stdlib/api/js/kotlin.text.kt index c5e5d3691f1..16e8bd7b6a8 100644 --- a/libraries/stdlib/api/js/kotlin.text.kt +++ b/libraries/stdlib/api/js/kotlin.text.kt @@ -1635,6 +1635,11 @@ public object Typography { public const final val leftDoubleQuote: kotlin.Char = \u201C ('“') { get; } + @kotlin.SinceKotlin(version = "1.6") + public const final val leftGuillemet: kotlin.Char = \u00AB ('«') { get; } + + @kotlin.Deprecated(message = "This constant has a typo in the name. Use leftGuillemet instead.", replaceWith = kotlin.ReplaceWith(expression = "Typography.leftGuillemet", imports = {})) + @kotlin.DeprecatedSinceKotlin(warningSince = "1.6") public const final val leftGuillemete: kotlin.Char = \u00AB ('«') { get; } public const final val leftSingleQuote: kotlin.Char = \u2018 ('‘') { get; } @@ -1671,6 +1676,11 @@ public object Typography { public const final val rightDoubleQuote: kotlin.Char = \u201D ('”') { get; } + @kotlin.SinceKotlin(version = "1.6") + public const final val rightGuillemet: kotlin.Char = \u00BB ('»') { get; } + + @kotlin.Deprecated(message = "This constant has a typo in the name. Use rightGuillemet instead.", replaceWith = kotlin.ReplaceWith(expression = "Typography.rightGuillemet", imports = {})) + @kotlin.DeprecatedSinceKotlin(warningSince = "1.6") public const final val rightGuillemete: kotlin.Char = \u00BB ('»') { get; } public const final val rightSingleQuote: kotlin.Char = \u2019 ('’') { get; } diff --git a/libraries/stdlib/src/kotlin/text/Typography.kt b/libraries/stdlib/src/kotlin/text/Typography.kt index 7570efaa13d..6569a2a06e9 100644 --- a/libraries/stdlib/src/kotlin/text/Typography.kt +++ b/libraries/stdlib/src/kotlin/text/Typography.kt @@ -32,9 +32,11 @@ public object Typography { /** The character © */ public const val copyright: Char = '\u00A9' /** The character « */ - public const val leftGuillemete: Char = '\u00AB' + @SinceKotlin("1.6") + public const val leftGuillemet: Char = '\u00AB' /** The character » */ - public const val rightGuillemete: Char = '\u00BB' + @SinceKotlin("1.6") + public const val rightGuillemet: Char = '\u00BB' /** The character ® */ public const val registered: Char = '\u00AE' /** The character ° */ @@ -87,4 +89,14 @@ public object Typography { public const val lessOrEqual: Char = '\u2264' /** The character ≥ */ public const val greaterOrEqual: Char = '\u2265' + + /** The character « */ + @Deprecated("This constant has a typo in the name. Use leftGuillemet instead.", ReplaceWith("Typography.leftGuillemet")) + @DeprecatedSinceKotlin("1.6") + public const val leftGuillemete: Char = '\u00AB' + + /** The character » */ + @Deprecated("This constant has a typo in the name. Use rightGuillemet instead.", ReplaceWith("Typography.rightGuillemet")) + @DeprecatedSinceKotlin("1.6") + public const val rightGuillemete: Char = '\u00BB' } \ No newline at end of file diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt index 8642a8466f4..40e2096d973 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt @@ -5594,6 +5594,7 @@ public final class kotlin/text/Typography { public static final field greaterOrEqual C public static final field half C public static final field leftDoubleQuote C + public static final field leftGuillemet C public static final field leftGuillemete C public static final field leftSingleQuote C public static final field less C @@ -5612,6 +5613,7 @@ public final class kotlin/text/Typography { public static final field quote C public static final field registered C public static final field rightDoubleQuote C + public static final field rightGuillemet C public static final field rightGuillemete C public static final field rightSingleQuote C public static final field section C