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: update auto link parser

Steven2a6f054876c9
diff --git a/plugin/gomark/parser/auto_link.go b/plugin/gomark/parser/auto_link.go
index ec47eb0bc..7acd7e20b 100644
--- a/plugin/gomark/parser/auto_link.go
+++ b/plugin/gomark/parser/auto_link.go
@@ -2,6 +2,7 @@ package parser
import (
"errors"
+ "net/url"
"github.com/usememos/memos/plugin/gomark/ast"
"github.com/usememos/memos/plugin/gomark/parser/tokenizer"
@@ -17,24 +18,36 @@ func (*AutoLinkParser) Match(tokens []*tokenizer.Token) (int, bool) {
if len(tokens) < 3 {
return 0, false
}
- if tokens[0].Type != tokenizer.LessThan {
- return 0, false
+
+ hasAngleBrackets := false
+ if tokens[0].Type == tokenizer.LessThan {
+ hasAngleBrackets = true
}
- urlTokens := []*tokenizer.Token{}
- for _, token := range tokens[1:] {
+
+ contentTokens := []*tokenizer.Token{}
+ for _, token := range tokens {
if token.Type == tokenizer.Newline || token.Type == tokenizer.Space {
- return 0, false
+ break
}
- if token.Type == tokenizer.GreaterThan {
+ contentTokens = append(contentTokens, token)
+ if hasAngleBrackets && token.Type == tokenizer.GreaterThan {
break
}
- urlTokens = append(urlTokens, token)
}
- if 2+len(urlTokens) > len(tokens) {
+
+ if hasAngleBrackets && contentTokens[len(contentTokens)-1].Type != tokenizer.GreaterThan {
return 0, false
}
- return 2 + len(urlTokens), true
+ content := tokenizer.Stringify(contentTokens)
+ if !hasAngleBrackets {
+ u, err := url.Parse(content)
+ if err != nil || u.Scheme == "" || u.Host == "" {
+ return 0, false
+ }
+ }
+
+ return len(contentTokens), true
}
func (p *AutoLinkParser) Parse(tokens []*tokenizer.Token) (ast.Node, error) {
@@ -43,8 +56,11 @@ func (p *AutoLinkParser) Parse(tokens []*tokenizer.Token) (ast.Node, error) {
return nil, errors.New("not matched")
}
- urlTokens := tokens[1 : size-1]
+ url := tokenizer.Stringify(tokens[:size])
+ if tokens[0].Type == tokenizer.LessThan && tokens[len(tokens)-1].Type == tokenizer.GreaterThan {
+ url = tokenizer.Stringify(tokens[1 : len(tokens)-1])
+ }
return &ast.AutoLink{
- URL: tokenizer.Stringify(urlTokens),
+ URL: url,
}, nil
}
diff --git a/plugin/gomark/parser/auto_link_test.go b/plugin/gomark/parser/auto_link_test.go
index 4f3e315ce..582a26bda 100644
--- a/plugin/gomark/parser/auto_link_test.go
+++ b/plugin/gomark/parser/auto_link_test.go
@@ -24,7 +24,14 @@ func TestAutoLinkParser(t *testing.T) {
URL: "https://example.com",
},
},
+ {
+ text: "https://example.com",
+ link: &ast.AutoLink{
+ URL: "https://example.com",
+ },
+ },
}
+
for _, test := range tests {
tokens := tokenizer.Tokenize(test.text)
node, _ := NewAutoLinkParser().Parse(tokens)