Fix SAXParser text location

Fixes #266.
inikulin · Aug 10, 2018 · c6d0fb5 · c6d0fb5
1 parent 533e7cc
commit c6d0fb5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/parse5-sax-parser/lib/index.js b/packages/parse5-sax-parser/lib/index.js
@@ -87,7 +87,12 @@ class SAXParser extends Transform {
                     if (this.pendingText === null) {
                         this.currentTokenLocation = token.location;
                     } else {
-                        this.currentTokenLocation.endOffset = token.location.endOffset;
+                        const { endLine, endCol, endOffset } = token.location;
+                        Object.assign(this.currentTokenLocation, {
+                            endLine,
+                            endCol,
+                            endOffset
+                        });
                     }
                 }
 

diff --git a/packages/parse5-sax-parser/test/location-info.test.js b/packages/parse5-sax-parser/test/location-info.test.js
@@ -29,16 +29,20 @@ exports['Location info (SAX)'] = function() {
     });
 };
 
-exports['Regression - location info for text (GH-153)'] = function() {
+exports['Regression - location info for text (GH-153, GH-266)'] = function() {
     const html = '<!DOCTYPE html><html><head><title>Here is a title</title></html>';
     const parser = new SAXParser({ sourceCodeLocationInfo: true });
-    const texts = [];
 
     parser.on('text', ({ sourceCodeLocation }) => {
-        texts.push(html.substring(sourceCodeLocation.startOffset, sourceCodeLocation.endOffset));
+        assert.deepStrictEqual(sourceCodeLocation, {
+            startLine: 1,
+            startCol: 35,
+            startOffset: 34,
+            endLine: 1,
+            endCol: 50,
+            endOffset: 49
+        });
     });
 
     parser.end(html);
-
-    assert.deepEqual(texts, ['Here is a title']);
 };