1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 13:57:35 +00:00

LibMarkdown: Rewrite Inline text parser to be more forgiving

The previous Text::parse was not able to give up on parsing a textual
element, and just leave it as plain text. Because this is a very
important part of markdown, I fully rewrote the parser to support this
without having to backtrack. Also the parser now some other little
features, such ast delimiter runs and flanking.
This commit is contained in:
Peter Elliott 2021-09-06 19:11:46 -06:00 committed by Andreas Kling
parent 80e58dab9a
commit ec9f892899
10 changed files with 462 additions and 397 deletions

View file

@ -10,51 +10,24 @@
namespace Markdown {
Text::Style CodeBlock::style() const
{
if (m_style_spec.spans().is_empty())
return {};
return m_style_spec.spans()[0].style;
}
String CodeBlock::style_language() const
{
if (m_style_spec.spans().is_empty())
return {};
return m_style_spec.spans()[0].text;
}
String CodeBlock::render_to_html() const
{
StringBuilder builder;
String style_language = this->style_language();
Text::Style style = this->style();
builder.append("<pre>");
if (style.strong)
builder.append("<b>");
if (style.emph)
builder.append("<em>");
if (style_language.is_empty())
if (m_language.is_empty())
builder.append("<code>");
else
builder.appendff("<code class=\"{}\">", escape_html_entities(style_language));
builder.appendff("<code class=\"{}\">", escape_html_entities(m_language));
if (style_language == "js")
if (m_language == "js")
builder.append(JS::MarkupGenerator::html_from_source(m_code));
else
builder.append(escape_html_entities(m_code));
builder.append("\n</code>");
if (style.emph)
builder.append("</em>");
if (style.strong)
builder.append("</b>");
builder.append("</pre>\n");
return builder.build();
@ -64,28 +37,7 @@ String CodeBlock::render_for_terminal(size_t) const
{
StringBuilder builder;
Text::Style style = this->style();
bool needs_styling = style.strong || style.emph;
if (needs_styling) {
builder.append("\033[");
bool first = true;
if (style.strong) {
builder.append('1');
first = false;
}
if (style.emph) {
if (!first)
builder.append(';');
builder.append('4');
}
builder.append('m');
}
builder.append(m_code);
if (needs_styling)
builder.append("\033[0m");
builder.append("\n\n");
return builder.build();
@ -102,21 +54,7 @@ OwnPtr<CodeBlock> CodeBlock::parse(Vector<StringView>::ConstIterator& lines)
if (!line.starts_with(tick_tick_tick))
return {};
// Our Markdown extension: we allow
// specifying a style and a language
// for a code block, like so:
//
// ```**sh**
// $ echo hello friends!
// ````
//
// The code block will be made bold,
// and if possible syntax-highlighted
// as appropriate for a shell script.
StringView style_spec = line.substring_view(3, line.length() - 3);
auto spec = Text::parse(style_spec);
if (!spec.has_value())
return {};
++lines;
@ -136,7 +74,7 @@ OwnPtr<CodeBlock> CodeBlock::parse(Vector<StringView>::ConstIterator& lines)
first = false;
}
return make<CodeBlock>(move(spec.value()), builder.build());
return make<CodeBlock>(style_spec, builder.build());
}
}