RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:48:10 +00:00
Code Issues Activity Actions

LibMarkdown: Parse paragraphs line-wise

Browse source 
This gets rid of the doubled-up checks in `Paragraph::parse()`, and
makes a paragraph the last possible kind of block to be parsed.
This commit is contained in:
AnotherTest 2020-09-20 20:42:23 +04:30 • committed by Andreas Kling
parent 176a2f193c
commit eef794b8c6
3 changed files with 61 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Libraries/LibMarkdown/Paragraph.cpp
View file

@ -33,7 +33,13 @@ String Paragraph::render_to_html() const
{
StringBuilder builder;
builder.appendf("<p>");
builder.append(m_text.render_to_html());
bool first = true;
for (auto& line : m_lines) {
if (!first)
builder.append(' ');
first = false;
builder.append(line.text().render_to_html());
}
builder.appendf("</p>\n");
return builder.build();
}
@ -41,58 +47,26 @@ String Paragraph::render_to_html() const
String Paragraph::render_for_terminal(size_t) const
{
StringBuilder builder;
builder.append(m_text.render_for_terminal());
bool first = true;
for (auto& line : m_lines) {
if (!first)
builder.append(' ');
first = false;
builder.append(line.text().render_for_terminal());
}
builder.appendf("\n\n");
return builder.build();
}
OwnPtr<Paragraph> Paragraph::parse(Vector<StringView>::ConstIterator& lines)
OwnPtr<Paragraph::Line> Paragraph::Line::parse(Vector<StringView>::ConstIterator& lines)
{
if (lines.is_end())
return nullptr;
bool first = true;
StringBuilder builder;
while (true) {
if (lines.is_end())
break;
StringView line = *lines;
if (line.is_empty())
break;
char ch = line[0];
// See if it looks like a blockquote
// or like an indented block.
if (ch == '>' || ch == ' ')
break;
if (line.length() > 1) {
// See if it looks like a heading.
if (ch == '#' && (line[1] == '#' || line[1] == ' '))
break;
// See if it looks like a code block.
if (ch == '`' && line[1] == '`')
break;
// See if it looks like a list.
if (ch == '*' || ch == '-')
if (line[1] == ' ')
break;
}
if (!first)
builder.append(' ');
builder.append(line);
first = false;
++lines;
}
if (first)
return nullptr;
auto text = Text::parse(builder.build());
auto text = Text::parse(*lines++);
if (!text.has_value())
return nullptr;
return make<Paragraph>(move(text.value()));
return make<Paragraph::Line>(text.release_value());
}
}