✨ 支持 ==mark== 高亮语法 #84

88250 · Aug 22, 2020 · 7cac659 · 7cac659
1 parent 17f2dea
commit 7cac659
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/javascript/lute.min.js b/javascript/lute.min.js
diff --git a/javascript/lute.min.js.map b/javascript/lute.min.js.map
diff --git a/render/vditor_ir_renderer.go b/render/vditor_ir_renderer.go
@@ -151,12 +151,12 @@ func (r *VditorIRRenderer) renderMarkOpenMarker(node *ast.Node, entering bool) a
 	r.tag("span", [][]string{{"class", "vditor-ir__marker"}}, false)
 	r.WriteString("==")
 	r.tag("/span", nil, false)
-	r.tag("s", [][]string{{"data-newline", "1"}}, false)
+	r.tag("mark", [][]string{{"data-newline", "1"}}, false)
 	return ast.WalkStop
 }
 
 func (r *VditorIRRenderer) renderMarkCloseMarker(node *ast.Node, entering bool) ast.WalkStatus {
-	r.tag("/s", nil, false)
+	r.tag("/mark", nil, false)
 	r.tag("span", [][]string{{"class", "vditor-ir__marker"}}, false)
 	r.WriteString("==")
 	r.tag("/span", nil, false)

diff --git a/test/spinv_wysiwyg_test.go b/test/spinv_wysiwyg_test.go
@@ -18,6 +18,8 @@ import (
 
 var spinVditorDOMTests = []*parseTest{
 
+	{"147", "<p data-block=\"0\"><mark data-marker=\"==\">markf<wbr></mark></p>", "<p data-block=\"0\"><mark data-marker=\"==\">markf<wbr></mark></p>"},
+	{"146", "<p data-block=\"0\">==mark==<wbr></p>", "<p data-block=\"0\"><mark data-marker=\"==\">mark</mark><wbr></p>"},
 	{"145", "<p data-block=\"0\">foo<vditor-comment data-id=\"1\">bar<wbr>baz</vditor-comment>foo<vditor-comment data-id=\"2\">bar</vditor-comment>baz</p>", "<p data-block=\"0\">foo\u200b<vditor-comment data-id=\"1\">bar<wbr>baz\u200b</vditor-comment>foo\u200b<vditor-comment data-id=\"2\">bar\u200b</vditor-comment>baz</p>"},
 	{"144", "<p data-block=\"0\"><vditor-comment data-id=\"1\">foo<wbr></vditor-comment></p>", "<p data-block=\"0\">\u200b\u200b<vditor-comment data-id=\"1\">foo<wbr>\u200b</vditor-comment></p>"},
 	{"143", "<p data-block=\"0\"><img src=\"bar\" alt=\"text\" data-type=\"link-ref\" data-link-label=\"foo\"><wbr></p><div data-block=\"0\" data-type=\"link-ref-defs-block\">[foo]: bar\n</div>", "<p data-block=\"0\">\u200b<img src=\"bar\" alt=\"text\" data-type=\"link-ref\" data-link-label=\"foo\" /><wbr></p><div data-block=\"0\" data-type=\"link-ref-defs-block\">[foo]: bar\n</div>"},
@@ -172,6 +174,7 @@ func TestSpinVditorDOM(t *testing.T) {
 	luteEngine := lute.New()
 	luteEngine.ToC = true
 	luteEngine.Sanitize = true
+	luteEngine.Mark = true
 
 	for _, test := range spinVditorDOMTests {
 		html := luteEngine.SpinVditorDOM(test.from)

diff --git a/vditor_wysiwyg.go b/vditor_wysiwyg.go
@@ -1112,6 +1112,8 @@ func (lute *Lute) genASTByVditorDOM(n *html.Node, tree *parse.Tree) {
 		} else {
 			node.AppendChild(&ast.Node{Type: ast.NodeStrikethrough2CloseMarker, Tokens: []byte(marker)})
 		}
+	case atom.Mark:
+		node.AppendChild(&ast.Node{Type: ast.NodeMarkCloseMarker, Tokens: []byte("==")})
 	case atom.Details:
 		tree.Context.Tip.AppendChild(&ast.Node{Type: ast.NodeHTMLBlock, Tokens: []byte("</details>")})
 	}