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 referenced content node
Stevena316e239ce0b
diff --git a/plugin/gomark/ast/ast.go b/plugin/gomark/ast/ast.goindex 083ebc6cc..090076465 100644--- a/plugin/gomark/ast/ast.go+++ b/plugin/gomark/ast/ast.go@@ -33,6 +33,7 @@ const (HighlightNodeSubscriptNodeSuperscriptNode+ ReferencedContentNode)type Node interface {diff --git a/plugin/gomark/ast/block.go b/plugin/gomark/ast/block.goindex d54f80a79..f735d9733 100644--- a/plugin/gomark/ast/block.go+++ b/plugin/gomark/ast/block.go@@ -241,9 +241,10 @@ func (*EmbeddedContent) Type() NodeType {}func (n *EmbeddedContent) Restore() string {- result := fmt.Sprintf("![[%s]]", n.ResourceName)+ params := ""if n.Params != "" {- result += fmt.Sprintf("?%s", n.Params)+ params = fmt.Sprintf("?%s", n.Params)}+ result := fmt.Sprintf("![[%s%s]]", n.ResourceName, params)return result}diff --git a/plugin/gomark/ast/inline.go b/plugin/gomark/ast/inline.goindex cbc5b7167..f0c4a3f28 100644--- a/plugin/gomark/ast/inline.go+++ b/plugin/gomark/ast/inline.go@@ -233,3 +233,23 @@ func (*Superscript) Type() NodeType {func (n *Superscript) Restore() string {return fmt.Sprintf("^%s^", n.Content)}++type ReferencedContent struct {+ BaseInline++ ResourceName string+ Params string+}++func (*ReferencedContent) Type() NodeType {+ return ReferencedContentNode+}++func (n *ReferencedContent) Restore() string {+ params := ""+ if n.Params != "" {+ params = fmt.Sprintf("?%s", n.Params)+ }+ result := fmt.Sprintf("[[%s%s]]", n.ResourceName, params)+ return result+}diff --git a/plugin/gomark/parser/embedded_content.go b/plugin/gomark/parser/embedded_content.goindex c42b8dd87..7bb407a27 100644--- a/plugin/gomark/parser/embedded_content.go+++ b/plugin/gomark/parser/embedded_content.go@@ -13,7 +13,7 @@ func NewEmbeddedContentParser() *EmbeddedContentParser {func (*EmbeddedContentParser) Match(tokens []*tokenizer.Token) (ast.Node, int) {matchedTokens := tokenizer.GetFirstLine(tokens)- if len(matchedTokens) < 5 {+ if len(matchedTokens) < 6 {return nil, 0}if matchedTokens[0].Type != tokenizer.ExclamationMark || matchedTokens[1].Type != tokenizer.LeftSquareBracket || matchedTokens[2].Type != tokenizer.LeftSquareBracket {diff --git a/plugin/gomark/parser/parser.go b/plugin/gomark/parser/parser.goindex e74441172..403d22f67 100644--- a/plugin/gomark/parser/parser.go+++ b/plugin/gomark/parser/parser.go@@ -80,6 +80,7 @@ var defaultInlineParsers = []InlineParser{NewSubscriptParser(),NewSuperscriptParser(),NewMathParser(),+ NewReferencedContentParser(),NewTagParser(),NewStrikethroughParser(),NewLineBreakParser(),diff --git a/plugin/gomark/parser/referenced_content.go b/plugin/gomark/parser/referenced_content.gonew file mode 100644index 000000000..50c479c5e--- /dev/null+++ b/plugin/gomark/parser/referenced_content.go@@ -0,0 +1,45 @@+package parser++import (+ "github.com/usememos/memos/plugin/gomark/ast"+ "github.com/usememos/memos/plugin/gomark/parser/tokenizer"+)++type ReferencedContentParser struct{}++func NewReferencedContentParser() *ReferencedContentParser {+ return &ReferencedContentParser{}+}++func (*ReferencedContentParser) Match(tokens []*tokenizer.Token) (ast.Node, int) {+ matchedTokens := tokenizer.GetFirstLine(tokens)+ if len(matchedTokens) < 5 {+ return nil, 0+ }+ if matchedTokens[0].Type != tokenizer.LeftSquareBracket || matchedTokens[1].Type != tokenizer.LeftSquareBracket {+ return nil, 0+ }++ contentTokens := []*tokenizer.Token{}+ matched := false+ for index, token := range matchedTokens[2 : len(matchedTokens)-1] {+ if token.Type == tokenizer.RightSquareBracket && matchedTokens[2+index+1].Type == tokenizer.RightSquareBracket {+ matched = true+ break+ }+ contentTokens = append(contentTokens, token)+ }+ if !matched {+ return nil, 0+ }++ resourceName, params := tokenizer.Stringify(contentTokens), ""+ questionMarkIndex := tokenizer.FindUnescaped(contentTokens, tokenizer.QuestionMark)+ if questionMarkIndex > 0 {+ resourceName, params = tokenizer.Stringify(contentTokens[:questionMarkIndex]), tokenizer.Stringify(contentTokens[questionMarkIndex+1:])+ }+ return &ast.ReferencedContent{+ ResourceName: resourceName,+ Params: params,+ }, len(contentTokens) + 4+}diff --git a/plugin/gomark/parser/referenced_content_test.go b/plugin/gomark/parser/referenced_content_test.gonew file mode 100644index 000000000..a490f9621--- /dev/null+++ b/plugin/gomark/parser/referenced_content_test.go@@ -0,0 +1,61 @@+package parser++import (+ "testing"++ "github.com/stretchr/testify/require"++ "github.com/usememos/memos/plugin/gomark/ast"+ "github.com/usememos/memos/plugin/gomark/parser/tokenizer"+ "github.com/usememos/memos/plugin/gomark/restore"+)++func TestReferencedContentParser(t *testing.T) {+ tests := []struct {+ text string+ referencedContent ast.Node+ }{+ {+ text: "[[Hello world]",+ referencedContent: nil,+ },+ {+ text: "[[Hello world]]",+ referencedContent: &ast.ReferencedContent{+ ResourceName: "Hello world",+ },+ },+ {+ text: "[[memos/1]]",+ referencedContent: &ast.ReferencedContent{+ ResourceName: "memos/1",+ },+ },+ {+ text: "[[resources/101]]111\n123",+ referencedContent: &ast.ReferencedContent{+ ResourceName: "resources/101",+ },+ },+ {+ text: "[[resources/101?align=center]]",+ referencedContent: &ast.ReferencedContent{+ ResourceName: "resources/101",+ Params: "align=center",+ },+ },+ {+ text: "[[resources/6uxnhT98q8vN8anBbUbRGu?align=center]]",+ referencedContent: &ast.ReferencedContent{+ ResourceName: "resources/6uxnhT98q8vN8anBbUbRGu",+ Params: "align=center",+ },+ },+ }++ for _, test := range tests {+ tokens := tokenizer.Tokenize(test.text)+ node, _ := NewReferencedContentParser().Match(tokens)+ require.Equal(t, restore.Restore([]ast.Node{test.referencedContent}), restore.Restore([]ast.Node{node}))+ }+}