azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use days component in the default duration format KT-42851

Browse Source
This commit is contained in:
Ilya Gorbunov
2021-06-29 03:59:32 +03:00
committed by Space
parent 255c4b405e
commit 150ce812f1
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/time/Duration.kt
+12 -5
View File
@@ -670,15 +670,22 @@ public value class Duration internal constructor(private val rawValue: Long) : C
buildString {
if (isNegative()) append('-')
absoluteValue.run {
toComponents { _, minutes, seconds, nanoseconds ->
val hours = inWholeHours
val hasHours = hours != 0L
toComponents { _, hours, minutes, seconds, nanoseconds ->
val days = inWholeDays
val hasDays = days != 0L
val hasHours = hours != 0
val hasMinutes = minutes != 0
val hasSeconds = seconds != 0 || nanoseconds != 0
if (hasHours) {
if (hasDays) {
append(days)
append('d')
}
if (hasHours || (hasDays && (hasMinutes || hasSeconds))) {
if (length > 1) append(' ')
append(hours)
append('h')
}
if (minutes != 0 || (hasSeconds && hasHours)) {
if (hasMinutes || (hasSeconds && (hasHours || hasDays))) {
if (length > 1) append(' ')
append(minutes)
append('m')