From 4598552e463538b7cd2802f997b1740bd7959b85 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 8 Apr 2022 07:48:19 +0300 Subject: [PATCH] Promote Regex.matchAt and matchesAt to Stable #KT-51470 --- libraries/stdlib/api/js-v1/kotlin.text.kt | 8 ++++---- libraries/stdlib/api/js/kotlin.text.kt | 8 ++++---- libraries/stdlib/common/src/kotlin/TextH.kt | 8 ++++---- libraries/stdlib/js/src/kotlin/text/regex.kt | 8 ++++---- libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt | 8 ++++---- libraries/stdlib/native-wasm/src/kotlin/text/Regex.kt | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libraries/stdlib/api/js-v1/kotlin.text.kt b/libraries/stdlib/api/js-v1/kotlin.text.kt index c58620f2339..dc7311afe86 100644 --- a/libraries/stdlib/api/js-v1/kotlin.text.kt +++ b/libraries/stdlib/api/js-v1/kotlin.text.kt @@ -1415,16 +1415,16 @@ public final class Regex { public final fun findAll(input: kotlin.CharSequence, startIndex: kotlin.Int = ...): kotlin.sequences.Sequence - @kotlin.SinceKotlin(version = "1.5") - @kotlin.ExperimentalStdlibApi + @kotlin.SinceKotlin(version = "1.7") + @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final fun matchAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.text.MatchResult? public final fun matchEntire(input: kotlin.CharSequence): kotlin.text.MatchResult? public final infix fun matches(input: kotlin.CharSequence): kotlin.Boolean - @kotlin.SinceKotlin(version = "1.5") - @kotlin.ExperimentalStdlibApi + @kotlin.SinceKotlin(version = "1.7") + @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final fun matchesAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.Boolean public final fun replace(input: kotlin.CharSequence, transform: (kotlin.text.MatchResult) -> kotlin.CharSequence): kotlin.String diff --git a/libraries/stdlib/api/js/kotlin.text.kt b/libraries/stdlib/api/js/kotlin.text.kt index c58620f2339..dc7311afe86 100644 --- a/libraries/stdlib/api/js/kotlin.text.kt +++ b/libraries/stdlib/api/js/kotlin.text.kt @@ -1415,16 +1415,16 @@ public final class Regex { public final fun findAll(input: kotlin.CharSequence, startIndex: kotlin.Int = ...): kotlin.sequences.Sequence - @kotlin.SinceKotlin(version = "1.5") - @kotlin.ExperimentalStdlibApi + @kotlin.SinceKotlin(version = "1.7") + @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final fun matchAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.text.MatchResult? public final fun matchEntire(input: kotlin.CharSequence): kotlin.text.MatchResult? public final infix fun matches(input: kotlin.CharSequence): kotlin.Boolean - @kotlin.SinceKotlin(version = "1.5") - @kotlin.ExperimentalStdlibApi + @kotlin.SinceKotlin(version = "1.7") + @kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class}) public final fun matchesAt(input: kotlin.CharSequence, index: kotlin.Int): kotlin.Boolean public final fun replace(input: kotlin.CharSequence, transform: (kotlin.text.MatchResult) -> kotlin.CharSequence): kotlin.String diff --git a/libraries/stdlib/common/src/kotlin/TextH.kt b/libraries/stdlib/common/src/kotlin/TextH.kt index 94d3c4c6569..36229aaf74a 100644 --- a/libraries/stdlib/common/src/kotlin/TextH.kt +++ b/libraries/stdlib/common/src/kotlin/TextH.kt @@ -25,8 +25,8 @@ expect class Regex { * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of the [input] char sequence. * @sample samples.text.Regexps.matchAt */ - @SinceKotlin("1.5") - @ExperimentalStdlibApi + @SinceKotlin("1.7") + @WasExperimental(ExperimentalStdlibApi::class) fun matchAt(input: CharSequence, index: Int): MatchResult? /** @@ -38,8 +38,8 @@ expect class Regex { * @throws IndexOutOfBoundsException if [index] is less than zero or greater than the length of the [input] char sequence. * @sample samples.text.Regexps.matchesAt */ - @SinceKotlin("1.5") - @ExperimentalStdlibApi + @SinceKotlin("1.7") + @WasExperimental(ExperimentalStdlibApi::class) fun matchesAt(input: CharSequence, index: Int): Boolean fun containsMatchIn(input: CharSequence): Boolean diff --git a/libraries/stdlib/js/src/kotlin/text/regex.kt b/libraries/stdlib/js/src/kotlin/text/regex.kt index 1506d74cd0b..ffb5280d807 100644 --- a/libraries/stdlib/js/src/kotlin/text/regex.kt +++ b/libraries/stdlib/js/src/kotlin/text/regex.kt @@ -102,8 +102,8 @@ public actual class Regex actual constructor(pattern: String, options: Set input.length) { throw IndexOutOfBoundsException("index out of bounds: $index, input length: ${input.length}") @@ -152,8 +152,8 @@ public actual class Regex actual constructor(pattern: String, options: Set input.length) { throw IndexOutOfBoundsException("index out of bounds: $index, input length: ${input.length}") diff --git a/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt b/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt index 84367f5a243..f92c98530ad 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt @@ -143,15 +143,15 @@ internal constructor(private val nativePattern: Pattern) : Serializable { */ public actual fun matchEntire(input: CharSequence): MatchResult? = nativePattern.matcher(input).matchEntire(input) - @SinceKotlin("1.5") - @ExperimentalStdlibApi + @SinceKotlin("1.7") + @WasExperimental(ExperimentalStdlibApi::class) public actual fun matchAt(input: CharSequence, index: Int): MatchResult? = nativePattern.matcher(input).useAnchoringBounds(false).useTransparentBounds(true).region(index, input.length).run { if (lookingAt()) MatcherMatchResult(this, input) else null } - @SinceKotlin("1.5") - @ExperimentalStdlibApi + @SinceKotlin("1.7") + @WasExperimental(ExperimentalStdlibApi::class) public actual fun matchesAt(input: CharSequence, index: Int): Boolean = nativePattern.matcher(input).useAnchoringBounds(false).useTransparentBounds(true).region(index, input.length).lookingAt() diff --git a/libraries/stdlib/native-wasm/src/kotlin/text/Regex.kt b/libraries/stdlib/native-wasm/src/kotlin/text/Regex.kt index a32ebd1ad2b..fe97a00d7da 100644 --- a/libraries/stdlib/native-wasm/src/kotlin/text/Regex.kt +++ b/libraries/stdlib/native-wasm/src/kotlin/text/Regex.kt @@ -168,8 +168,8 @@ public actual class Regex internal constructor(internal val nativePattern: Patte /** Indicates whether the regular expression can find at least one match in the specified [input]. */ actual fun containsMatchIn(input: CharSequence): Boolean = find(input) != null - @SinceKotlin("1.5") - @ExperimentalStdlibApi + @SinceKotlin("1.7") + @WasExperimental(ExperimentalStdlibApi::class) public actual fun matchesAt(input: CharSequence, index: Int): Boolean = // TODO: expand and simplify matchAt(input, index) != null @@ -221,8 +221,8 @@ public actual class Regex internal constructor(internal val nativePattern: Patte */ actual fun matchEntire(input: CharSequence): MatchResult?= doMatch(input, Mode.MATCH) - @SinceKotlin("1.5") - @ExperimentalStdlibApi + @SinceKotlin("1.7") + @WasExperimental(ExperimentalStdlibApi::class) public actual fun matchAt(input: CharSequence, index: Int): MatchResult? { if (index < 0 || index > input.length) { throw IndexOutOfBoundsException("index is out of bounds: $index, input length: ${input.length}")