Fix bug with shortcodes having matching prefixes (#11)

Solve by first sorting from longest to shortest, so the regex alternation matches the most specific first.
samwilson · Apr 12, 2024 · 944474e · 944474e
1 parent 0899b75
commit 944474e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ShortcodeInlineParser.php b/src/ShortcodeInlineParser.php
@@ -23,9 +23,15 @@ public function __construct(array $shortcodes)
 
     public function getMatchDefinition(): InlineParserMatch
     {
+        // Sort shortcodes by length, so they match from longest to shortest in the regex.
+        $sortedShortcodeNames = \array_keys($this->shortcodes);
+        \usort($sortedShortcodeNames, static function ($a, $b) {
+            return \strlen($b) - \strlen($a);
+        });
+
         return InlineParserMatch::join(
             InlineParserMatch::string('{'),
-            InlineParserMatch::oneOf(...\array_keys($this->shortcodes)),
+            InlineParserMatch::oneOf(...$sortedShortcodeNames),
             InlineParserMatch::regex('.*?'),
             InlineParserMatch::string('}')
         );

diff --git a/tests/ShortcodeExtensionTest.php b/tests/ShortcodeExtensionTest.php
@@ -34,12 +34,12 @@ public function provideBasics(): array
     {
         return [
             'simple-inline' => [
-                'markdown' => 'Foo {bar} baz {bif}',
+                'markdown' => 'Foo {bar} baz {barbif}',
                 'shortcodes' => [
                     'bar' => static function () {
                         return 'BAR';
                     },
-                    'bif' => static function () {
+                    'barbif' => static function () {
                         return 'BIF';
                     },
                 ],