Skip to content

fix: support bullet markers and lazy list continuations #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendt merged 2 commits into from
Sep 14, 2026
Merged

fix: support bullet markers and lazy list continuations #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe61269
fix(markdown): parse bullet markers and lazy list lines
RobinDev Sep 13, 2026
c24e3d4
Merge branch 'main' into fix/list-markers-continuation
brendt Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/Rules/ListRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@

final class ListRule implements Rule, ProvidesFirstChar
{
public string $firstChar = '-';
public string $firstChar = '-*+';

public function shouldParse(Parser $parser): bool
{
return $parser->comesNext('- ', 2);
return $parser->comesNext(($parser->current ?? '') . ' ', 2);
}

public function parse(Parser $parser): ?Token
{
$parser->consumeIncluding('- ');
$parser->consume(2);
$content = trim($parser->consumeUntil(Parser::NEW_LINE));
$parser->consumeWhile(Parser::NEW_LINE);
$newlines = $parser->consumeWhile(Parser::NEW_LINE);

$childContent = '';
$indent = strspn($parser->content, ' ', $parser->position);
Expand All @@ -34,19 +34,29 @@ public function parse(Parser $parser): ?Token

$parser->consume($indent);
$childContent .= $parser->consumeUntil(Parser::NEW_LINE) . PHP_EOL;
$parser->consumeWhile(Parser::NEW_LINE);
$newlines = $parser->consumeWhile(Parser::NEW_LINE);
}

$children = null;

if (substr_count($childContent, '-') > 0) {
if (preg_match('/(?:^|\n)[-*+] /', $childContent)) {
$children = $parser->withRules(new ListRule())->lex($childContent)[0];
}

if ($children === null && $childContent !== '') {
$content .= ' ' . trim(preg_replace('/\s+/u', ' ', $childContent) ?? '');
}

while ($children === null && ($newlines === "\n" || $newlines === "\r\n") && $parser->current !== null) {
$nextLine = substr($parser->content, $parser->position, strcspn($parser->content, Parser::NEW_LINE, $parser->position));
if (trim($nextLine) === '' || preg_match('/^(?:[-*+] |[0-9]+[.)] |#{1,6}[ \t]|> |`{3}|~{3})/', $nextLine)) {
break;
}

$content .= ' ' . trim($parser->consumeUntil(Parser::NEW_LINE));
$newlines = $parser->consumeWhile(Parser::NEW_LINE);
}

$item = new ListItem($content, $children);

if ($parser->lastToken instanceof ListToken) {
Expand Down
18 changes: 18 additions & 0 deletions tests/Rules/ListRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,24 @@ public function test_lex_multiple_items(): void
$this->assertSame('<ul><li>one</li><li>two</li></ul>', $html);
}

#[Test]
public function test_asterisk_and_plus_markers(): void
{
$parser = new Parser(highlighter: null, rules: [new ListRule()]);

$this->assertSame('<ul><li>one</li><li>two</li></ul>', (string) $parser->parse("* one\n* two"));
$this->assertSame('<ul><li>one</li><li>two</li></ul>', (string) $parser->parse("+ one\n+ two"));
}

#[Test]
public function test_lazy_continuation(): void
{
$parser = new Parser(highlighter: null, rules: [new ListRule()]);

$this->assertSame('<ul><li>one continued</li><li>two</li></ul>', (string) $parser->parse("- one\ncontinued\n- two"));
$this->assertSame('<ul><li>one continued</li></ul>', (string) $parser->parse("* one\ncontinued"));
}

#[Test]
public function test_lex_multiline_items(): void
{
Expand Down
Loading