Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: implement list html render
Steven6421fbc68a84
diff --git a/plugin/gomark/parser/ordered_list.go b/plugin/gomark/parser/ordered_list.goindex 4e01b4760..b4c2f151b 100644--- a/plugin/gomark/parser/ordered_list.go+++ b/plugin/gomark/parser/ordered_list.go@@ -43,6 +43,10 @@ func (p *OrderedListParser) Parse(tokens []*tokenizer.Token) (ast.Node, error) {}contentTokens := tokens[3:size]+ lastToken := contentTokens[len(contentTokens)-1]+ if lastToken.Type == tokenizer.Newline {+ contentTokens = contentTokens[:len(contentTokens)-1]+ }children, err := ParseInline(contentTokens)if err != nil {return nil, errdiff --git a/plugin/gomark/parser/parser.go b/plugin/gomark/parser/parser.goindex 3f97ef0db..9be62f5a5 100644--- a/plugin/gomark/parser/parser.go+++ b/plugin/gomark/parser/parser.go@@ -30,6 +30,8 @@ var defaultBlockParsers = []BlockParser{NewHorizontalRuleParser(),NewHeadingParser(),NewBlockquoteParser(),+ NewUnorderedListParser(),+ NewOrderedListParser(),NewParagraphParser(),NewLineBreakParser(),}diff --git a/plugin/gomark/parser/unordered_list.go b/plugin/gomark/parser/unordered_list.goindex c64daeb17..b98ca9c62 100644--- a/plugin/gomark/parser/unordered_list.go+++ b/plugin/gomark/parser/unordered_list.go@@ -24,10 +24,10 @@ func (*UnorderedListParser) Match(tokens []*tokenizer.Token) (int, bool) {contentTokens := []*tokenizer.Token{}for _, token := range tokens[2:] {+ contentTokens = append(contentTokens, token)if token.Type == tokenizer.Newline {break}- contentTokens = append(contentTokens, token)}if len(contentTokens) == 0 {return 0, false@@ -44,6 +44,10 @@ func (p *UnorderedListParser) Parse(tokens []*tokenizer.Token) (ast.Node, error)symbolToken := tokens[0]contentTokens := tokens[2:size]+ lastToken := contentTokens[len(contentTokens)-1]+ if lastToken.Type == tokenizer.Newline {+ contentTokens = contentTokens[:len(contentTokens)-1]+ }children, err := ParseInline(contentTokens)if err != nil {return nil, errdiff --git a/plugin/gomark/render/html/html.go b/plugin/gomark/render/html/html.goindex 46f90bc66..ca67a52e0 100644--- a/plugin/gomark/render/html/html.go+++ b/plugin/gomark/render/html/html.go@@ -39,6 +39,10 @@ func (r *HTMLRender) RenderNode(node ast.Node) {r.renderHorizontalRule(n)case *ast.Blockquote:r.renderBlockquote(n)+ case *ast.UnorderedList:+ r.renderUnorderedList(n)+ case *ast.OrderedList:+ r.renderOrderedList(n)case *ast.Bold:r.renderBold(n)case *ast.Italic:@@ -113,6 +117,32 @@ func (r *HTMLRender) renderBlockquote(node *ast.Blockquote) {}}+func (r *HTMLRender) renderUnorderedList(node *ast.UnorderedList) {+ prevSibling, nextSibling := node.PrevSibling(), node.NextSibling()+ if prevSibling == nil || prevSibling.Type() != ast.UnorderedListNode {+ r.output.WriteString("<ul>")+ }+ r.output.WriteString("<li>")+ r.RenderNodes(node.Children)+ r.output.WriteString("</li>")+ if nextSibling == nil || nextSibling.Type() != ast.UnorderedListNode {+ r.output.WriteString("</ul>")+ }+}++func (r *HTMLRender) renderOrderedList(node *ast.OrderedList) {+ prevSibling, nextSibling := node.PrevSibling(), node.NextSibling()+ if prevSibling == nil || prevSibling.Type() != ast.OrderedListNode {+ r.output.WriteString("<ol>")+ }+ r.output.WriteString("<li>")+ r.RenderNodes(node.Children)+ r.output.WriteString("</li>")+ if nextSibling == nil || nextSibling.Type() != ast.OrderedListNode {+ r.output.WriteString("</ol>")+ }+}+func (r *HTMLRender) renderText(node *ast.Text) {r.output.WriteString(node.Content)}diff --git a/plugin/gomark/render/html/html_test.go b/plugin/gomark/render/html/html_test.goindex 25164254d..f497af459 100644--- a/plugin/gomark/render/html/html_test.go+++ b/plugin/gomark/render/html/html_test.go@@ -34,6 +34,14 @@ func TestHTMLRender(t *testing.T) {text: "#article #memo",expected: `<p><span>#article</span> <span>#memo</span></p>`,},+ {+ text: "* Hello\n* world!",+ expected: `<ul><li>Hello</li><li>world!</li></ul>`,+ },+ {+ text: "1. Hello\n2. world\n* !",+ expected: `<ol><li>Hello</li><li>world</li></ol><ul><li>!</li></ul>`,+ },}for _, test := range tests {