Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1919 Small double values are set to zero in %L translation #1927

Merged
merged 3 commits into from
Jun 7, 2024
Merged

Fix #1919 Small double values are set to zero in %L translation #1927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5090e22
fix #1919 Small double values are set to zero in %L translation
DanielGronau Jun 5, 2024
2277429
changelog, spotless
DanielGronau Jun 6, 2024
bb6a81f
Merge remote-tracking branch 'origin/main'
DanielGronau Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Change Log
## Unreleased

* **Fix**: Don't expand typealiases of function types to `LambdaTypeName`s in `KSTypeReference.toTypeName()`.
* **Fix**: Small double and float values were set to 0.0 in %L translation (#1919)
* **Enhancement**: Make enum entry references in `KSAnnotation.toAnnotationSpec()` and `KSClassDeclaration.toClassName()` more robust.
* Migrate `kotlinpoet-metadata` to stable `org.jetbrains.kotlin:kotlin-metadata-jvm` artifact for Metadata parsing.
* Promote `kotlinpoet-metadata` out of preview to stable.
Expand Down
7 changes: 6 additions & 1 deletion kotlinpoet/src/commonMain/kotlin/com/squareup/kotlinpoet/CodeBlock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
import javax.lang.model.element.Element
import javax.lang.model.type.TypeMirror
import kotlin.math.max
import kotlin.reflect.KClass

/**
Expand Down Expand Up @@ -374,7 +375,11 @@ public class CodeBlock private constructor(
minusSign = '-'
}

val precision = if (o is Float || o is Double) o.toString().split(".").last().length else 0
val precision = when (o) {
is Float -> max(o.toBigDecimal().stripTrailingZeros().scale(), 1)
is Double -> max(o.toBigDecimal().stripTrailingZeros().scale(), 1)
else -> 0
}

val pattern = when (o) {
is Float, is Double -> "###,##0.0" + "#".repeat(precision - 1)
Expand Down
37 changes: 37 additions & 0 deletions kotlinpoet/src/commonTest/kotlin/com/squareup/kotlinpoet/CodeBlockTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,43 @@ class CodeBlockTest {
assertThat(a.toString()).isEqualTo("delicious taco")
}

@Test fun doublePrecision() {
val doubles = listOf(
12345678900000.0 to "12_345_678_900_000.0",
12345678900000.07 to "12_345_678_900_000.07",
123456.0 to "123_456.0",
1234.5678 to "1_234.5678",
12.345678 to "12.345678",
0.12345678 to "0.12345678",
0.0001 to "0.0001",
0.00001 to "0.00001",
0.000001 to "0.000001",
0.0000001 to "0.0000001",
)
for ((d, expected) in doubles) {
val a = CodeBlock.of("number %L", d)
assertThat(a.toString()).isEqualTo("number $expected")
}
}

@Test fun floatPrecision() {
val floats = listOf(
12345678.0f to "12_345_678.0",
123456.0f to "123_456.0",
1234.567f to "1_234.567",
12.34567f to "12.34567",
0.1234567f to "0.1234567",
0.0001f to "0.0001",
0.00001f to "0.00001",
0.000001f to "0.000001",
0.0000001f to "0.0000001",
)
for ((f, expected) in floats) {
val a = CodeBlock.of("number %L", f)
assertThat(a.toString()).isEqualTo("number $expected")
}
}

@Test fun percentEscapeCannotBeIndexed() {
assertThrows<IllegalArgumentException> {
CodeBlock.builder().add("%1%", "taco").build()
Expand Down