Validator Roll-up

validator/htmlparser.js

@@ -125,7 +125,7 @@ amp.htmlparser.DocLocator = class {
  */
 amp.htmlparser.HtmlSaxHandlerWithLocation = class
 extends amp.htmlparser.HtmlSaxHandler {
-  constructor() {}
+  constructor() { super(); }
 
   /**
    * Called prior to parsing a document, that is, before {@code startTag}.
@@ -612,11 +612,13 @@ amp.htmlparser.HtmlParser.INSIDE_TAG_TOKEN_ = new RegExp(
         // interpreters are inconsistent in whether a group that matches nothing
         // is null, undefined, or the empty string.
         ('(?:' +
-        // We don't allow attribute names starting with '/', but we allow them
-        // to contain '/' (differing from HTML5 spec), so that we can identify
-        // full mustache template variables and emit matching errors.
-        '([^\\t\\r\\n /=>][^\\t\\r\\n =>]*)' +  // attribute name
-        ('(' +                                  // optionally followed
+        // Allow attribute names to start with /, avoiding assigning the / in
+        // close-tag syntax */>.
+        '([^\\t\\r\\n /=>][^\\t\\r\\n =>]*|' + // e.g. "href"
+         '[^\\t\\r\\n =>]+[^ >]|' +            // e.g. "/asdfs/asd"
+         '\/+(?!>))' +                         // e.g. "/"
+        // Optionally followed by:
+        ('(' +
         '\\s*=\\s*' +
         ('(' +
         // A double quoted string.
@@ -674,6 +676,7 @@ extends amp.htmlparser.DocLocator {
    * @param {string} htmlText text of the entire HTML document to be processed.
    */
   constructor(htmlText) {
+    super();
     // Precomputes a mapping from positions within htmlText to line /
     // column numbers. TODO(johannes): This uses a fair amount of
     // space and we can probably do better, but it's also quite simple

validator/htmlparser_test.js

@@ -31,6 +31,7 @@ goog.provide('amp.htmlparser.HtmlParserTest');
  */
 class LoggingHandler extends amp.htmlparser.HtmlSaxHandler {
   constructor() {
+    super();
     this.log = [];
   }
 
@@ -183,6 +184,7 @@ describe('HtmlParser', () => {
 class LoggingHandlerWithLocation
 extends amp.htmlparser.HtmlSaxHandlerWithLocation {
   constructor() {
+    super();
     /** @type {amp.htmlparser.DocLocator} */
     this.locator = null;
     /** @type {!Array<!string>} */

validator/parse-css.js

@@ -452,19 +452,23 @@ class Canonicalizer {
         const contents = parse_css.extractASimpleBlock(tokenStream);
 
         switch (this.blockTypeFor(rule)) {
-          case parse_css.BlockType.PARSE_AS_RULES:
-          rule.rules = this.parseAListOfRules(
-              contents, /* topLevel */ false, errors);
-          break;
-          case parse_css.BlockType.PARSE_AS_DECLARATIONS:
-          rule.declarations = this.parseAListOfDeclarations(contents, errors);
-          break;
-          case parse_css.BlockType.PARSE_AS_IGNORE:
-          break;
-          default:
-          goog.asserts.fail(
-              'Unrecognized blockType ' + this.blockTypeFor(rule));
-          break;
+          case parse_css.BlockType.PARSE_AS_RULES: {
+            rule.rules = this.parseAListOfRules(
+                contents, /* topLevel */ false, errors);
+            break;
+          }
+          case parse_css.BlockType.PARSE_AS_DECLARATIONS: {
+            rule.declarations = this.parseAListOfDeclarations(contents, errors);
+            break;
+          }
+          case parse_css.BlockType.PARSE_AS_IGNORE: {
+            break;
+          }
+          default: {
+            goog.asserts.fail(
+                'Unrecognized blockType ' + this.blockTypeFor(rule));
+            break;
+          }
         }
         return rule;
       }
@@ -861,6 +865,8 @@ class UrlFunctionVisitor extends parse_css.RuleVisitor {
    * @param {!Array<!parse_css.ErrorToken>} errors
    */
   constructor(parsedUrls, errors) {
+    super();
+
     /** @type {!Array<!parse_css.ParsedCssUrl>} */
     this.parsedUrls = parsedUrls;
     /** @type {!Array<!parse_css.ErrorToken>} */