Fix handling of masks

Author: eGavr

lib/index.js

@@ -12,7 +12,7 @@ var _ = require('lodash'),
 HtmlDiff.prototype.tokenize = function (html) {
     html = modifyHtmlAccordingToOptions(html, this.options);
 
-    return _.filter(html.split(/({{.+?[^\\]}}(?!})|[{}=:;,<>"'\[\]\/]|\s+)/));
+    return _.filter(html.split(/({{.+?[^\\]}}(?!})|[{}\(\)=:;,<>"'\[\]\/]|\s+)/));
 };
 
 /**

lib/utils/mask.js

@@ -4,7 +4,8 @@
  *
  * {{RegExp}}
  */
-var MASK_REGEXP = /(.*){{(.+[^\\])}}(?!})(.*)/;
+var MASK_REGEXP = /(.*){{(.+[^\\])}}(?!})(.*)/,
+    specialСhars = /([^A-Za-zА-Яа-я0-9_\-\s])/g;
 
 /**
  * Checks whether the given part of the diff should be added or removed
@@ -32,7 +33,11 @@ function _revealMasks(diff) {
 
         if (!matchedMask) continue;
 
-        var regExp = new RegExp('^' + matchedMask[1] + matchedMask[2] + matchedMask[3] + '$');
+        var regExp = new RegExp('^' +
+            matchedMask[1].replace(specialСhars, '\\$1') +
+                matchedMask[2] +
+                    matchedMask[3].replace(specialСhars, '\\$1') + '$');
+
         if (currPart.added && nextPart && nextPart.removed) {
             if (nextPart.value.match(regExp)) {
                 nextPart.removed = undefined;

test/diff/fixtures/first/mask.html

@@ -1,2 +1,3 @@
 AZ<meta charset="UTF-32">
+<span style="#url{1,3}+ ({{\d}})">
 <div id="blah{{\d+}}blah"></div>bl{{\}}{=ah 5

test/diff/fixtures/second/mask.html

@@ -1,2 +1,3 @@
 {{[A-Z]+}}<meta charset="{{UTF-\d{1,2}}}">
+<span style="#url{1,3}+ (1)">
 <div id="blah12345blah"></div>{{bl\{\{\\\}}{=ah\s\d}}