beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 16:21:29 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibJS: Reword and reorder some steps of the Intl ResolveLocale AO

Browse source 
This is an editorial change in the ECMA-402 spec. See:
https://github.com/tc39/ecma402/commit/4c55823
This commit is contained in:
Timothy Flynn 2023-01-12 10:53:04 -05:00 committed by Linus Groh
parent 0ff4d8100f
commit 822e32eb11
Notes: sideshowbarker 2024-07-17 01:42:43 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/822e32eb11
Pull-request: https://github.com/SerenityOS/serenity/pull/16972
Reviewed-by: https://github.com/linusg ✅
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Userland/Libraries/LibJS/Runtime/Intl/AbstractOperations.cpp
View file

@ -489,32 +489,29 @@ ThrowCompletionOr<LocaleResult> resolve_locale(Vector<DeprecatedString> const& r
}
}
// iv. If keyLocaleData contains optionsValue, then
if (options_value.has_value() && key_locale_data.contains_slow(*options_value)) {
// 1. If SameValue(optionsValue, value) is false, then
if (options_value != value) {
// a. Let value be optionsValue.
value = move(options_value);
// iv. If SameValue(optionsValue, value) is false and keyLocaleData contains optionsValue, then
if (options_value.has_value() && (options_value != value) && key_locale_data.contains_slow(*options_value)) {
// 1. Let value be optionsValue.
value = move(options_value);
// b. Let supportedExtensionAddition be "".
supported_extension_addition.clear();
}
// 2. Let supportedExtensionAddition be "".
supported_extension_addition.clear();
}
// j. Set result.[[<key>]] to value.
find_key_in_value(result, key) = move(value);
// k. Append supportedExtensionAddition to supportedExtension.
// k. Set supportedExtension to the string-concatenation of supportedExtension and supportedExtensionAddition.
if (supported_extension_addition.has_value())
supported_extension.keywords.append(supported_extension_addition.release_value());
}
// 10. If the number of elements in supportedExtension is greater than 2, then
// 10. If supportedExtension is not "-u", then
if (!supported_extension.keywords.is_empty()) {
auto locale_id = ::Locale::parse_unicode_locale_id(found_locale);
VERIFY(locale_id.has_value());
// a. Let foundLocale be InsertUnicodeExtensionAndCanonicalize(foundLocale, supportedExtension).
// a. Set foundLocale to InsertUnicodeExtensionAndCanonicalize(foundLocale, supportedExtension).
found_locale = insert_unicode_extension_and_canonicalize(locale_id.release_value(), move(supported_extension));
}