mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-21 17:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibJS: Simplify condition in GetDateTimeFormat

Browse source 
This is an editorial change in the Temporal proposal. See:
23c74b6
This commit is contained in:
Timothy Flynn 2024-12-06 09:00:21 -05:00 • committed by Tim Flynn
parent 6b8acc0af5
commit 7104d724ee
Notes: github-actions[bot] 2024-12-06 16:14:05 +00:00
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Libraries/LibJS/Runtime/Intl/DateTimeFormat.cpp
View file

@ -371,15 +371,15 @@ Optional<Unicode::CalendarPattern> get_date_time_format(Unicode::CalendarPattern
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
// 17. If anyPresent is true and needDefaults is true, return null. // 17. If needDefaults is true, then
if (any_present && need_defaults) {
// FIXME: Spec issue: We can hit this when setting `bestFormat`, which should never be null. Don't return for now.
// https://github.com/tc39/proposal-temporal/issues/3049
}
// 18. If needDefaults is true, then
if (need_defaults) { if (need_defaults) {
// a. For each property name prop of defaultOptions, do // a. If anyPresent is true, return null.
if (any_present) {
// FIXME: Spec issue: We can hit this when setting `bestFormat`, which should never be null. Don't return for now.
// https://github.com/tc39/proposal-temporal/issues/3049
}
// b. For each property name prop of defaultOptions, do
options.for_each_calendar_field_zipped_with(format_options, default_options, [&](auto const&, auto& format_option) { options.for_each_calendar_field_zipped_with(format_options, default_options, [&](auto const&, auto& format_option) {
using ValueType = typename RemoveCVReference<decltype(format_option)>::ValueType; using ValueType = typename RemoveCVReference<decltype(format_option)>::ValueType;
@ -391,18 +391,18 @@ Optional<Unicode::CalendarPattern> get_date_time_format(Unicode::CalendarPattern
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
// b. If defaults is ZONED-DATE-TIME, then // c. If defaults is ZONED-DATE-TIME, then
if (defaults == OptionDefaults::ZonedDateTime) { if (defaults == OptionDefaults::ZonedDateTime) {
// i. Set formatOptions.[[timeZoneName]] to "short". // i. Set formatOptions.[[timeZoneName]] to "short".
format_options.time_zone_name = Unicode::CalendarPatternStyle::Short; format_options.time_zone_name = Unicode::CalendarPatternStyle::Short;
} }
} }
// 19. If matcher is "basic", then // 18. If matcher is "basic", then
// a. Let bestFormat be BasicFormatMatcher(formatOptions, formats). // a. Let bestFormat be BasicFormatMatcher(formatOptions, formats).
// 20. Else, // 19. Else,
// a. Let bestFormat be BestFitFormatMatcher(formatOptions, formats). // a. Let bestFormat be BestFitFormatMatcher(formatOptions, formats).
// 21. Return bestFormat. // 20. Return bestFormat.
return format_options; return format_options;
} }