Skip to content

armgit / memos

Public Imported from GitHub
0

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.

chore: add line break node

Stevendd83782522b6
diff --git a/plugin/gomark/ast/block.go b/plugin/gomark/ast/block.go
index fcbe89c5b..236db0e9b 100644
--- a/plugin/gomark/ast/block.go
+++ b/plugin/gomark/ast/block.go
@@ -3,6 +3,20 @@ package ast
type BaseBlock struct {
}
+type LineBreak struct {
+ BaseBlock
+}
+
+var NodeTypeLineBreak = NewNodeType("LineBreak")
+
+func NewLineBreak() *LineBreak {
+ return &LineBreak{}
+}
+
+func (*LineBreak) Type() NodeType {
+ return NodeTypeLineBreak
+}
+
type Paragraph struct {
BaseBlock
diff --git a/plugin/gomark/parser/line_break.go b/plugin/gomark/parser/line_break.go
new file mode 100644
index 000000000..46a833e56
--- /dev/null
+++ b/plugin/gomark/parser/line_break.go
@@ -0,0 +1,33 @@
+package parser
+
+import (
+ "github.com/usememos/memos/plugin/gomark/ast"
+ "github.com/usememos/memos/plugin/gomark/parser/tokenizer"
+)
+
+type LineBreakParser struct{}
+
+var defaultLineBreakParser = &LineBreakParser{}
+
+func NewLineBreakParser() *LineBreakParser {
+ return defaultLineBreakParser
+}
+
+func (*LineBreakParser) Match(tokens []*tokenizer.Token) (int, bool) {
+ if len(tokens) == 0 {
+ return 0, false
+ }
+ if tokens[0].Type != tokenizer.Newline {
+ return 0, false
+ }
+ return 1, true
+}
+
+func (p *LineBreakParser) Parse(tokens []*tokenizer.Token) ast.Node {
+ size, ok := p.Match(tokens)
+ if size == 0 || !ok {
+ return nil
+ }
+
+ return ast.NewLineBreak()
+}
diff --git a/plugin/gomark/parser/parser.go b/plugin/gomark/parser/parser.go
index 7024d3c1c..c82fa50d5 100644
--- a/plugin/gomark/parser/parser.go
+++ b/plugin/gomark/parser/parser.go
@@ -26,7 +26,9 @@ type BlockParser interface {
func Parse(tokens []*tokenizer.Token) []ast.Node {
nodes := []ast.Node{}
blockParsers := []BlockParser{
+ NewCodeBlockParser(),
NewParagraphParser(),
+ NewLineBreakParser(),
}
for len(tokens) > 0 {
for _, blockParser := range blockParsers {
diff --git a/plugin/gomark/parser/parser_test.go b/plugin/gomark/parser/parser_test.go
index 17a561bc5..30460e3bb 100644
--- a/plugin/gomark/parser/parser_test.go
+++ b/plugin/gomark/parser/parser_test.go
@@ -61,6 +61,30 @@ func TestParser(t *testing.T) {
},
},
},
+ {
+ text: "Hello **world**!\n```javascript\nconsole.log(\"Hello world!\");\n```",
+ nodes: []ast.Node{
+ &ast.Paragraph{
+ Children: []ast.Node{
+ &ast.Text{
+ Content: "Hello ",
+ },
+ &ast.Bold{
+ Symbol: "*",
+ Content: "world",
+ },
+ &ast.Text{
+ Content: "!",
+ },
+ },
+ },
+ &ast.LineBreak{},
+ &ast.CodeBlock{
+ Language: "javascript",
+ Content: "console.log(\"Hello world!\");",
+ },
+ },
+ },
}
for _, test := range tests {