Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/Fable.Cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

### Changed

* [JS/TS] Add regression tests for `N0`, `C0`, `P0` format specifiers producing no trailing dot (fixes #2582)

### Fixed

* [JS/TS] Fix `N` format specifier (`ToString("N0")`, `String.Format("{0:N0}", ...)`) producing a trailing dot when precision is 0 (fix #2582) (by @MangelMaxime)
Expand Down
4 changes: 4 additions & 0 deletions src/Fable.Compiler/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

### Changed

* [JS/TS] Add regression tests for `N0`, `C0`, `P0` format specifiers producing no trailing dot (fixes #2582)

### Fixed

* [JS/TS] Fix `N` format specifier (`ToString("N0")`, `String.Format("{0:N0}", ...)`) producing a trailing dot when precision is 0 (fix #2582) (by @MangelMaxime)
Expand Down
19 changes: 19 additions & 0 deletions tests/Js/Main/ConvertTests.fs
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,11 @@ let tests =

(235672367).ToString("C2", CultureInfo.InvariantCulture) |> equal "¤235,672,367.00"

// C0 should produce no trailing dot
(255).ToString("C0", CultureInfo.InvariantCulture) |> equal "¤255"
(-255).ToString("C0", CultureInfo.InvariantCulture) |> equal "(¤255)"
(235672367).ToString("C0", CultureInfo.InvariantCulture) |> equal "¤235,672,367"

testCase "uint32.ToString 'C' works" <| fun () ->
(255u).ToString("C2", CultureInfo.InvariantCulture) |> equal "¤255.00"
(255u).ToString("C15", CultureInfo.InvariantCulture) |> equal "¤255.000000000000000"
Expand Down Expand Up @@ -943,6 +948,11 @@ let tests =

(235672367).ToString("N2", CultureInfo.InvariantCulture) |> equal "235,672,367.00"

// See #2582 - N0 should produce no trailing dot
(255).ToString("N0", CultureInfo.InvariantCulture) |> equal "255"
(-255).ToString("N0", CultureInfo.InvariantCulture) |> equal "-255"
(1000000).ToString("N0", CultureInfo.InvariantCulture) |> equal "1,000,000"

testCase "uint32.ToString 'N' works"
<| fun () ->
(255u).ToString("N2", CultureInfo.InvariantCulture) |> equal "255.00"
Expand Down Expand Up @@ -977,6 +987,10 @@ let tests =

(-255.2357).ToString("N", CultureInfo.InvariantCulture) |> equal "-255.24"

// See #2582 - N0 should produce no trailing dot
(255.7).ToString("N0", CultureInfo.InvariantCulture) |> equal "256"
(-255.7).ToString("N0", CultureInfo.InvariantCulture) |> equal "-256"

testCase "float32.ToString 'N' works"
<| fun () ->
(255.2357f).ToString("N2", CultureInfo.InvariantCulture) |> equal "255.24"
Expand Down Expand Up @@ -1033,6 +1047,11 @@ let tests =
(1).ToString("P2", CultureInfo.InvariantCulture) |> equal "100.00 %"
(0.34).ToString("P2", CultureInfo.InvariantCulture) |> equal "34.00 %"

// P0 should produce no trailing dot
(1).ToString("P0", CultureInfo.InvariantCulture) |> equal "100 %"
(-1).ToString("P0", CultureInfo.InvariantCulture) |> equal "-100 %"
(0.5).ToString("P0", CultureInfo.InvariantCulture) |> equal "50 %"

testCase "uint32.ToString 'P' works"
<| fun () ->
(255u).ToString("P2", CultureInfo.InvariantCulture) |> equal "25,500.00 %"
Expand Down