added MISMATCHED_CLOSE_TAG_DUE_TO_EARLIER_AUTO_CLOSING

mozilla · Sep 27, 2017 · 63d04d7 · 63d04d7
1 parent f9a6920
commit 63d04d7
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -8,8 +8,8 @@
   },
   "scripts": {
     "build": "browserify ./src/index.js -o slowparse.js --standalone Slowparse",
-    "test": "node test.js",
-    "dev": "npm run build && npm run test"
+    "debug": "npm run build && node inspect test.js",
+    "test": "npm run build && node test.js"
   },
   "repository": {
     "type": "git",

diff --git a/slowparse.js b/slowparse.js
@@ -972,9 +972,14 @@ module.exports = (function(){
           start: token.interval.start
         };
         var openTagName = this.domBuilder.currentNode.nodeName.toLowerCase();
-        if (closeTagName != openTagName)
-          throw new ParseError("MISMATCHED_CLOSE_TAG", this, openTagName,
-                               closeTagName, token);
+        if (closeTagName != openTagName) {
+
+          if (this.domBuilder.currentNode.closeWarnings) {
+            throw new ParseError("MISMATCHED_CLOSE_TAG_DUE_TO_EARLIER_AUTO_CLOSING", this, closeTagName, token);
+          }
+
+          throw new ParseError("MISMATCHED_CLOSE_TAG", this, openTagName, closeTagName, token);
+        }
         this._parseEndCloseTag();
       }
 
@@ -999,12 +1004,25 @@ module.exports = (function(){
           var activeTagName = activeTagNode.nodeName.toLowerCase();
           if(this._knownOmittableCloseTags(activeTagName, tagName)) {
             this.domBuilder.popElement();
+
+            if (!this.domBuilder.currentNode.closeWarnings) {
+              this.domBuilder.currentNode.closeWarnings = [];
+            }
+
+            var childNodes = this.domBuilder.currentNode.childNodes,
+                position = childNodes.length - 1;
+
+            this.domBuilder.currentNode.closeWarnings.push({
+              tagName: activeTagName,
+              position: position,
+              parseInfo: childNodes[position].parseInfo
+            });
           }
         }
         // Store currentNode as the parentTagNode
         parentTagNode = this.domBuilder.currentNode;
-        this.domBuilder.pushElement(tagName, parseInfo, nameSpace);
 
+        this.domBuilder.pushElement(tagName, parseInfo, nameSpace);
         if (!this.stream.end())
           this._parseEndOpenTag(tagName);
       }
@@ -1468,6 +1486,18 @@ module.exports = (function() {
         cursor: closeTag.start
       };
     },
+    MISMATCHED_CLOSE_TAG_DUE_TO_EARLIER_AUTO_CLOSING: function(parser, closeTagName, token) {
+      var warnings = parser.domBuilder.currentNode.closeWarnings,
+          tag = warnings[0],
+          closeTag = this._combine({
+            name: closeTagName
+          }, token.interval);
+      return {
+        openTag: tag.parseInfo.openTag,
+        closeTag: closeTag,
+        cursor: closeTag.start
+      };
+    },
     MISMATCHED_CLOSE_TAG: function(parser, openTagName, closeTagName, token) {
       var openTag = this._combine({
             name: openTagName

diff --git a/src/HTMLParser.js b/src/HTMLParser.js
@@ -314,9 +314,14 @@ module.exports = (function(){
           start: token.interval.start
         };
         var openTagName = this.domBuilder.currentNode.nodeName.toLowerCase();
-        if (closeTagName != openTagName)
-          throw new ParseError("MISMATCHED_CLOSE_TAG", this, openTagName,
-                               closeTagName, token);
+        if (closeTagName != openTagName) {
+
+          if (this.domBuilder.currentNode.closeWarnings) {
+            throw new ParseError("MISMATCHED_CLOSE_TAG_DUE_TO_EARLIER_AUTO_CLOSING", this, closeTagName, token);
+          }
+
+          throw new ParseError("MISMATCHED_CLOSE_TAG", this, openTagName, closeTagName, token);
+        }
         this._parseEndCloseTag();
       }
 
@@ -341,12 +346,25 @@ module.exports = (function(){
           var activeTagName = activeTagNode.nodeName.toLowerCase();
           if(this._knownOmittableCloseTags(activeTagName, tagName)) {
             this.domBuilder.popElement();
+
+            if (!this.domBuilder.currentNode.closeWarnings) {
+              this.domBuilder.currentNode.closeWarnings = [];
+            }
+
+            var childNodes = this.domBuilder.currentNode.childNodes,
+                position = childNodes.length - 1;
+
+            this.domBuilder.currentNode.closeWarnings.push({
+              tagName: activeTagName,
+              position: position,
+              parseInfo: childNodes[position].parseInfo
+            });
           }
         }
         // Store currentNode as the parentTagNode
         parentTagNode = this.domBuilder.currentNode;
-        this.domBuilder.pushElement(tagName, parseInfo, nameSpace);
 
+        this.domBuilder.pushElement(tagName, parseInfo, nameSpace);
         if (!this.stream.end())
           this._parseEndOpenTag(tagName);
       }

diff --git a/src/ParseErrorBuilders.js b/src/ParseErrorBuilders.js
@@ -51,6 +51,18 @@ module.exports = (function() {
         cursor: closeTag.start
       };
     },
+    MISMATCHED_CLOSE_TAG_DUE_TO_EARLIER_AUTO_CLOSING: function(parser, closeTagName, token) {
+      var warnings = parser.domBuilder.currentNode.closeWarnings,
+          tag = warnings[0],
+          closeTag = this._combine({
+            name: closeTagName
+          }, token.interval);
+      return {
+        openTag: tag.parseInfo.openTag,
+        closeTag: closeTag,
+        cursor: closeTag.start
+      };
+    },
     MISMATCHED_CLOSE_TAG: function(parser, openTagName, closeTagName, token) {
       var openTag = this._combine({
             name: openTagName

diff --git a/test.js b/test.js
@@ -10,7 +10,12 @@ var Slowparse = require("./slowparse.js"),
     validators = require("./test/node/qunit-shim.js")(Slowparse, JSDOM);
 
 console.log("Testing Slowparse library:");
-var failureCount = require("./test/test-slowparse.js")(Slowparse, window, document, validators);
-if (failureCount > 0) { console.log(failureCount + " tests failed."); }
+
+var testRunner = require("./test/test-slowparse.js");
+var failureCount = testRunner(Slowparse, window, document, validators);
+
+if (failureCount > 0) {
+	console.log(`${failureCount} test${failureCount>1 ? 's' : ''} failed.`);
+}
 
 process.exit(failureCount);
diff --git a/test/test-slowparse.js b/test/test-slowparse.js
@@ -809,6 +809,18 @@ module.exports = function(Slowparse, window, document, validators) {
   });
 
 
+  test("correctly flag the opening tag for a missing closing tag", function () {
+    var html = '<body><p><h1><a href="">test</a></h1></p></body>';
+    var result = parse(html);
+    equal(result.error, {
+      type: 'MISMATCHED_CLOSE_TAG_DUE_TO_EARLIER_AUTO_CLOSING',
+      openTag: { start: 6, end: 9 },
+      closeTag: { name: 'p', start: 37, end: 40 },
+      cursor: 37
+    });
+  });
+
+
   // specifically CSS testing
 
   test("parsing empty CSS document", function() {