[match-highlighter addon] Escape special characters when creating regexp

marijnh · marijnh · commit aab9d7161620 · 2018-02-20T09:25:18.000+01:00
Issue codemirror#5265
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
@@ -90,7 +90,7 @@
     var state = cm.state.matchHighlighter;
     cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
     if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
-      var searchFor = hasBoundary ? new RegExp("\\b" + query + "\\b") : query;
+      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[+*?(){|^$]/g, "\\$&") + "\\b") : query;
       state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
         {className: "CodeMirror-selection-highlight-scrollbar"});
     }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@`
`90`	`90`	`var state = cm.state.matchHighlighter;`
`91`	`91`	`cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));`
`92`	`92`	`if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {`
`93`		`- var searchFor = hasBoundary ? new RegExp("\\b" + query + "\\b") : query;`
	`93`	`+ var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[+*?(){\|^$]/g, "\\$&") + "\\b") : query;`
`94`	`94`	`state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,`
`95`	`95`	`{className: "CodeMirror-selection-highlight-scrollbar"});`
`96`	`96`	`}`