Changeset 263833 in webkit

Timestamp:

Jul 1, 2020, 11:00:36 PM (6 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Intl.Collator should set usage:"search" option through ICU locale
​https://bugs.webkit.org/show_bug.cgi?id=213869

Reviewed by Ross Kirsling.

JSTests:

• stress/intl-collator-co-extension.js: Added.

(shouldBe):
(shouldBeArray):
(explicitTrueBeforeICU67):

• test262/expectations.yaml:

Source/JavaScriptCore:

Intl.Collator has usage:"search" option, and it affects on collation. However, UCollator does not have an interface to set this collation option,
and only way to configure UCollator is setting "-u-co-search" unicode extension to passed locale string. This patch adds "-u-co-search" unicode
extension if Usage::Search is specified.

• runtime/IntlCollator.cpp:

(JSC::IntlCollator::initializeCollator):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/intl-collator-co-extension.js (added)
• JSTests/test262/expectations.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/IntlCollator.cpp (modified) (2 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-07-01  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Intl.Collator should set usage:"search" option through ICU locale
+        https://bugs.webkit.org/show_bug.cgi?id=213869
+
+        Reviewed by Ross Kirsling.
+
+        * stress/intl-collator-co-extension.js: Added.
+        (shouldBe):
+        (shouldBeArray):
+        (explicitTrueBeforeICU67):
+        * test262/expectations.yaml:
+
 2020-06-26  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/JSTests/test262/expectations.yaml

@@ -1606 +1606 @@
   default: "Test262Error: \"kn-true\" is returned in locale, but shouldn't be. Expected SameValue(«7», «-1») to be true"
   strict mode: "Test262Error: \"kn-true\" is returned in locale, but shouldn't be. Expected SameValue(«7», «-1») to be true"
-test/intl402/Collator/usage-de.js:
-  default: 'Test262Error: Expected [Ä, AE] and [AE, Ä] to have the same contents. search'
-  strict mode: 'Test262Error: Expected [Ä, AE] and [AE, Ä] to have the same contents. search'
 test/intl402/DateTimeFormat/prototype/resolvedOptions/hourCycle-default.js:
   default: 'Test262Error: Expected SameValue(«h24», «h23») to be true'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-07-01  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Intl.Collator should set usage:"search" option through ICU locale
+        https://bugs.webkit.org/show_bug.cgi?id=213869
+
+        Reviewed by Ross Kirsling.
+
+        Intl.Collator has usage:"search" option, and it affects on collation. However, UCollator does not have an interface to set this collation option,
+        and only way to configure UCollator is setting "-u-co-search" unicode extension to passed locale string. This patch adds "-u-co-search" unicode
+        extension if Usage::Search is specified.
+
+        * runtime/IntlCollator.cpp:
+        (JSC::IntlCollator::initializeCollator):
+
 2020-07-01  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp

@@ -44 +44 @@
 constexpr size_t caseFirstIndex = 1;
 constexpr size_t numericIndex = 2;
+constexpr bool verbose = false;
 }
 
@@ -241 +242 @@
     m_ignorePunctuation = (ignorePunctuation == TriState::True);
 
+    // UCollator does not offer an option to configure "usage" via ucol_setAttribute. So we need to pass this option via locale.
+    CString dataLocaleWithExtensions;
+    switch (m_usage) {
+    case Usage::Sort:
+        dataLocaleWithExtensions = m_locale.utf8();
+        break;
+    case Usage::Search:
+        // searchLocaleData filters out "co" unicode extension. However, we need to pass "co" to ICU when Usage::Search is specified.
+        // So we need to pass "co" unicode extension through locale. Since the other relevant extensions are handled via ucol_setAttribute,
+        // we can just use dataLocale
+        dataLocaleWithExtensions = makeString(result.get("dataLocale"_s), "-u-co-search").utf8();
+        break;
+    }
+    dataLogLnIf(IntlCollatorInternal::verbose, "dataLocaleWithExtensions:(", dataLocaleWithExtensions, ")");
+
     UErrorCode status = U_ZERO_ERROR;
-    m_collator = std::unique_ptr<UCollator, UCollatorDeleter>(ucol_open(m_locale.utf8().data(), &status));
+    m_collator = std::unique_ptr<UCollator, UCollatorDeleter>(ucol_open(dataLocaleWithExtensions.data(), &status));
     if (U_FAILURE(status)) {
         throwTypeError(globalObject, scope, "failed to initialize Collator"_s);