Merge pull request #15698 from Snuffleupagus/DIACRITICS_EXCEPTION_STR…

…-lazy Initialize the find-related `DIACRITICS_EXCEPTION_STR` constant lazily
mozilla · Nov 15, 2022 · e089d07 · e089d07
2 parents 859335a + 176e8f0
commit e089d07
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/web/pdf_find_controller.js b/web/pdf_find_controller.js
@@ -76,9 +76,7 @@ const DIACRITICS_EXCEPTION = new Set([
   // https://www.compart.com/fr/unicode/combining/132
   0x0f74,
 ]);
-const DIACRITICS_EXCEPTION_STR = [...DIACRITICS_EXCEPTION.values()]
-  .map(x => String.fromCharCode(x))
-  .join("");
+let DIACRITICS_EXCEPTION_STR; // Lazily initialized, see below.
 
 const DIACRITICS_REG_EXP = /\p{M}+/gu;
 const SPECIAL_CHARS_REG_EXP =
@@ -675,6 +673,10 @@ class PDFFindController {
     if (matchDiacritics) {
       // aX must not match aXY.
       if (hasDiacritics) {
+        DIACRITICS_EXCEPTION_STR ||= String.fromCharCode(
+          ...DIACRITICS_EXCEPTION
+        );
+
         isUnicode = true;
         query = `${query}(?=[${DIACRITICS_EXCEPTION_STR}]|[^\\p{M}]|$)`;
       }