Merge pull request #151 from ChadKillingsworth/linenum-bug

Fix line number calculation bug
inikulin · Sep 1, 2016 · bfcd250 · bfcd250
2 parents ee55e85 + b9872c4
commit bfcd250
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/lib/location_info/tokenizer_mixin.js b/lib/location_info/tokenizer_mixin.js
@@ -57,6 +57,7 @@ exports.assign = function (tokenizer) {
 
     tokenizer._unconsume = function () {
         tokenizerProto._unconsume.call(this);
+        isEol = false;
 
         while (lineStartPos > this.preprocessor.pos && lineStartPosStack.length > 1) {
             lineStartPos = lineStartPosStack.pop();

diff --git a/test/fixtures/location_info_parser_test.js b/test/fixtures/location_info_parser_test.js
@@ -165,4 +165,29 @@ testUtils.generateTestsForEachTreeAdapter(module.exports, function (_test, treeA
 
         assert.ok(fragment.childNodes[0].__location.attrs['test-attr']);
     };
+
+    exports['Regression - location line incorrect when a character is unconsumed (GH-151)'] = function () {
+        var html = ['<html><body>',
+            '<script>',
+            '  var x = window.scrollY <',
+            '      100;',
+            '</script>',
+            '</body></html>'].join('\n'),
+            opts = {
+                treeAdapter: treeAdapter,
+                locationInfo: true
+            };
+
+        var doc = parse5.parse(html, opts),
+            foundScript = false;
+
+        walkTree(doc, treeAdapter, function (node) {
+            if (node.name === 'script') {
+                foundScript = true;
+                assert.equal(node.__location.endTag.line, 5);
+            }
+        });
+
+        assert.ok(foundScript);
+    };
 });