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

LibJS: Convert resolve_best_locale to ThrowCompletionOr

Browse source
This commit is contained in:
Idan Horowitz 2021-10-23 03:00:26 +03:00 • committed by Andreas Kling
parent 28e1e03234
commit 70a35f9600
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibJS/Runtime/StringPrototype.cpp
View file

@ -340,12 +340,12 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(StringPrototype::index_of)
return index.has_value() ? Value(*index) : Value(-1); return index.has_value() ? Value(*index) : Value(-1);
} }
static Optional<String> resolve_best_locale(GlobalObject& global_object, Value locales) static ThrowCompletionOr<String> resolve_best_locale(GlobalObject& global_object, Value locales)
{ {
// For details on these steps, see https://tc39.es/ecma402/#sup-string.prototype.tolocalelowercase // For details on these steps, see https://tc39.es/ecma402/#sup-string.prototype.tolocalelowercase
// 3. Let requestedLocales be ? CanonicalizeLocaleList(locales). // 3. Let requestedLocales be ? CanonicalizeLocaleList(locales).
auto requested_locales = TRY_OR_DISCARD(Intl::canonicalize_locale_list(global_object, locales)); auto requested_locales = TRY(Intl::canonicalize_locale_list(global_object, locales));
Optional<Unicode::LocaleID> requested_locale; Optional<Unicode::LocaleID> requested_locale;
@ -383,11 +383,9 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(StringPrototype::to_locale_lowercase)
if (!string.has_value()) if (!string.has_value())
return {}; return {};
auto locale = resolve_best_locale(global_object, vm.argument(0)); auto locale = TRY_OR_DISCARD(resolve_best_locale(global_object, vm.argument(0)));
if (!locale.has_value())
return {};
auto lowercase = Unicode::to_unicode_lowercase_full(*string, *locale); auto lowercase = Unicode::to_unicode_lowercase_full(*string, locale);
return js_string(vm, move(lowercase)); return js_string(vm, move(lowercase));
} }
@ -398,11 +396,9 @@ JS_DEFINE_OLD_NATIVE_FUNCTION(StringPrototype::to_locale_uppercase)
if (!string.has_value()) if (!string.has_value())
return {}; return {};
auto locale = resolve_best_locale(global_object, vm.argument(0)); auto locale = TRY_OR_DISCARD(resolve_best_locale(global_object, vm.argument(0)));
if (!locale.has_value())
return {};
auto uppercase = Unicode::to_unicode_uppercase_full(*string, *locale); auto uppercase = Unicode::to_unicode_uppercase_full(*string, locale);
return js_string(vm, move(uppercase)); return js_string(vm, move(uppercase));
} }