parse merge fix

AndreiKingsley · AndreiKingsley · commit cf14aa543a75 · 2025-04-29T16:03:51.000+04:00
diff --git a/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt b/core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/parse.kt
@@ -214,7 +214,7 @@ internal object Parsers : GlobalParserOptions {
                 .parseOrNull(this)
                 ?.toInstantUsingOffset()
         }
-            // fallback on the java instant to catch things like "2022-01-23T04:29:60", a.k.a. leap seconds
+        // fallback on the java instant to catch things like "2022-01-23T04:29:60", a.k.a. leap seconds
             ?: toJavaInstantOrNull()?.toKotlinInstant()
 
     private fun String.toJavaInstantOrNull(): JavaInstant? =

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ internal object Parsers : GlobalParserOptions {`
`214`	`214`	`.parseOrNull(this)`
`215`	`215`	`?.toInstantUsingOffset()`
`216`	`216`	`}`
`217`		`- // fallback on the java instant to catch things like "2022-01-23T04:29:60", a.k.a. leap seconds`
	`217`	`+ // fallback on the java instant to catch things like "2022-01-23T04:29:60", a.k.a. leap seconds`
`218`	`218`	`?: toJavaInstantOrNull()?.toKotlinInstant()`
`219`	`219`
`220`	`220`	`private fun String.toJavaInstantOrNull(): JavaInstant? =`