From 2760b0764bfdf2fc2893eb9a9f0eedb452794c13 Mon Sep 17 00:00:00 2001 From: tophf Date: Fri, 1 Dec 2017 16:16:24 +0300 Subject: [PATCH] fixup b41cc8bc: only rewrite query if regexp --- edit/match-highlighter-helper.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/edit/match-highlighter-helper.js b/edit/match-highlighter-helper.js index 3e453964..f3488cfd 100644 --- a/edit/match-highlighter-helper.js +++ b/edit/match-highlighter-helper.js @@ -131,7 +131,9 @@ } function matchesOnScrollbar(query, ...args) { - query = new RegExp(/(?:^|[^\w.#\\-])/.source + query.source.slice(2, -2) + /(?:[^\w.#\\-]|$)/.source); + if (query instanceof RegExp) { + query = new RegExp(/(?:^|[^\w.#\\-])/.source + query.source.slice(2, -2) + /(?:[^\w.#\\-]|$)/.source); + } return originalMatchesOnScrollbar.call(this, query, ...args); } })();