Mirror/parsedown
1
0
Fork 0
mirror of https://github.com/erusev/parsedown.git synced 2024-09-20 03:51:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Generalise line parsing to return Inlines before applying state

Browse Source
This commit is contained in:
Aidan Woods 2019-01-22 19:04:45 +00:00
parent 083ad582c7
commit 576a2c4519
No known key found for this signature in database
GPG Key ID: 9A6A8EFAA512BBB9
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Parsedown.php
View File

@ -245,12 +245,25 @@ final class Parsedown
* @return StateRenderable[]
*/
public function line($text)
{
return \array_map(
/** @return StateRenderable */
function (Inline $Inline) { return $Inline->stateRenderable($this); },
$this->inlines($text)
);
}
/**
* @param string $text
* @return Inline[]
*/
public function inlines($text)
{
# standardize line breaks
$text = \str_replace(["\r\n", "\r"], "\n", $text);
/** @var StateRenderable[] */
$StateRenderables = [];
/** @var Inline[] */
$Inlines = [];
# $excerpt is based on the first occurrence of a marker
@ -285,12 +298,10 @@ final class Parsedown
# the text that comes before the inline
# compile the unmarked text
$StateRenderables[] = Plaintext::build($Excerpt->choppingUpToOffset($startPosition))
->stateRenderable($this)
;
$Inlines[] = Plaintext::build($Excerpt->choppingUpToOffset($startPosition));
# compile the inline
$StateRenderables[] = $Inline->stateRenderable($this);
$Inlines[] = $Inline;
# remove the examined text
/** @psalm-suppress LoopInvalidation */
@ -305,20 +316,16 @@ final class Parsedown
# the marker does not belong to an inline
$StateRenderables[] = Plaintext::build($Excerpt->choppingUpToOffset($startPosition + 1))
->stateRenderable($this)
;
$Inlines[] = Plaintext::build($Excerpt->choppingUpToOffset($startPosition + 1));
$text = \substr($Excerpt->text(), $startPosition + 1);
/** @psalm-suppress LoopInvalidation */
$Excerpt = $Excerpt->choppingFromOffset($startPosition + 1);
}
$StateRenderables[] = Plaintext::build($Excerpt->choppingFromOffset(0))
->stateRenderable($this)
;
$Inlines[] = Plaintext::build($Excerpt->choppingFromOffset(0));
return $StateRenderables;
return $Inlines;
}
/**