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

LibMarkdown: Change internal MD API to return OwnPtrs

Browse source 
Previously, all Markdown blocks had a virtual parse method which has
been swapped out for a static parse method returning an OwnPtr of
that block's type.

The Text class also now has a static parse method that will return an
Optional<Text>.
This commit is contained in:
FalseHonesty 2020-05-18 16:58:00 -04:00 • committed by Andreas Kling
parent 7ca562b200
commit 20faa93cb0
15 changed files with 110 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Libraries/LibMarkdown/Text.cpp
View file

@ -181,12 +181,13 @@ String Text::render_for_terminal() const
return builder.build();
}
bool Text::parse(const StringView& str)
Optional<Text> Text::parse(const StringView& str)
{
Style current_style;
size_t current_span_start = 0;
int first_span_in_the_current_link = -1;
bool current_link_is_actually_img = false;
Vector<Span> spans;
auto append_span_if_needed = [&](size_t offset) {
ASSERT(current_span_start <= offset);
@ -195,7 +196,7 @@ bool Text::parse(const StringView& str)
unescape(str.substring_view(current_span_start, offset - current_span_start)),
current_style
};
m_spans.append(move(span));
spans.append(move(span));
current_span_start = offset;
}
};
@ -239,7 +240,7 @@ bool Text::parse(const StringView& str)
case '[':
if (first_span_in_the_current_link != -1)
dbg() << "Dropping the outer link";
first_span_in_the_current_link = m_spans.size();
first_span_in_the_current_link = spans.size();
break;
case ']': {
if (first_span_in_the_current_link == -1) {
@ -262,11 +263,11 @@ bool Text::parse(const StringView& str)
offset--;
const StringView href = str.substring_view(start_of_href, offset - start_of_href);
for (size_t i = first_span_in_the_current_link; i < m_spans.size(); i++) {
for (size_t i = first_span_in_the_current_link; i < spans.size(); i++) {
if (current_link_is_actually_img)
m_spans[i].style.img = href;
spans[i].style.img = href;
else
m_spans[i].style.href = href;
spans[i].style.href = href;
}
break;
}
@ -282,7 +283,7 @@ bool Text::parse(const StringView& str)
append_span_if_needed(str.length());
return true;
return Text(move(spans));
}
}