59c03fef01
The spec specifies that search and standard can not be valid values for the collation extension keyword. Instead users are expected to use the options bag to set the correct usage options. But, ICU expects the usage option to be set through the collation extension value. In this patch, we set the usage option using the collation extension value in ICU. For resolvedOptions, we filter out this extension value using ICU to be spec compatible. Previously, we stored the usage option on the JSCollator instance. But this patch changes the logic to just look it up from the icu::Collator when required. This saves one word of memory. This fails a test262 that was incorrectly fixed. A follow on patch will fix the test262 test. Bug: v8:5751 Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng Change-Id: I8c66c6286287e686f4cd152fa1301f9d51c38654 Reviewed-on: https://chromium-review.googlesource.com/1180488 Reviewed-by: Adam Klein <adamk@chromium.org> Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org> Cr-Commit-Position: refs/heads/master@{#55437}
122 lines
5.0 KiB
JavaScript
122 lines
5.0 KiB
JavaScript
// Copyright 2016 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
// No locale
|
|
var collatorWithOptions = new Intl.Collator(undefined);
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag(%GetDefaultICULocale(), locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator(undefined, {usage: 'sort'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag(%GetDefaultICULocale(), locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator(undefined, {usage: 'search'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertEquals('search', usage);
|
|
assertEquals('default', collation);
|
|
assertLanguageTag(%GetDefaultICULocale(), locale);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator(locale);
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag(%GetDefaultICULocale(), locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
// With Locale
|
|
collatorWithOptions = new Intl.Collator('en-US');
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator('en-US', {usage: 'sort'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator('en-US', {usage: 'search'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertEquals('search', usage);
|
|
assertEquals('default', collation);
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
// With invalid collation value = 'search'
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-search');
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-search', {usage: 'sort'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-search', {usage: 'search'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('search', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
// With invalid collation value = 'standard'
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-standard');
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-standard', {usage: 'sort'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-standard', {usage: 'search'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('search', usage);
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
// With valid collation value = 'emoji'
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-emoji');
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('emoji', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-emoji', {usage: 'sort'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('sort', usage);
|
|
assertEquals('emoji', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|
|
|
|
collatorWithOptions = new Intl.Collator('en-US-u-co-emoji', {usage: 'search'});
|
|
var { locale, usage, collation } = collatorWithOptions.resolvedOptions();
|
|
assertLanguageTag('en-US', locale);
|
|
assertEquals('search', usage);
|
|
// usage = search overwrites emoji as a collation value.
|
|
assertEquals('default', collation);
|
|
assertEquals(locale.indexOf('-co-search'), -1);
|