strings - While highlighting text, ensure the raw text length is equa…

…l to the preprocessed text length.
computablefacts · Nov 15, 2023 · f3ae94b · f3ae94b
1 parent 976252f
commit f3ae94b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 8 deletions.
diff --git a/dist/cjs/main.js b/dist/cjs/main.js
diff --git a/dist/cjs/main.js.map b/dist/cjs/main.js.map
diff --git a/dist/esm/main.js b/dist/esm/main.js
diff --git a/dist/esm/main.js.map b/dist/esm/main.js.map
diff --git a/dist/main.min.js b/dist/main.min.js
diff --git a/dist/main.min.js.map b/dist/main.min.js.map
diff --git a/src/strings.js b/src/strings.js
@@ -255,6 +255,10 @@ strings.highlight = function (text, patterns) {
 
   let highlightedText = text;
   text = strings.removeDiacritics(text, true);
+
+  if (text.length !== highlightedText.length) {
+    highlightedText = text;
+  }
   const highlights = patterns.flatMap(pattern => {
 
     const matcher = pattern.regexp;
@@ -291,7 +295,6 @@ strings.highlight = function (text, patterns) {
         begin)}<mark style="border-radius:3px;background:${position.color}">${infix}</mark>${suffix.substring(0, end)}`;
     const pages = prefix.split('\f' /* page separator */).map((page, index) => index);
 
-    // matchedText, rawSnippet, highlightedSnippet, page
     return new strings.Highlight(infix, pages.length, rawSnippet, highlightedSnippet);
   });
   return new strings.HighlightedText(highlightedText, highlights);

diff --git a/src/strings.test.js b/src/strings.test.js
@@ -109,4 +109,26 @@ test('highlight', () => {
   expect(strings.highlight(text, [pattern])).toEqual({
     snippets: [snippet], text: textHighlighted
   });
-})
+
+  const text2 = 'Motif n°1: aabbcc.\fMotif n°2: aabbcc.';
+  const textHighlighted2 = 'Motif n°1: <mark style="border-radius:3px;background:#fffec8">aabbcc</mark>.\fMotif n°2: <mark style="border-radius:3px;background:#fffec8">aabbcc</mark>.';
+  const pattern2 = {
+    regexp: /aabbcc/gims, color: "#fffec8"
+  };
+  const snippet2 = {
+    matchedText: "aabbcc",
+    matchedPage: 1,
+    rawSnippet: 'Motif n°1: aabbcc.\fMotif n°2: <mark style="border-radius:3px;background:#fffec8">aabbcc</mark>.',
+    highlightedSnippet: 'Motif n°1: <mark style="border-radius:3px;background:#fffec8">aabbcc</mark>.\fMotif n°2: <mark style="border-radius:3px;background:#fffec8">aabbcc</mark>.',
+  };
+  const snippet3 = {
+    matchedText: "aabbcc",
+    matchedPage: 2,
+    rawSnippet: 'Motif n°1: aabbcc.\fMotif n°2: aabbcc.',
+    highlightedSnippet: 'Motif n°1: aabbcc.\fMotif n°2: <mark style="border-radius:3px;background:#fffec8">aabbcc</mark>.',
+  };
+
+  expect(strings.highlight(text2, [pattern2])).toEqual({
+    snippets: [snippet3, snippet2], text: textHighlighted2
+  });
+});