Bug 1855749 - Part 3: Correctly handle ignorePunctuation option. r=dminor

marco-c · marco-c · commit 1acb9ea6223b · 2023-11-08T15:41:23.000Z
The default value for `GetOption` in `InitializeCollator` is changed from `false` to `undefined` to avoid having to `intl_isIgnorePunctuation` in the constructor function. The corresponding spec PR is <tc39/ecma402#833>, but our behaviour is already not strictly spec-compliant as described in <tc39/ecma402#832>, so it seems reasonable to simply implement the spec PR ahead of time. (We don't want to "fix" our implementation to strictly follow the spec without the PR, because that could be web-incompatible resp. at least disruptive for Thai users, which currently already get the expected behaviour where punctuation characters are ignored in Thai.) Differential Revision: https://phabricator.services.mozilla.com/D189545 UltraBlame original commit: bcf3b4652f995f4f52792d5897cd2d905d5a029f
diff --git a/intl/components/src/Collator.cpp b/intl/components/src/Collator.cpp
@@ -1216,7 +1216,7 @@ Collator
 AlternateHandling
 :
 :
-Default
+NonIgnorable
 )
 ;
 if
diff --git a/js/src/builtin/intl/Collator.js b/js/src/builtin/intl/Collator.js
@@ -395,14 +395,46 @@ s
 Step
 28
 .
-internalProps
-.
+var
 ignorePunctuation
 =
 lazyCollatorData
 .
 ignorePunctuation
 ;
+if
+(
+ignorePunctuation
+=
+=
+=
+undefined
+)
+{
+var
+actualLocale
+=
+collatorActualLocale
+(
+r
+.
+dataLocale
+)
+;
+ignorePunctuation
+=
+intl_isIgnorePunctuation
+(
+actualLocale
+)
+;
+}
+internalProps
+.
+ignorePunctuation
+=
+ignorePunctuation
+;
 /
 /
 The
@@ -843,6 +875,8 @@ true
 /
 false
 /
+undefined
+/
 /
 }
 /
@@ -1316,7 +1350,7 @@ ignorePunctuation
 boolean
 "
 undefined
-false
+undefined
 )
 ;
 lazyCollatorData
diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
@@ -16054,29 +16054,6 @@ emoji
 .
 js
 #
-Default
-value
-for
-ignorePunctuation
-incorrectly
-computed
-.
-skip
-script
-test262
-/
-intl402
-/
-Collator
-/
-prototype
-/
-compare
-/
-ignorePunctuation
-.
-js
-#
 Time
 zone
 canonicalization
diff --git a/js/src/tests/non262/Intl/Collator/ignorePunctuation.js b/js/src/tests/non262/Intl/Collator/ignorePunctuation.js

Original file line number	Diff line number	Diff line change
`@@ -1216,7 +1216,7 @@ Collator`
`1216`	`1216`	`AlternateHandling`
`1217`	`1217`	`:`
`1218`	`1218`	`:`
`1219`		`-Default`
	`1219`	`+NonIgnorable`
`1220`	`1220`	`)`
`1221`	`1221`	`;`
`1222`	`1222`	`if`
Original file line number	Diff line number	Diff line change
`@@ -395,14 +395,46 @@ s`
`395`	`395`	`Step`
`396`	`396`	`28`
`397`	`397`	`.`
`398`		`-internalProps`
`399`		`-.`
	`398`	`+var`
`400`	`399`	`ignorePunctuation`
`401`	`400`	`=`
`402`	`401`	`lazyCollatorData`
`403`	`402`	`.`
`404`	`403`	`ignorePunctuation`
`405`	`404`	`;`
	`405`	`+if`
	`406`	`+(`
	`407`	`+ignorePunctuation`
	`408`	`+=`
	`409`	`+=`
	`410`	`+=`
	`411`	`+undefined`
	`412`	`+)`
	`413`	`+{`
	`414`	`+var`
	`415`	`+actualLocale`
	`416`	`+=`
	`417`	`+collatorActualLocale`
	`418`	`+(`
	`419`	`+r`
	`420`	`+.`
	`421`	`+dataLocale`
	`422`	`+)`
	`423`	`+;`
	`424`	`+ignorePunctuation`
	`425`	`+=`
	`426`	`+intl_isIgnorePunctuation`
	`427`	`+(`
	`428`	`+actualLocale`
	`429`	`+)`
	`430`	`+;`
	`431`	`+}`
	`432`	`+internalProps`
	`433`	`+.`
	`434`	`+ignorePunctuation`
	`435`	`+=`
	`436`	`+ignorePunctuation`
	`437`	`+;`
`406`	`438`	`/`
`407`	`439`	`/`
`408`	`440`	`The`
`@@ -843,6 +875,8 @@ true`
`843`	`875`	`/`
`844`	`876`	`false`
`845`	`877`	`/`
	`878`	`+undefined`
	`879`	`+/`
`846`	`880`	`/`
`847`	`881`	`}`
`848`	`882`	`/`
`@@ -1316,7 +1350,7 @@ ignorePunctuation`
`1316`	`1350`	`boolean`
`1317`	`1351`	`"`
`1318`	`1352`	`undefined`
`1319`		`-false`
	`1353`	`+undefined`
`1320`	`1354`	`)`
`1321`	`1355`	`;`
`1322`	`1356`	`lazyCollatorData`