Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions app/Factories/MarkdownFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
use League\CommonMark\Renderer\Inline\TextRenderer;
use League\CommonMark\Util\HtmlFilter;

use function rtrim;
use function strip_tags;
use function strtr;

Expand Down Expand Up @@ -123,7 +124,7 @@ public function markdown(string $markdown, Tree|null $tree = null): string

$html = $converter->convert($markdown)->getContent();

// The markdown convert adds newlines, but not in a documented way. Safest to ignore them.
return strtr($html, ["\n" => '']);
// The markdown convert adds newlines, remove the last one.
return rtrim($html, "\n");
}
}
19 changes: 17 additions & 2 deletions tests/Unit/Factories/MarkdownFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function testSoftLineBreaks(): void
);

self::assertSame(
'<p>alpha<br />beta<br />gamma<br />delta</p>',
"<p>alpha<br />beta<br />gamma<br />\ndelta</p>",
$factory->markdown("alpha\nbeta\ngamma \ndelta")
);
}
Expand All @@ -126,8 +126,23 @@ public function testMultipleParagraphs(): void
);

self::assertSame(
'<p>alpha<br />beta</p><p>gamma<br />delta</p>',
"<p>alpha<br />beta</p>\n<p>gamma<br />delta</p>",
$factory->markdown("alpha\nbeta\n\n\n\ngamma\ndelta")
);
}

public function testMarkdownCodeBlock(): void
{
$factory = new MarkdownFactory();
// code block within backticks
self::assertSame(
"<pre><code>alpha\n beta\n gamma\n delta\n</code></pre>",
$factory->markdown("````\nalpha\n beta\n gamma\n delta\n````")
);
// code block through indentation
self::assertSame(
"<pre><code>alpha\n beta\n gamma\n delta\n</code></pre>",
$factory->markdown(" alpha\n beta\n gamma\n delta")
);
}
}
Loading