Merge pull request markedjs#1293 from Trott/trailing-period

fix gfm extended autolinking requiring multiple backpedals
zhenalexfan · Jul 5, 2018 · a562ab3 · a562ab3
2 parents ab5dfd2 + 83a8835
commit a562ab3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/lib/marked.js b/lib/marked.js
@@ -655,7 +655,8 @@ InlineLexer.prototype.output = function(src) {
       text,
       href,
       title,
-      cap;
+      cap,
+      prevCapZero;
 
   while (src) {
     // escape
@@ -681,7 +682,10 @@ InlineLexer.prototype.output = function(src) {
 
     // url (gfm)
     if (!this.inLink && (cap = this.rules.url.exec(src))) {
-      cap[0] = this.rules._backpedal.exec(cap[0])[0];
+      do {
+        prevCapZero = cap[0];
+        cap[0] = this.rules._backpedal.exec(cap[0])[0];
+      } while (prevCapZero !== cap[0]);
       src = src.substring(cap[0].length);
       if (cap[2] === '@') {
         text = escape(cap[0]);

diff --git a/test/specs/marked/marked-spec.js b/test/specs/marked/marked-spec.js
@@ -32,10 +32,23 @@ Messenger.prototype.test = function(spec, section, ignore) {
 
 var messenger = new Messenger();
 
+describe('Marked Autolinks', function() {
+  var section = 'Autolinks';
+
+  var shouldPassButFails = [];
+
+  var willNotBeAttemptedByCoreTeam = [];
+
+  var ignore = shouldPassButFails.concat(willNotBeAttemptedByCoreTeam);
+
+  markedSpec.forEach(function(spec) {
+    messenger.test(spec, section, ignore);
+  });
+});
+
 describe('Marked Code spans', function() {
   var section = 'Code spans';
 
-  // var shouldPassButFails = [];
   var shouldPassButFails = [1];
 
   var willNotBeAttemptedByCoreTeam = [];
@@ -64,7 +77,6 @@ describe('Marked Links', function() {
 describe('Marked Table cells', function() {
   var section = 'Table cells';
 
-  // var shouldPassButFails = [];
   var shouldPassButFails = [];
 
   var willNotBeAttemptedByCoreTeam = [];

diff --git a/test/specs/marked/marked.json b/test/specs/marked/marked.json
@@ -1,4 +1,22 @@
 [
+  {
+    "section": "Autolinks",
+    "markdown": "(See https://www.example.com/fhqwhgads.)",
+    "html": "<p>(See <a href=\"https://www.example.com/fhqwhgads\">https://www.example.com/fhqwhgads</a>.)</p>",
+    "example": 10
+  },
+  {
+    "section": "Autolinks",
+    "markdown": "((http://foo.com))",
+    "html": "<p>((<a href=\"http://foo.com\">http://foo.com</a>))</p>",
+    "example": 11
+  },
+  {
+    "section": "Autolinks",
+    "markdown": "((http://foo.com.))",
+    "html": "<p>((<a href=\"http://foo.com\">http://foo.com</a>.))</p>",
+    "example": 12
+  },
   {
     "section": "Code spans",
     "markdown": "`someone@example.com`",