Merge pull request #871 from thephpleague/fix-strikethrough-in-autolinks

Fix AutolinkExtension not ignoring trailing strikethrough syntax

Author: colinodell

CHANGELOG.md

@@ -6,6 +6,10 @@ Updates should follow the [Keep a CHANGELOG](https://keepachangelog.com/) princi
 
 ## [Unreleased][unreleased]
 
+### Fixed
+
+- Fixed AutolinkExtension not ignoring trailing strikethrough syntax (#867)
+
 ## [2.2.3] - 2022-02-26
 
 ### Fixed

src/Extension/Autolink/UrlAutolinkParser.php

@@ -90,7 +90,7 @@ public function parse(InlineParserContext $inlineContext): bool
         $url = $matches[0];
 
         // Does the URL end with punctuation that should be stripped?
-        if (\preg_match('/(.+)([?!.,:*_~]+)$/', $url, $matches)) {
+        if (\preg_match('/(.+?)([?!.,:*_~]+)$/', $url, $matches)) {
             // Add the punctuation later
             $url = $matches[1];
         }

tests/functional/Extension/Autolink/UrlAutolinkParserTest.php

@@ -16,6 +16,7 @@
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\Autolink\AutolinkExtension;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
+use League\CommonMark\Extension\Strikethrough\StrikethroughExtension;
 use League\CommonMark\MarkdownConverter;
 use PHPUnit\Framework\TestCase;
 
@@ -88,4 +89,22 @@ public function dataProviderForAutolinkTests(): iterable
         // Issue 492: underscores in URLs (see https://github.com/thephpleague/commonmark/issues/492)
         yield ['http://wiki/Puncutation_in_links:_why_its_bad_(and_should_be_avoided)', '<p><a href="http://wiki/Puncutation_in_links:_why_its_bad_(and_should_be_avoided)">http://wiki/Puncutation_in_links:_why_its_bad_(and_should_be_avoided)</a></p>'];
     }
+
+    public function testUrlAutolinksWithStrikethrough(): void
+    {
+        $markdown = '~~Prefix i link: https://aws.amazon.com/emr/features/hadoop/~~';
+
+        $environment = new Environment();
+        $environment->addExtension(new CommonMarkCoreExtension());
+        $environment->addExtension(new AutolinkExtension());
+        $environment->addExtension(new StrikethroughExtension());
+
+        $converter = new MarkdownConverter($environment);
+        $html      = $converter->convert($markdown)->getContent();
+
+        $this->assertSame(
+            '<p><del>Prefix i link: <a href="https://aws.amazon.com/emr/features/hadoop/">https://aws.amazon.com/emr/features/hadoop/</a></del></p>' . "\n",
+            $html
+        );
+    }
 }