Update MD034/no-bare-urls to scan all tokens when pruning HTML content so open/close pairs with different parents are handled (fixes #966).

demo/markdownlint-browser.js

@@ -5057,6 +5057,7 @@ var _require = __webpack_require__(/*! ../helpers */ "../helpers/helpers.js"),
   addErrorContext = _require.addErrorContext;
 var _require2 = __webpack_require__(/*! ../helpers/micromark.cjs */ "../helpers/micromark.cjs"),
   filterByPredicate = _require2.filterByPredicate,
+  filterByTypes = _require2.filterByTypes,
   getHtmlTagInfo = _require2.getHtmlTagInfo,
   parse = _require2.parse;
 module.exports = {
@@ -5065,39 +5066,40 @@ module.exports = {
   "tags": ["links", "url"],
   "function": function MD034(params, onError) {
     var literalAutolinks = function literalAutolinks(tokens) {
-      return filterByPredicate(tokens, function (token) {
-        return token.type === "literalAutolink";
-      }, function (token) {
-        var children = token.children;
-        var result = [];
-        for (var i = 0; i < children.length; i++) {
-          var openToken = children[i];
-          var openTagInfo = getHtmlTagInfo(openToken);
-          if (openTagInfo && !openTagInfo.close) {
-            var count = 1;
-            for (var j = i + 1; j < children.length; j++) {
-              var closeToken = children[j];
-              var closeTagInfo = getHtmlTagInfo(closeToken);
-              if (closeTagInfo && openTagInfo.name === closeTagInfo.name) {
-                if (closeTagInfo.close) {
-                  count--;
-                  if (count === 0) {
-                    i = j;
-                    break;
-                  }
-                } else {
-                  count++;
+      var flattened = filterByPredicate(tokens, function () {
+        return true;
+      });
+      var result = [];
+      for (var i = 0; i < flattened.length; i++) {
+        var current = flattened[i];
+        var openTagInfo = getHtmlTagInfo(current);
+        if (openTagInfo && !openTagInfo.close) {
+          var count = 1;
+          for (var j = i + 1; j < flattened.length; j++) {
+            var candidate = flattened[j];
+            var closeTagInfo = getHtmlTagInfo(candidate);
+            if (closeTagInfo && openTagInfo.name === closeTagInfo.name) {
+              if (closeTagInfo.close) {
+                count--;
+                if (count === 0) {
+                  i = j;
+                  break;
                 }
+              } else {
+                count++;
               }
             }
-          } else {
-            result.push(openToken);
           }
+        } else {
+          result.push(current);
         }
-        return result;
+      }
+      return result.filter(function (token) {
+        return token.type === "literalAutolink";
       });
     };
-    if (literalAutolinks(params.parsers.micromark.tokens).length > 0) {
+    var autoLinks = filterByTypes(params.parsers.micromark.tokens, ["literalAutolink"]);
+    if (autoLinks.length > 0) {
       // Re-parse with correct link/image reference definition handling
       var document = params.lines.join("\n");
       var tokens = parse(document, undefined, false);

lib/md034.js

@@ -3,7 +3,7 @@
 "use strict";
 
 const { addErrorContext } = require("../helpers");
-const { filterByPredicate, getHtmlTagInfo, parse } =
+const { filterByPredicate, filterByTypes, getHtmlTagInfo, parse } =
   require("../helpers/micromark.cjs");
 
 module.exports = {
@@ -11,42 +11,40 @@ module.exports = {
   "description": "Bare URL used",
   "tags": [ "links", "url" ],
   "function": function MD034(params, onError) {
-    const literalAutolinks = (tokens) => (
-      filterByPredicate(
-        tokens,
-        (token) => token.type === "literalAutolink",
-        (token) => {
-          const { children } = token;
-          const result = [];
-          for (let i = 0; i < children.length; i++) {
-            const openToken = children[i];
-            const openTagInfo = getHtmlTagInfo(openToken);
-            if (openTagInfo && !openTagInfo.close) {
-              let count = 1;
-              for (let j = i + 1; j < children.length; j++) {
-                const closeToken = children[j];
-                const closeTagInfo = getHtmlTagInfo(closeToken);
-                if (closeTagInfo && (openTagInfo.name === closeTagInfo.name)) {
-                  if (closeTagInfo.close) {
-                    count--;
-                    if (count === 0) {
-                      i = j;
-                      break;
-                    }
-                  } else {
-                    count++;
-                  }
+    const literalAutolinks = (tokens) => {
+      const flattened = filterByPredicate(tokens, () => true);
+      const result = [];
+      for (let i = 0; i < flattened.length; i++) {
+        const current = flattened[i];
+        const openTagInfo = getHtmlTagInfo(current);
+        if (openTagInfo && !openTagInfo.close) {
+          let count = 1;
+          for (let j = i + 1; j < flattened.length; j++) {
+            const candidate = flattened[j];
+            const closeTagInfo = getHtmlTagInfo(candidate);
+            if (closeTagInfo && (openTagInfo.name === closeTagInfo.name)) {
+              if (closeTagInfo.close) {
+                count--;
+                if (count === 0) {
+                  i = j;
+                  break;
                 }
+              } else {
+                count++;
               }
-            } else {
-              result.push(openToken);
             }
           }
-          return result;
+        } else {
+          result.push(current);
         }
-      )
+      }
+      return result.filter((token) => token.type === "literalAutolink");
+    };
+    const autoLinks = filterByTypes(
+      params.parsers.micromark.tokens,
+      [ "literalAutolink" ]
     );
-    if (literalAutolinks(params.parsers.micromark.tokens).length > 0) {
+    if (autoLinks.length > 0) {
       // Re-parse with correct link/image reference definition handling
       const document = params.lines.join("\n");
       const tokens = parse(document, undefined, false);

test/bare-urls.md

@@ -59,6 +59,26 @@ https://example.com
 <pre>https://example.com</pre>
 </p>
 
+<div>
+https://example.com
+</div>
+
+<div>
+https://example.com
+
+</div>
+
+<div>
+
+https://example.com
+</div>
+
+<div>
+
+https://example.com
+
+</div>
+
 URLs in link and image text are not bare:
 
 Text [link to https://example.com site](https://example.com) text.

test/snapshots/markdownlint-test-scenarios.js.md

@@ -3526,7 +3526,7 @@ Generated by [AVA](https://avajs.dev).
             editColumn: 27,
             insertText: '<https://example.com#heading->',
           },
-          lineNumber: 68,
+          lineNumber: 88,
           ruleDescription: 'Bare URL used',
           ruleInformation: 'https://github.com/DavidAnson/markdownlint/blob/v0.0.0/doc/md034.md',
           ruleNames: [
@@ -3546,7 +3546,7 @@ Generated by [AVA](https://avajs.dev).
             editColumn: 40,
             insertText: '<user@example.com>',
           },
-          lineNumber: 76,
+          lineNumber: 96,
           ruleDescription: 'Bare URL used',
           ruleInformation: 'https://github.com/DavidAnson/markdownlint/blob/v0.0.0/doc/md034.md',
           ruleNames: [
@@ -3566,7 +3566,7 @@ Generated by [AVA](https://avajs.dev).
             editColumn: 59,
             insertText: '<https://example.com>',
           },
-          lineNumber: 84,
+          lineNumber: 104,
           ruleDescription: 'Bare URL used',
           ruleInformation: 'https://github.com/DavidAnson/markdownlint/blob/v0.0.0/doc/md034.md',
           ruleNames: [
@@ -3636,6 +3636,26 @@ Generated by [AVA](https://avajs.dev).
       <pre>https://example.com</pre>␊
       </p>␊
       ␊
+      <div>␊
+      https://example.com␊
+      </div>␊
+      ␊
+      <div>␊
+      https://example.com␊
+      ␊
+      </div>␊
+      ␊
+      <div>␊
+      ␊
+      https://example.com␊
+      </div>␊
+      ␊
+      <div>␊
+      ␊
+      https://example.com␊
+      ␊
+      </div>␊
+      ␊
       URLs in link and image text are not bare:␊
       ␊
       Text [link to https://example.com site](https://example.com) text.␊