RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:37:35 +00:00
Code Issues Activity Actions

LibMarkdown: Change MD Document parse API to return a RefPtr

Browse source 
Markdown documents are now obtained via the static Document::parse
method, which returns a RefPtr<Document>, or nullptr on failure.
This commit is contained in:
FalseHonesty 2020-05-11 13:55:31 -04:00 • committed by Andreas Kling
parent 9a2177437b
commit 7ca562b200
8 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Libraries/LibMarkdown/Document.cpp
View file

@ -75,25 +75,29 @@ static bool helper(Vector<StringView>::ConstIterator& lines, NonnullOwnPtrVector
return true;
}
bool Document::parse(const StringView& str)
RefPtr<Document> Document::parse(const StringView& str)
{
const Vector<StringView> lines_vec = str.lines();
auto lines = lines_vec.begin();
auto document = adopt(*new Document);
auto& blocks = document->m_blocks;
while (true) {
if (lines.is_end())
return true;
break;
if ((*lines).is_empty()) {
++lines;
continue;
}
bool any = helper<List>(lines, m_blocks) || helper<Paragraph>(lines, m_blocks) || helper<CodeBlock>(lines, m_blocks) || helper<Heading>(lines, m_blocks);
bool any = helper<List>(lines, blocks) || helper<Paragraph>(lines, blocks) || helper<CodeBlock>(lines, blocks) || helper<Heading>(lines, blocks);
if (!any)
return false;
return nullptr;
}
return document;
}
}

4
Libraries/LibMarkdown/Document.h
View file

@ -32,12 +32,12 @@
namespace Markdown {
class Document final {
class Document final : public RefCounted<Document> {
public:
String render_to_html() const;
String render_for_terminal() const;
bool parse(const StringView&);
static RefPtr<Document> parse(const StringView&);
private:
NonnullOwnPtrVector<Block> m_blocks;

6
Libraries/LibWeb/PageView.cpp
View file

@ -332,11 +332,11 @@ void PageView::reload()
static RefPtr<Document> create_markdown_document(const ByteBuffer& data, const URL& url)
{
Markdown::Document markdown_document;
if (!markdown_document.parse(data))
auto markdown_document = Markdown::Document::parse(data);
if (!markdown_document)
return nullptr;
return parse_html_document(markdown_document.render_to_html(), url);
return parse_html_document(markdown_document->render_to_html(), url);
}
static RefPtr<Document> create_text_document(const ByteBuffer& data, const URL& url)