Merge 07b8e43 into f665ba9

coveo · Mar 20, 2017 · c9e1b92 · c9e1b92
2 parents f665ba9 + 07b8e43
commit c9e1b92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/utils/StreamHighlightUtils.ts b/src/utils/StreamHighlightUtils.ts
@@ -60,6 +60,7 @@ function getRestHighlightsForAllTerms(toHighlight: string, termsToHighlight: { [
   let sortedTerms = _.keys(termsToHighlight).sort(termsSorting);
   _.each(sortedTerms, (term: string) => {
     let termsToIterate = _.compact([term].concat(termsToHighlight[term]).sort(termsSorting));
+    termsToIterate = _.map(termsToIterate, (term)=> Utils.escapeRegexCharacter(term));
     let regex = regexStart;
     regex += termsToIterate.join('|') + ')(?=(?:' + nonWordBoundary + '|$)+)';
     let indexesFound = StringUtils.getHighlights(toHighlight, new RegExp(regex, opts.regexFlags), term);

diff --git a/test/utils/StreamHighlightUtilsTest.ts b/test/utils/StreamHighlightUtilsTest.ts
@@ -165,6 +165,13 @@ export function StreamHighlightUtilsTest() {
       expect(StreamHighlightUtils.highlightStreamText(toHighlight, terms, {})).toEqual(`${getHighlightResultForTerm('abc', 1, 'abc')}. ${getHighlightResultForTerm('qwerty', 2, 'qwerty')}`);
     });
 
+    it('should work with regex sensitive character', () => {
+      var toHighlight = 'Lorem ipsum 9.1.1 dolor *amet*';
+      let terms: { [originalTerm: string]: string[]; } = {'*amet*': []};
+      var phrases: { [phrase: string]: { [originalTerm: string]: string[]; } } = {};
+      expect(StreamHighlightUtils.highlightStreamText(toHighlight, terms, phrases)).toEqual(`Lorem ipsum 9.1.1 dolor ${getHighlightResultForTerm('*amet*', 1, '*amet*')}`);
+    });
+
     it('should work with number and dash', () => {
       var toHighlight = 'Lorem ipsum 9-1-1 dolor sit amet';
       let terms: { [originalTerm: string]: string[]; } = { 'lorem': [] };