[Intl] Impl LocaleInfo PR 63

FrankYFTang · V8 LUCI CQ · commit 6bf3344f5d99 · 2022-12-15T01:21:58.000Z
tc39/proposal-intl-locale-info#63 Sort collation code alphabetically before return. Bug: v8:13542 Change-Id: I1c7df69af483a96a1fc7625b11c2b850edc59283 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4094503 Commit-Queue: Frank Tang <ftang@chromium.org> Reviewed-by: Shu-yu Guo <syg@chromium.org> Cr-Commit-Position: refs/heads/main@{#84857}
diff --git a/src/objects/js-locale.cc b/src/objects/js-locale.cc
@@ -531,7 +531,7 @@ MaybeHandle<JSArray> JSLocale::Collations(Isolate* isolate,
   icu::Locale icu_locale(*(locale->icu_locale().raw()));
   return GetKeywordValuesFromLocale<icu::Collator>(
       isolate, "collations", "co", icu_locale, Intl::RemoveCollation, true,
-      false);
+      true);
 }
 
 MaybeHandle<JSArray> JSLocale::HourCycles(Isolate* isolate,
diff --git a/test/intl/assert.js b/test/intl/assert.js
@@ -292,3 +292,17 @@ function assertLanguageTag(child, parent) {
     fail(child, parent, 'language tag comparison');
   }
 }
+
+function assertArrayEquals(expected, found, name_opt) {
+  var start = "";
+  if (name_opt) {
+    start = name_opt + " - ";
+  }
+  assertEquals(expected.length, found.length, start + "array length");
+  if (expected.length === found.length) {
+    for (var i = 0; i < expected.length; ++i) {
+      assertEquals(expected[i], found[i],
+                   start + "array element at index " + i);
+    }
+  }
+}
diff --git a/test/intl/locale/locale-collations.js b/test/intl/locale/locale-collations.js
@@ -15,5 +15,6 @@ for (var i = 0; i < a_to_z.length; i++) {
           locale + ".collations [" + locale.collations +
           "] does not meet 'type: alphanum{3,8}(sep alphanum{3,8})*'");
     });
+    assertArrayEquals(locale.collations, locale.collations.sort());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ MaybeHandle<JSArray> JSLocale::Collations(Isolate* isolate,`
`531`	`531`	`icu::Locale icu_locale(*(locale->icu_locale().raw()));`
`532`	`532`	`return GetKeywordValuesFromLocale<icu::Collator>(`
`533`	`533`	`isolate, "collations", "co", icu_locale, Intl::RemoveCollation, true,`
`534`		`- false);`
	`534`	`+ true);`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`MaybeHandle<JSArray> JSLocale::HourCycles(Isolate* isolate,`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,6 @@ for (var i = 0; i < a_to_z.length; i++) {`
`15`	`15`	`locale + ".collations [" + locale.collations +`
`16`	`16`	`"] does not meet 'type: alphanum{3,8}(sep alphanum{3,8})*'");`
`17`	`17`	`});`
	`18`	`+ assertArrayEquals(locale.collations, locale.collations.sort());`
`18`	`19`	`}`
`19`	`20`	`}`