From 5b120e28eb5efd6b534a1fdfb25f5e80a054fe42 Mon Sep 17 00:00:00 2001 From: Aleksei Lebedev <1329824+LastDragon-ru@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:26:35 +0400 Subject: [PATCH] Code cleanup. --- .../documentator/src/Markdown/Environment/Locator.php | 5 ++++- .../Environment/Parsers/BlockStartParserWrapper.php | 3 +-- .../Markdown/Environment/Parsers/InlineParserWrapper.php | 8 ++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/documentator/src/Markdown/Environment/Locator.php b/packages/documentator/src/Markdown/Environment/Locator.php index 084f7c2eb..396eb3b4c 100644 --- a/packages/documentator/src/Markdown/Environment/Locator.php +++ b/packages/documentator/src/Markdown/Environment/Locator.php @@ -24,9 +24,12 @@ use WeakMap; use function array_key_first; +use function array_key_last; use function array_slice; use function assert; +use function mb_strlen; use function mb_strpos; +use function mb_substr; use function preg_split; // todo(documentator): Internal padding for Location @@ -149,7 +152,7 @@ private function getParagraphLocation(Paragraph $node): ?Location { $parent instanceof BlockQuote => 2, default => 0, }; - $parent = $parent->parent(); + $parent = $parent->parent(); } while ($parent instanceof Node); } diff --git a/packages/documentator/src/Markdown/Environment/Parsers/BlockStartParserWrapper.php b/packages/documentator/src/Markdown/Environment/Parsers/BlockStartParserWrapper.php index 3a262557e..e08c3d497 100644 --- a/packages/documentator/src/Markdown/Environment/Parsers/BlockStartParserWrapper.php +++ b/packages/documentator/src/Markdown/Environment/Parsers/BlockStartParserWrapper.php @@ -15,8 +15,7 @@ /** * @internal */ -readonly class BlockStartParserWrapper - implements BlockStartParserInterface, EnvironmentAwareInterface, ConfigurationAwareInterface { +readonly class BlockStartParserWrapper implements BlockStartParserInterface, EnvironmentAwareInterface, ConfigurationAwareInterface { use Aware; public function __construct( diff --git a/packages/documentator/src/Markdown/Environment/Parsers/InlineParserWrapper.php b/packages/documentator/src/Markdown/Environment/Parsers/InlineParserWrapper.php index 258f6a021..c0a652243 100644 --- a/packages/documentator/src/Markdown/Environment/Parsers/InlineParserWrapper.php +++ b/packages/documentator/src/Markdown/Environment/Parsers/InlineParserWrapper.php @@ -23,10 +23,14 @@ use function implode; use function mb_strlen; use function mb_substr; +use function mb_substr_count; +use function reset; use function str_replace; /** * todo(documentator): [league/commonmark] [update] Check {@see Environment::injectEnvironmentAndConfigurationIfNeeded()}. + * + * @see Environment */ /** @@ -96,8 +100,8 @@ public function parse(InlineParserContext $inlineContext): bool { if ($beforeLinesCount > 0) { $correction = (mb_strlen(implode("\n", array_slice($beforeLines, 0, -1))) + 1); - $offset -= $correction; - $origin -= $correction; + $offset -= $correction; + // $origin -= $correction; } if ($startLine !== $endLine) {