Fix escapeRegExp and add test

palantir · Jan 7, 2017 · 6fe20ce · 6fe20ce
1 parent c8a03f4
commit 6fe20ce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -97,5 +97,5 @@ export function stripComments(content: string): string {
  * Escapes all special characters in RegExp pattern to avoid broken regular expressions and ensure proper matches
  */
 export function escapeRegExp(re: string): string {
-    return re.replace(/[.+*?|^$\[]{}()\\]/g, "$&");
+    return re.replace(/[.+*?|^$[\]{}()\\]/g, "\\$&");
 }
diff --git a/test/utilsTests.ts b/test/utilsTests.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {arrayify, dedent, objectify} from "../src/utils";
+import {arrayify, dedent, escapeRegExp, objectify} from "../src/utils";
 
 describe("Utils", () => {
     it("arrayify", () => {
@@ -46,4 +46,15 @@ describe("Utils", () => {
         assert.equal(dedent`  `, "  ");
         assert.equal(dedent``, "");
     });
+
+    it("escapeRegExp", () => {
+        const plus = escapeRegExp("(a+|d)?b[ci]{2,}");
+        const plusRe = new RegExp(plus);
+
+        // contains substring that matches regular expression pattern
+        assert.equal(plusRe.test("regexpaaaabcicmatch"), false);
+
+        // properly matches exact string with special characters
+        assert.equal(plusRe.test("string(a+|d)?b[ci]{2,}match"), true);
+    });
 });