RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:27:46 +00:00
Code Issues Activity Actions

LibJS: Set approximate number range format result's "source" to "shared"

Browse source 
This is a normative change in the Intl.NumberFormat v3 spec. See:
7510e7f
This commit is contained in:
Timothy Flynn 2023-01-12 08:03:13 -05:00 • committed by Linus Groh
parent 9b6fcd8591
commit d1881da2be
2 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibJS/Runtime/Intl/NumberFormat.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2022, Tim Flynn <trflynn89@serenityos.org>
* Copyright (c) 2021-2023, Tim Flynn <trflynn89@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -1744,9 +1744,20 @@ ThrowCompletionOr<Vector<PatternPartitionWithSource>> partition_number_range_pat
auto raw_end_result = partition_number_pattern(vm, number_format, move(end));
auto end_result = PatternPartitionWithSource::create_from_parent_list(move(raw_end_result));
// 5. If xResult is equal to yResult, return FormatApproximately(numberFormat, xResult).
if (start_result == end_result)
return format_approximately(number_format, move(start_result));
// 5. If xResult is equal to yResult, then
if (start_result == end_result) {
// a. Let appxResult be ? FormatApproximately(numberFormat, xResult).
auto approximate_result = format_approximately(number_format, move(start_result));
// b. For each r in appxResult, do
for (auto& result : approximate_result) {
// i. Set r.[[Source]] to "shared".
result.source = "shared"sv;
}
// c. Return appxResult.
return approximate_result;
}
// 6. For each r in xResult, do
for (auto& part : start_result) {

20
Userland/Libraries/LibJS/Tests/builtins/Intl/NumberFormat/NumberFormat.prototype.formatRangeToParts.js
View file

@ -56,8 +56,8 @@ describe("correct behavior", () => {
test("approximately formatting", () => {
const en1 = new Intl.NumberFormat("en", { maximumFractionDigits: 0 });
expect(en1.formatRangeToParts(2.9, 3.1)).toEqual([
{ type: "approximatelySign", value: "~", source: "" },
{ type: "integer", value: "3", source: "" },
{ type: "approximatelySign", value: "~", source: "shared" },
{ type: "integer", value: "3", source: "shared" },
]);
const en2 = new Intl.NumberFormat("en", {
@ -66,15 +66,15 @@ describe("correct behavior", () => {
maximumFractionDigits: 0,
});
expect(en2.formatRangeToParts(2.9, 3.1)).toEqual([
{ type: "approximatelySign", value: "~", source: "" },
{ type: "currency", value: "$", source: "" },
{ type: "integer", value: "3", source: "" },
{ type: "approximatelySign", value: "~", source: "shared" },
{ type: "currency", value: "$", source: "shared" },
{ type: "integer", value: "3", source: "shared" },
]);
const ja1 = new Intl.NumberFormat("ja", { maximumFractionDigits: 0 });
expect(ja1.formatRangeToParts(2.9, 3.1)).toEqual([
{ type: "approximatelySign", value: "約", source: "" },
{ type: "integer", value: "3", source: "" },
{ type: "approximatelySign", value: "約", source: "shared" },
{ type: "integer", value: "3", source: "shared" },
]);
const ja2 = new Intl.NumberFormat("ja", {
@ -83,9 +83,9 @@ describe("correct behavior", () => {
maximumFractionDigits: 0,
});
expect(ja2.formatRangeToParts(2.9, 3.1)).toEqual([
{ type: "approximatelySign", value: "約", source: "" },
{ type: "currency", value: "￥", source: "" },
{ type: "integer", value: "3", source: "" },
{ type: "approximatelySign", value: "約", source: "shared" },
{ type: "currency", value: "￥", source: "shared" },
{ type: "integer", value: "3", source: "shared" },
]);
});