[JSC] Intl.Collator's ignorePunctuation should reflect queried result

https://bugs.webkit.org/show_bug.cgi?id=263313
rdar://117122647

Reviewed by Alexey Shvayka.

For example, th locale's ignorePunctuation is true by default. We should construct Intl.Collator,
querying ignorePunctuation to the created ICU's collator, and setting it as resolvedOptions().ignorePunctuation.

* JSTests/test262/expectations.yaml:
* Source/JavaScriptCore/runtime/IntlCollator.cpp:
(JSC::IntlCollator::initializeCollator):

Canonical link: https://commits.webkit.org/269459@main

Author: Constellation

JSTests/test262/expectations.yaml

@@ -1096,9 +1096,6 @@ test/harness/verifyProperty-desc-is-not-object.js:
 test/harness/verifyProperty-value-error.js:
   default: 'Error: The error thrown did not define the specified message.'
   strict mode: 'Error: The error thrown did not define the specified message.'
-test/intl402/Collator/prototype/compare/ignorePunctuation.js:
-  default: 'Test262Error: Compare to space Expected SameValue(«0», «-1») to be true'
-  strict mode: 'Test262Error: Compare to space Expected SameValue(«0», «-1») to be true'
 test/intl402/DateTimeFormat/prototype/format/offset-timezone-gmt-same.js:
   default: 'RangeError: invalid time zone: +0300'
   strict mode: 'RangeError: invalid time zone: +0300'

Source/JavaScriptCore/runtime/IntlCollator.cpp

@@ -203,7 +203,6 @@ void IntlCollator::initializeCollator(JSGlobalObject* globalObject, JSValue loca
 
     TriState ignorePunctuation = intlBooleanOption(globalObject, options, vm.propertyNames->ignorePunctuation);
     RETURN_IF_EXCEPTION(scope, void());
-    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;
@@ -266,12 +265,19 @@ void IntlCollator::initializeCollator(JSGlobalObject* globalObject, JSValue loca
 
     // FIXME: Setting UCOL_ALTERNATE_HANDLING to UCOL_SHIFTED causes punctuation and whitespace to be
     // ignored. There is currently no way to ignore only punctuation.
-    ucol_setAttribute(m_collator.get(), UCOL_ALTERNATE_HANDLING, m_ignorePunctuation ? UCOL_SHIFTED : UCOL_DEFAULT, &status);
+    if (ignorePunctuation != TriState::Indeterminate)
+        ucol_setAttribute(m_collator.get(), UCOL_ALTERNATE_HANDLING, ignorePunctuation == TriState::True ? UCOL_SHIFTED : UCOL_NON_IGNORABLE, &status);
 
     // "The method is required to return 0 when comparing Strings that are considered canonically
     // equivalent by the Unicode standard."
     ucol_setAttribute(m_collator.get(), UCOL_NORMALIZATION_MODE, UCOL_ON, &status);
     ASSERT(U_SUCCESS(status));
+
+    {
+        auto result = ucol_getAttribute(m_collator.get(), UCOL_ALTERNATE_HANDLING, &status);
+        ASSERT(U_SUCCESS(status));
+        m_ignorePunctuation = (result == UCOL_SHIFTED);
+    }
 }
 
 // https://tc39.es/ecma402/#sec-collator-comparestrings