Fix inline parsing

samwilson · web-flow · commit 96a1b9d60eb6 · 2023-04-17T13:44:56.000+08:00
diff --git a/src/Shortcode.php b/src/Shortcode.php
@@ -4,10 +4,10 @@
 
 namespace Samwilson\CommonMarkShortcodes;
 
-use Throwable;
 use DOMDocument;
 use League\CommonMark\Node\Block\AbstractBlock;
 use League\CommonMark\Node\RawMarkupContainerInterface;
+use Throwable;
 
 class Shortcode extends AbstractBlock implements RawMarkupContainerInterface
 {
diff --git a/src/ShortcodeInlineParser.php b/src/ShortcodeInlineParser.php
@@ -23,42 +23,21 @@ public function __construct(array $shortcodes)
 
     public function getMatchDefinition(): InlineParserMatch
     {
-        foreach (\array_keys($this->shortcodes) as $code) {
-            return InlineParserMatch::join(
-                InlineParserMatch::string('{' . $code),
-                InlineParserMatch::regex('.*?\}')
-            );
-        }
+        return InlineParserMatch::join(
+            InlineParserMatch::string('{'),
+            InlineParserMatch::oneOf(...\array_keys($this->shortcodes)),
+            InlineParserMatch::regex('.*?'),
+            InlineParserMatch::string('}')
+        );
     }
 
     public function parse(InlineParserContext $inlineContext): bool
     {
-        $shortcode = new Shortcode(\substr($inlineContext->getMatches()[1], 1));
-        $shortcode->loadAttrsFromString(\substr($inlineContext->getMatches()[2], 0, -1));
-        // $doc = new DOMDocument();
-        // $doc->loadHTML('<body ' . \substr($inlineContext->getMatches()[2], 0, -1) . ' />');
-        // $body      = $doc->getElementsByTagName('body')[0];
-        // for ($i = 0; $i < $body->attributes->length; ++$i) {
-        //     $name  = $body->attributes->item($i)->name;
-        //     $value = $body->getAttribute($name);
-        //     $shortcode->setAttr($name, $value);
-        // }
+        $shortcode = new Shortcode($inlineContext->getMatches()[2]);
+        $shortcode->loadAttrsFromString($inlineContext->getMatches()[3]);
         $inlineContext->getCursor()->advanceBy($inlineContext->getFullMatchLength());
         $inlineContext->getContainer()->appendChild($shortcode);
 
         return true;
     }
-
-    // /**
-    //  * @inheritdoc
-    //  */
-    // public function tryStart(Cursor $cursor, MarkdownParserStateInterface $parserState): ?BlockStart {
-
-    //     $opening = $cursor->match('/^\{([^ ]+)/');
-    //         dump(array_keys($this->shortcodes), $opening, $cursor);
-    //     if ($opening === null) {
-    //         return BlockStart::none();
-    //     }
-    //     return BlockStart::of(new ShortcodeParser(substr($opening, 1)))->at($cursor);
-    // }
 }
diff --git a/tests/ShortcodeExtensionTest.php b/tests/ShortcodeExtensionTest.php
@@ -34,13 +34,16 @@ public function provideBasics(): array
     {
         return [
             'simple-inline' => [
-                'markdown' => 'Foo {bar} baz',
+                'markdown' => 'Foo {bar} baz {bif}',
                 'shortcodes' => [
                     'bar' => static function () {
                         return 'BAR';
                     },
+                    'bif' => static function () {
+                        return 'BIF';
+                    },
                 ],
-                'output' => "<p>Foo \nBAR baz</p>\n",
+                'output' => "<p>Foo \nBAR baz \nBIF</p>\n",
             ],
             'simple-inline-params' => [
                 'markdown' => 'Foo {bar a b=c d="e f"} baz',

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace Samwilson\CommonMarkShortcodes;`
`6`	`6`
`7`		`-use Throwable;`
`8`	`7`	`use DOMDocument;`
`9`	`8`	`use League\CommonMark\Node\Block\AbstractBlock;`
`10`	`9`	`use League\CommonMark\Node\RawMarkupContainerInterface;`
	`10`	`+use Throwable;`
`11`	`11`
`12`	`12`	`class Shortcode extends AbstractBlock implements RawMarkupContainerInterface`
`13`	`13`	`{`