Delegate to JVM implementations in parseOrNull where possible

dkhalanskyjb · dkhalanskyjb · commit 795e0df88460 · 2025-04-02T14:20:13.000+02:00
diff --git a/core/api/kotlinx-datetime.api b/core/api/kotlinx-datetime.api
@@ -320,6 +320,8 @@ public final class kotlinx/datetime/LocalDateJvmKt {
 	public static final fun daysUntil (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/LocalDate;)I
 	public static final fun minus (Lkotlinx/datetime/LocalDate;ILkotlinx/datetime/DateTimeUnit$DateBased;)Lkotlinx/datetime/LocalDate;
 	public static final fun monthsUntil (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/LocalDate;)I
+	public static final fun parseOrNull (Lkotlinx/datetime/LocalDate$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;)Lkotlinx/datetime/LocalDate;
+	public static synthetic fun parseOrNull$default (Lkotlinx/datetime/LocalDate$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;ILjava/lang/Object;)Lkotlinx/datetime/LocalDate;
 	public static final fun periodUntil (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/LocalDate;)Lkotlinx/datetime/DatePeriod;
 	public static final fun plus (Lkotlinx/datetime/LocalDate;ILkotlinx/datetime/DateTimeUnit$DateBased;)Lkotlinx/datetime/LocalDate;
 	public static final fun plus (Lkotlinx/datetime/LocalDate;JLkotlinx/datetime/DateTimeUnit$DateBased;)Lkotlinx/datetime/LocalDate;
@@ -342,8 +344,6 @@ public final class kotlinx/datetime/LocalDateKt {
 	public static final fun minus (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/DatePeriod;)Lkotlinx/datetime/LocalDate;
 	public static final fun minus (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/DateTimeUnit$DateBased;)Lkotlinx/datetime/LocalDate;
 	public static final fun minus (Lkotlinx/datetime/LocalDate;Lkotlinx/datetime/LocalDate;)Lkotlinx/datetime/DatePeriod;
-	public static final fun parseOrNull (Lkotlinx/datetime/LocalDate$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;)Lkotlinx/datetime/LocalDate;
-	public static synthetic fun parseOrNull$default (Lkotlinx/datetime/LocalDate$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;ILjava/lang/Object;)Lkotlinx/datetime/LocalDate;
 	public static final fun plus (Lkotlinx/datetime/LocalDate;ILkotlinx/datetime/DateTimeUnit$DateBased;)Lkotlinx/datetime/LocalDate;
 	public static final fun toLocalDate (Ljava/lang/String;)Lkotlinx/datetime/LocalDate;
 }
@@ -552,14 +552,14 @@ public final class kotlinx/datetime/UtcOffset$Formats {
 public final class kotlinx/datetime/UtcOffsetJvmKt {
 	public static final fun UtcOffset (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)Lkotlinx/datetime/UtcOffset;
 	public static synthetic fun UtcOffset$default (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Lkotlinx/datetime/UtcOffset;
+	public static final fun parseOrNull (Lkotlinx/datetime/UtcOffset$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;)Lkotlinx/datetime/UtcOffset;
+	public static synthetic fun parseOrNull$default (Lkotlinx/datetime/UtcOffset$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;ILjava/lang/Object;)Lkotlinx/datetime/UtcOffset;
 }
 
 public final class kotlinx/datetime/UtcOffsetKt {
 	public static final fun UtcOffset ()Lkotlinx/datetime/UtcOffset;
 	public static final fun asTimeZone (Lkotlinx/datetime/UtcOffset;)Lkotlinx/datetime/FixedOffsetTimeZone;
 	public static final fun format (Lkotlinx/datetime/UtcOffset;Lkotlinx/datetime/format/DateTimeFormat;)Ljava/lang/String;
-	public static final fun parseOrNull (Lkotlinx/datetime/UtcOffset$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;)Lkotlinx/datetime/UtcOffset;
-	public static synthetic fun parseOrNull$default (Lkotlinx/datetime/UtcOffset$Companion;Ljava/lang/CharSequence;Lkotlinx/datetime/format/DateTimeFormat;ILjava/lang/Object;)Lkotlinx/datetime/UtcOffset;
 }
 
 public final class kotlinx/datetime/format/AmPmMarker : java/lang/Enum {
diff --git a/core/common/src/LocalDate.kt b/core/common/src/LocalDate.kt
@@ -290,9 +290,9 @@ public expect class LocalDate : Comparable<LocalDate> {
  * @see LocalDate.parse for a version of this function that throws an exception on faulty input.
  * @sample kotlinx.datetime.test.samples.LocalDateSamples.parseOrNull
  */
-public fun LocalDate.Companion.parseOrNull(
+public expect fun LocalDate.Companion.parseOrNull(
     input: CharSequence, format: DateTimeFormat<LocalDate> = getIsoDateFormat()
-): LocalDate? = format.parseOrNull(input)
+): LocalDate?
 
 /**
  * @suppress
diff --git a/core/common/src/LocalDateTime.kt b/core/common/src/LocalDateTime.kt
@@ -410,9 +410,9 @@ public expect class LocalDateTime : Comparable<LocalDateTime> {
  * @see LocalDateTime.parse for a version of this function that throws an exception on faulty input.
  * @sample kotlinx.datetime.test.samples.LocalDateTimeSamples.parseOrNull
  */
-public fun LocalDateTime.Companion.parseOrNull(
+public expect fun LocalDateTime.Companion.parseOrNull(
     input: CharSequence, format: DateTimeFormat<LocalDateTime> = getIsoDateTimeFormat()
-): LocalDateTime? = format.parseOrNull(input)
+): LocalDateTime?
 
 /**
  * @suppress
diff --git a/core/common/src/LocalTime.kt b/core/common/src/LocalTime.kt
@@ -367,9 +367,9 @@ public expect class LocalTime : Comparable<LocalTime> {
  * @see LocalTime.parse for a version of this function that throws an exception on faulty input.
  * @sample kotlinx.datetime.test.samples.LocalTimeSamples.parseOrNull
  */
-public fun LocalTime.Companion.parseOrNull(
+public expect fun LocalTime.Companion.parseOrNull(
     input: CharSequence, format: DateTimeFormat<LocalTime> = getIsoTimeFormat()
-): LocalTime? = format.parseOrNull(input)
+): LocalTime?
 
 /**
  * Formats this value using the given [format].
diff --git a/core/common/src/UtcOffset.kt b/core/common/src/UtcOffset.kt
@@ -206,9 +206,9 @@ public expect class UtcOffset {
  * @see UtcOffset.parse for a version of this function that throws an exception on faulty input.
  * @sample kotlinx.datetime.test.samples.UtcOffsetSamples.parseOrNull
  */
-public fun UtcOffset.Companion.parseOrNull(
+public expect fun UtcOffset.Companion.parseOrNull(
     input: CharSequence, format: DateTimeFormat<UtcOffset> = getIsoUtcOffsetFormat()
-): UtcOffset? = format.parseOrNull(input)
+): UtcOffset?
 
 /**
  * Formats this value using the given [format].
diff --git a/core/commonKotlin/src/LocalDate.kt b/core/commonKotlin/src/LocalDate.kt
@@ -210,6 +210,10 @@ public actual class LocalDate actual constructor(public actual val year: Int, mo
     actual override fun toString(): String = format(Formats.ISO)
 }
 
+public actual fun LocalDate.Companion.parseOrNull(
+    input: CharSequence, format: DateTimeFormat<LocalDate>
+): LocalDate? = format.parseOrNull(input)
+
 @Deprecated("Use the plus overload with an explicit number of units", ReplaceWith("this.plus(1, unit)"))
 public actual fun LocalDate.plus(unit: DateTimeUnit.DateBased): LocalDate = plus(1, unit)
 
diff --git a/core/commonKotlin/src/LocalDateTime.kt b/core/commonKotlin/src/LocalDateTime.kt
@@ -84,6 +84,10 @@ public actual constructor(public actual val date: LocalDate, public actual val t
     }
 }
 
+public actual fun LocalDateTime.Companion.parseOrNull(
+    input: CharSequence, format: DateTimeFormat<LocalDateTime>
+): LocalDateTime? = format.parseOrNull(input)
+
 // org.threeten.bp.LocalDateTime#until
 internal fun LocalDateTime.until(other: LocalDateTime, unit: DateTimeUnit.DateBased): Long {
     var endDate: LocalDate = other.date
diff --git a/core/commonKotlin/src/LocalTime.kt b/core/commonKotlin/src/LocalTime.kt
@@ -136,6 +136,10 @@ public actual class LocalTime actual constructor(
 
 }
 
+public actual fun LocalTime.Companion.parseOrNull(
+    input: CharSequence, format: DateTimeFormat<LocalTime>
+): LocalTime? = format.parseOrNull(input)
+
 internal val ISO_TIME_OPTIONAL_SECONDS_TRAILING_ZEROS by lazy {
     LocalTimeFormat.build {
         hour()
diff --git a/core/commonKotlin/src/UtcOffset.kt b/core/commonKotlin/src/UtcOffset.kt
@@ -93,6 +93,10 @@ public actual class UtcOffset private constructor(public actual val totalSeconds
     }
 }
 
+public actual fun UtcOffset.Companion.parseOrNull(
+    input: CharSequence, format: DateTimeFormat<UtcOffset>
+): UtcOffset? = format.parseOrNull(input)
+
 @ThreadLocal
 private var utcOffsetCache: MutableMap<Int, UtcOffset> = mutableMapOf()
 
diff --git a/core/jvm/src/LocalDate.kt b/core/jvm/src/LocalDate.kt
@@ -5,6 +5,7 @@
 @file:JvmName("LocalDateJvmKt")
 package kotlinx.datetime
 
+import kotlinx.datetime.LocalDate.Formats
 import kotlinx.datetime.format.*
 import kotlinx.datetime.internal.safeAdd
 import kotlinx.datetime.internal.safeMultiply
@@ -106,6 +107,21 @@ public actual class LocalDate internal constructor(
     private fun writeReplace(): Any = Ser(Ser.DATE_TAG, this)
 }
 
+public actual fun LocalDate.Companion.parseOrNull(
+    input: CharSequence, format: DateTimeFormat<LocalDate>
+): LocalDate? =
+    if (format === Formats.ISO) {
+        try {
+            val sanitizedInput = removeLeadingZerosFromLongYearFormLocalDate(input.toString())
+            jtLocalDate.parse(sanitizedInput).let(::LocalDate)
+        } catch (_: DateTimeParseException) {
+            null
+        }
+    } else {
+        format.parseOrNull(input)
+    }
+
+
 /**
  * @suppress
  */
diff --git a/core/jvm/src/LocalDateTimeJvm.kt b/core/jvm/src/LocalDateTimeJvm.kt
@@ -6,6 +6,7 @@
 @file:JvmMultifileClass
 package kotlinx.datetime
 
+import kotlinx.datetime.LocalDateTime.Formats
 import kotlinx.datetime.format.*
 import kotlinx.datetime.internal.removeLeadingZerosFromLongYearFormLocalDateTime
 import kotlinx.datetime.serializers.LocalDateTimeIso8601Serializer
@@ -115,6 +116,20 @@ public actual class LocalDateTime internal constructor(
     private fun writeReplace(): Any = Ser(Ser.DATE_TIME_TAG, this)
 }
 
+public actual fun LocalDateTime.Companion.parseOrNull(
+    input: CharSequence, format: DateTimeFormat<LocalDateTime>
+): LocalDateTime? =
+    if (format === Formats.ISO) {
+        try {
+            val sanitizedInput = removeLeadingZerosFromLongYearFormLocalDateTime(input.toString())
+            jtLocalDateTime.parse(sanitizedInput).let(::LocalDateTime)
+        } catch (_: DateTimeParseException) {
+            null
+        }
+    } else {
+        format.parseOrNull(input)
+    }
+
 /**
  * @suppress
  */
diff --git a/core/jvm/src/LocalTimeJvm.kt b/core/jvm/src/LocalTimeJvm.kt
@@ -7,6 +7,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.LocalTime.Formats
 import kotlinx.datetime.format.*
 import kotlinx.datetime.internal.*
 import kotlinx.datetime.serializers.LocalTimeIso8601Serializer
@@ -95,6 +96,18 @@ public actual class LocalTime internal constructor(
     private fun writeReplace(): Any = Ser(Ser.TIME_TAG, this)
 }
 
+public actual fun LocalTime.Companion.parseOrNull(input: CharSequence, format: DateTimeFormat<LocalTime>): LocalTime? =
+    if (format === Formats.ISO) {
+        try {
+            jtLocalTime.parse(input).let(::LocalTime)
+        } catch (_: DateTimeParseException) {
+            null
+        }
+    } else {
+        format.parseOrNull(input)
+    }
+
+
 @Deprecated(
     "Use kotlinx.datetime.Month",
     ReplaceWith("atDate(year, month.toKotlinMonth(), dayOfMonth)")
diff --git a/core/jvm/src/UtcOffsetJvm.kt b/core/jvm/src/UtcOffsetJvm.kt
@@ -5,6 +5,7 @@
 
 package kotlinx.datetime
 
+import kotlinx.datetime.UtcOffset.Formats
 import kotlinx.datetime.format.*
 import kotlinx.datetime.serializers.UtcOffsetSerializer
 import kotlinx.serialization.Serializable
@@ -66,6 +67,15 @@ public actual fun UtcOffset(hours: Int? = null, minutes: Int? = null, seconds: I
         throw IllegalArgumentException(e)
     }
 
+public actual fun UtcOffset.Companion.parseOrNull(
+    input: CharSequence, format: DateTimeFormat<UtcOffset>
+): UtcOffset? = when {
+    format === Formats.ISO -> parseWithFormatOrNull(input, isoFormat)
+    format === Formats.ISO_BASIC -> parseWithFormatOrNull(input, isoBasicFormat)
+    format === Formats.FOUR_DIGITS -> parseWithFormatOrNull(input, fourDigitsFormat)
+    else -> format.parseOrNull(input)
+}
+
 private val isoFormat by lazy {
     DateTimeFormatterBuilder().parseCaseInsensitive().appendOffsetId().toFormatter()
 }
@@ -81,3 +91,9 @@ private fun parseWithFormat(input: CharSequence, format: DateTimeFormatter) = tr
 } catch (e: DateTimeException) {
     throw DateTimeFormatException(e)
 }
+
+private fun parseWithFormatOrNull(input: CharSequence, format: DateTimeFormatter) = try {
+    format.parse(input, ZoneOffset::from).let(::UtcOffset)
+} catch (_: DateTimeException) {
+    null
+}

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,10 @@ public actual class LocalDate actual constructor(public actual val year: Int, mo`
`210`	`210`	`actual override fun toString(): String = format(Formats.ISO)`
`211`	`211`	`}`
`212`	`212`
	`213`	`+public actual fun LocalDate.Companion.parseOrNull(`
	`214`	`+ input: CharSequence, format: DateTimeFormat<LocalDate>`
	`215`	`+): LocalDate? = format.parseOrNull(input)`
	`216`	`+`
`213`	`217`	`@Deprecated("Use the plus overload with an explicit number of units", ReplaceWith("this.plus(1, unit)"))`
`214`	`218`	`public actual fun LocalDate.plus(unit: DateTimeUnit.DateBased): LocalDate = plus(1, unit)`
`215`	`219`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,10 @@ public actual constructor(public actual val date: LocalDate, public actual val t`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
	`87`	`+public actual fun LocalDateTime.Companion.parseOrNull(`
	`88`	`+ input: CharSequence, format: DateTimeFormat<LocalDateTime>`
	`89`	`+): LocalDateTime? = format.parseOrNull(input)`
	`90`	`+`
`87`	`91`	`// org.threeten.bp.LocalDateTime#until`
`88`	`92`	`internal fun LocalDateTime.until(other: LocalDateTime, unit: DateTimeUnit.DateBased): Long {`
`89`	`93`	`var endDate: LocalDate = other.date`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,10 @@ public actual class LocalTime actual constructor(`
`136`	`136`
`137`	`137`	`}`
`138`	`138`
	`139`	`+public actual fun LocalTime.Companion.parseOrNull(`
	`140`	`+ input: CharSequence, format: DateTimeFormat<LocalTime>`
	`141`	`+): LocalTime? = format.parseOrNull(input)`
	`142`	`+`
`139`	`143`	`internal val ISO_TIME_OPTIONAL_SECONDS_TRAILING_ZEROS by lazy {`
`140`	`144`	`LocalTimeFormat.build {`
`141`	`145`	`hour()`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,10 @@ public actual class UtcOffset private constructor(public actual val totalSeconds`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
	`96`	`+public actual fun UtcOffset.Companion.parseOrNull(`
	`97`	`+ input: CharSequence, format: DateTimeFormat<UtcOffset>`
	`98`	`+): UtcOffset? = format.parseOrNull(input)`
	`99`	`+`
`96`	`100`	`@ThreadLocal`
`97`	`101`	`private var utcOffsetCache: MutableMap<Int, UtcOffset> = mutableMapOf()`
`98`	`102`