RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 15:07:45 +00:00
Code Issues Activity Actions

LibMarkdown: Rewrite Inline text parser to be more forgiving

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

21
Userland/Libraries/LibMarkdown/Table.cpp
View file

@ -16,9 +16,7 @@ String Table::render_for_terminal(size_t view_width) const
StringBuilder builder;
auto write_aligned = [&](const auto& text, auto width, auto alignment) {
size_t original_length = 0;
for (auto& span : text.spans())
original_length += span.text.length();
size_t original_length = text.terminal_length();
auto string = text.render_for_terminal();
if (alignment == Alignment::Center) {
auto padding_length = (width - original_length) / 2;
@ -137,11 +135,8 @@ OwnPtr<Table> Table::parse(Vector<StringView>::ConstIterator& lines)
table->m_columns.resize(header_delimiters.size());
for (size_t i = 0; i < header_segments.size(); ++i) {
auto text_option = Text::parse(header_segments[i]);
if (!text_option.has_value())
return {}; // An invalid 'text' in the header should just fail the table parse.
auto text = Text::parse(header_segments[i]);
auto text = text_option.release_value();
auto& column = table->m_columns[i];
column.header = move(text);
@ -199,16 +194,10 @@ OwnPtr<Table> Table::parse(Vector<StringView>::ConstIterator& lines)
if (i >= segments.size()) {
// Ran out of segments, but still have headers.
// Just make an empty cell.
table->m_columns[i].rows.append(Text { "" });
table->m_columns[i].rows.append(Text::parse(""));
} else {
auto text_option = Text::parse(segments[i]);
// We treat an invalid 'text' as a literal.
if (text_option.has_value()) {
auto text = text_option.release_value();
table->m_columns[i].rows.append(move(text));
} else {
table->m_columns[i].rows.append(Text { segments[i] });
}
auto text = Text::parse(segments[i]);
table->m_columns[i].rows.append(move(text));
}
}
}