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

Small durations are formatted with sub-second units KT-42851

Browse Source
This commit is contained in:
Ilya Gorbunov
2021-06-29 04:40:18 +03:00
committed by Space
parent 150ce812f1
commit ae3d9cc3cd
3 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/samples/test/samples/time/durations.kt
+1 -1
View File
@@ -30,7 +30,7 @@ class Durations {
assertPrints(Duration.minutes(1230), "20h 30m") assertPrints(Duration.minutes(1230), "20h 30m")
assertPrints(Duration.minutes(920), "15h 20m") assertPrints(Duration.minutes(920), "15h 20m")
assertPrints(Duration.seconds(1.546), "1.546s") assertPrints(Duration.seconds(1.546), "1.546s")
assertPrints(Duration.milliseconds(25.12), "0.025120s") assertPrints(Duration.milliseconds(25.12), "25.120ms")
} }
@Sample @Sample
libraries/stdlib/src/kotlin/time/Duration.kt
+22 -28
View File
@@ -692,19 +692,16 @@ public value class Duration internal constructor(private val rawValue: Long) : C
} }
if (hasSeconds) { if (hasSeconds) {
if (length > 1) append(' ') if (length > 1) append(' ')
append(seconds) when {
if (nanoseconds != 0) { seconds != 0 || hasDays || hasHours || hasMinutes ->
append('.') appendFractional(seconds, nanoseconds, "s")
when { nanoseconds >= 1_000_000 ->
(nanoseconds % 1_000_000 == 0) -> appendFractional(nanoseconds / 1_000_000, nanoseconds % 1_000_000 * 1_000, "ms")
append((nanoseconds / 1_000_000).toString().padStart(3, '0')) nanoseconds >= 1_000 ->
(nanoseconds % 1_000 == 0) -> appendFractional(nanoseconds / 1_000, nanoseconds % 1_000 * 1_000_000, "us")
append((nanoseconds / 1_000).toString().padStart(6, '0')) else ->
else -> append(nanoseconds).append("ns")
append(nanoseconds.toString().padStart(9, '0'))
}
} }
append('s')
} }
} }
} }
@@ -712,11 +709,18 @@ public value class Duration internal constructor(private val rawValue: Long) : C
} }
} }
private fun precision(value: Double): Int = when { private fun StringBuilder.appendFractional(whole: Int, nanoFractional: Int, unit: String) {
value < 1 -> 3 append(whole)
value < 10 -> 2 if (nanoFractional != 0) {
value < 100 -> 1 append('.')
else -> 0 val nanoString = nanoFractional.toString().padStart(9, '0')
when {
nanoFractional % 1_000_000 == 0 -> appendRange(nanoString, 0, 3)
nanoFractional % 1_000 == 0 -> appendRange(nanoString, 0, 6)
else -> append(nanoString)
}
}
append(unit)
} }
/** /**
@@ -771,17 +775,7 @@ public value class Duration internal constructor(private val rawValue: Long) : C
append(minutes).append('M') append(minutes).append('M')
} }
if (hasSeconds || (!hasHours && !hasMinutes)) { if (hasSeconds || (!hasHours && !hasMinutes)) {
append(seconds) appendFractional(seconds, nanoseconds, "S")
if (nanoseconds != 0) {
append('.')
val nss = nanoseconds.toString().padStart(9, '0')
when {
nanoseconds % 1_000_000 == 0 -> appendRange(nss, 0, 3)
nanoseconds % 1_000 == 0 -> appendRange(nss, 0, 6)
else -> append(nss)
}
}
append('S')
} }
} }
} }
libraries/stdlib/test/time/DurationTest.kt
+16 -16
View File
@@ -568,26 +568,26 @@ class DurationTest {
test(Duration.seconds(1.3), "1.300s") test(Duration.seconds(1.3), "1.300s")
test(Duration.seconds(1), "1s") test(Duration.seconds(1), "1s")
test(Duration.seconds(0.5), "0.500s") test(Duration.seconds(0.5), "500ms")
test(Duration.milliseconds(40.2), "0.040200s") test(Duration.milliseconds(40.2), "40.200ms")
test(Duration.milliseconds(4.225), "0.004225s") test(Duration.milliseconds(4.225), "4.225ms")
test(Duration.milliseconds(4.245), "0.004245s") test(Duration.milliseconds(4.24501), "4.245010ms")
test(Duration.milliseconds(1), "0.001s") test(Duration.milliseconds(1), "1ms")
test(Duration.milliseconds(0.75), "0.000750s") test(Duration.milliseconds(0.75), "750us")
test(Duration.microseconds(75.35), "0.000075350s") test(Duration.microseconds(75.35), "75.350us")
test(Duration.microseconds(7.25), "0.000007250s") test(Duration.microseconds(7.25), "7.250us")
test(Duration.microseconds(1.035), "0.000001035s") test(Duration.microseconds(1.035), "1.035us")
test(Duration.microseconds(1.005), "0.000001005s") test(Duration.microseconds(1.005), "1.005us")
test(Duration.nanoseconds(950.5), "0.000000951s") test(Duration.nanoseconds(950.5), "951ns")
test(Duration.nanoseconds(85.23), "0.000000085s") test(Duration.nanoseconds(85.23), "85ns")
test(Duration.nanoseconds(8.235), "0.000000008s") test(Duration.nanoseconds(8.235), "8ns")
test(Duration.nanoseconds(1.3), "0.000000001s") test(Duration.nanoseconds(1.3), "1ns")
test(Duration.nanoseconds(0.75), "1ns")
test(Duration.nanoseconds(0.7512), "1ns")
// equal to zero // equal to zero
// test(Duration.nanoseconds(0.75), "0.75ns")
// test(Duration.nanoseconds(0.7512), "0.7512ns")
// test(Duration.nanoseconds(0.023), "0.023ns") // test(Duration.nanoseconds(0.023), "0.023ns")
// test(Duration.nanoseconds(0.0034), "0.0034ns") // test(Duration.nanoseconds(0.0034), "0.0034ns")
// test(Duration.nanoseconds(0.0000035), "0.0000035ns") // test(Duration.nanoseconds(0.0000035), "0.0000035ns")