Replace ignored content with empty content of same length/height for …

…proper error reporting
jshint · Sep 12, 2014 · 5c10fb3 · 5c10fb3
1 parent e496983
commit 5c10fb3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/jshint.js b/src/jshint.js
@@ -4798,12 +4798,14 @@ var JSHINT = (function () {
             return;
 
         reIgnoreStr = escapeRegex(delimiterPair.start) +
-                      ".*?" +
+                      "[\\s\\S]*?" +
                       escapeRegex(delimiterPair.end);
 
         reIgnore = new RegExp(reIgnoreStr, "ig");
 
-        s = s.replace(reIgnore, "");
+        s = s.replace(reIgnore, function(match) {
+          return match.replace(/./g, " ");
+        });
       });
     }
 

diff --git a/tests/unit/fixtures/ignoreDelimiters.js b/tests/unit/fixtures/ignoreDelimiters.js
@@ -1,5 +1,9 @@
 (function foo() {
   'use strict';
-  someMethod('<?php foo('test') ?>');
-  return '<%= asset_path('test.png') %>' + '<% some_method() %>';
+  <%
+    if someCondition do
+  %>
+  someMethod('<?php foo('test') ?>')
+  <% end %>
+  return '<%= asset_path('foo.png') %>' + '<% some_method() %>';
 })();
diff --git a/tests/unit/options.js b/tests/unit/options.js
@@ -1652,11 +1652,14 @@ exports.ignoreDelimiters = function (test) {
   var src = fs.readFileSync(__dirname + "/fixtures/ignoreDelimiters.js", "utf8");
 
   TestRun(test)
+    // make sure line/column are still reported properly
+    .addError(6, "Missing semicolon.", { character: 37 })
     .test(src, {
       ignoreDelimiters: [
         { start: "<%=", end: "%>" },
         { start: "<%", end: "%>" },
         { start: "<?php", end: "?>" },
+        // make sure single tokens are ignored
         { start: "foo" },
         { end: "bar" }
       ]