fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2026-01-06 16:45:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibJS: Differentiate between undefined and null locale keys

Browse Source 
We were previously treating undefined and null as the same (an empty
Optional). However, there are edge cases in ECMA-402 where we must treat
them differently. Namely, the hour cycle (hc) keyword. An undefined hc
value has no effect on the resolved locale, whereas a null hc value can
actively override any hc specified in the locale string. For example:

    new Intl.DateTimeFormat("en-u-hc-h11", { hour12: false });

In that object, the hour12 option does not match the u-hc-h11 value. So
the spec dictates we remove the hc value by setting it to null.
This commit is contained in:
Timothy Flynn
2024-06-16 15:36:34 -04:00
committed by Andreas Kling
parent 1039acca8c
commit 4598a505b1
7 changed files with 100 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Userland/Libraries/LibJS/Runtime/Intl/CollatorConstructor.cpp
View File

@@ -62,16 +62,19 @@ static ThrowCompletionOr<NonnullGCPtr<Collator>> initialize_collator(VM& vm, Col
auto numeric = TRY(get_option(vm, *options, vm.names.numeric, OptionType::Boolean, {}, Empty {}));
// 14. If numeric is not undefined, then
// a. Let numeric be ! ToString(numeric).
if (!numeric.is_undefined()) {
// a. Let numeric be ! ToString(numeric).
numeric = PrimitiveString::create(vm, MUST(numeric.to_string(vm)));
}
// 15. Set opt.[[kn]] to numeric.
if (!numeric.is_undefined())
opt.kn = MUST(numeric.to_string(vm));
opt.kn = locale_key_from_value(numeric);
// 16. Let caseFirst be ? GetOption(options, "caseFirst", string, « "upper", "lower", "false" », undefined).
// 17. Set opt.[[kf]] to caseFirst.
auto case_first = TRY(get_option(vm, *options, vm.names.caseFirst, OptionType::String, { "upper"sv, "lower"sv, "false"sv }, Empty {}));
if (!case_first.is_undefined())
opt.kf = case_first.as_string().utf8_string();
// 17. Set opt.[[kf]] to caseFirst.
opt.kf = locale_key_from_value(case_first);
// 18. Let relevantExtensionKeys be %Collator%.[[RelevantExtensionKeys]].
auto relevant_extension_keys = Collator::relevant_extension_keys();
@@ -83,20 +86,26 @@ static ThrowCompletionOr<NonnullGCPtr<Collator>> initialize_collator(VM& vm, Col
collator.set_locale(move(result.locale));
// 21. Let collation be r.[[co]].
auto& collation_value = result.co;
// 22. If collation is null, let collation be "default".
if (collation_value.has<Empty>())
collation_value = "default"_string;
// 23. Set collator.[[Collation]] to collation.
collator.set_collation(result.co.has_value() ? result.co.release_value() : "default"_string);
collator.set_collation(move(collation_value.get<String>()));
// 24. If relevantExtensionKeys contains "kn", then
if (relevant_extension_keys.span().contains_slow("kn"sv) && result.kn.has_value()) {
if (relevant_extension_keys.span().contains_slow("kn"sv)) {
// a. Set collator.[[Numeric]] to SameValue(r.[[kn]], "true").
collator.set_numeric(same_value(PrimitiveString::create(vm, result.kn.release_value()), PrimitiveString::create(vm, "true"_string)));
collator.set_numeric(result.kn == "true"_string);
}
// 25. If relevantExtensionKeys contains "kf", then
if (relevant_extension_keys.span().contains_slow("kf"sv) && result.kf.has_value()) {
if (relevant_extension_keys.span().contains_slow("kf"sv)) {
// a. Set collator.[[CaseFirst]] to r.[[kf]].
collator.set_case_first(result.kf.release_value());
if (auto* resolved_case_first = result.kf.get_pointer<String>())
collator.set_case_first(*resolved_case_first);
}
// 26. Let sensitivity be ? GetOption(options, "sensitivity", string, « "base", "accent", "case", "variant" », undefined).