Skip to content

Fix docs parsing of CommonMark children #267

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

Open
ashfame wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fix docs parsing of CommonMark children #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions bin/build-reference.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ function render_nodes( array $nodes ): string {
return rtrim( (string) $renderer->renderNodes( $nodes ) );
}

function node_children( Node $node ): array {
$children = $node->children();

return is_array( $children ) ? $children : iterator_to_array( $children );
}

/**
* Render the lede as inline HTML, without an outer `<p>`. If the lede
* is a single Paragraph (the catalog convention), render its inline
Expand All @@ -123,7 +129,7 @@ function render_nodes( array $nodes ): string {
function render_lede( array $nodes ): string {
$renderer = new HtmlRenderer( commonmark_env() );
if ( 1 === count( $nodes ) && $nodes[0] instanceof Paragraph ) {
$inline = iterator_to_array( $nodes[0]->children() );
$inline = node_children( $nodes[0] );
return rtrim( (string) $renderer->renderNodes( $inline ) );
}
return rtrim( (string) $renderer->renderNodes( $nodes ) );
Expand All @@ -148,7 +154,7 @@ function parse_body( string $md ): array {
/** @var Document $doc */
$doc = $parser->parse( $md );

$children = iterator_to_array( $doc->children() );
$children = node_children( $doc );

// Find section boundaries (top-level H2 headings).
$boundaries = array();
Expand Down
2 changes: 1 addition & 1 deletion bin/run-snippets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ function write_expected_output( string $slug, string $filename, string $new_outp

$parser = new \League\CommonMark\Parser\MarkdownParser( commonmark_env() );
$tree = $parser->parse( $body );
$kids = iterator_to_array( $tree->children() );
$kids = node_children( $tree );

// Find the snippet metadata HtmlBlock whose meta names this filename.
$snippet_idx = null;
Expand Down
Loading