🎨 Vditor 支持 Fix Vanessa219/vditor#170

88250 · Feb 24, 2020 · 2a23254 · 2a23254
1 parent 84fa000
commit 2a23254
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 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/test/spinv_test.go b/test/spinv_test.go
@@ -20,6 +20,7 @@ import (
 
 var spinVditorDOMTests = []*parseTest{
 
+	{"97", "<p data-block=\"0\"><strong data-marker=\"**\">foo\n</strong>b<wbr></p>", "<p data-block=\"0\"><strong data-marker=\"**\">foo</strong>\nb<wbr>\n</p>"},
 	{"96", "<p data-block=\"0\"><code marker=\"`\">\u200bcode<wbr></code><code marker=\"`\">\u200bspan</code><span>\u200b</span></p>", "<p data-block=\"0\">\u200b<code marker=\"`\">\u200bcode<wbr>span</code>\u200b\n</p>"},
 	{"95", "<p data-block=\"0\"><strong><em><wbr>\u200b</em></strong></p>", ""},
 	{"94", "<p data-block=\"0\">\u200b<code marker=\"`\">\u200bcode\nspan<wbr></code>\u200b\n</p>", "<p data-block=\"0\">\u200b<code marker=\"`\">\u200bcode span<wbr></code>\u200b\n</p>"},

diff --git a/vditor.go b/vditor.go
@@ -475,6 +475,10 @@ func (lute *Lute) genASTByVditorDOM(n *html.Node, tree *parse.Tree) {
 			n.FirstChild.Data = strings.TrimRight(n.FirstChild.Data, " ")
 			n.InsertAfter(&html.Node{Type: html.TextNode, Data: " "})
 		}
+		if strings.HasSuffix(n.FirstChild.Data, "\n") {
+			n.FirstChild.Data = strings.TrimRight(n.FirstChild.Data, "\n")
+			n.InsertAfter(&html.Node{Type: html.TextNode, Data: "\n"})
+		}
 
 		tree.Context.Tip = node
 		defer tree.Context.ParentTip()
@@ -524,6 +528,10 @@ func (lute *Lute) genASTByVditorDOM(n *html.Node, tree *parse.Tree) {
 			n.FirstChild.Data = strings.TrimRight(n.FirstChild.Data, " ")
 			n.InsertAfter(&html.Node{Type: html.TextNode, Data: " "})
 		}
+		if strings.HasSuffix(n.FirstChild.Data, "\n") {
+			n.FirstChild.Data = strings.TrimRight(n.FirstChild.Data, "\n")
+			n.InsertAfter(&html.Node{Type: html.TextNode, Data: "\n"})
+		}
 
 		tree.Context.Tip = node
 		defer tree.Context.ParentTip()
@@ -562,7 +570,6 @@ func (lute *Lute) genASTByVditorDOM(n *html.Node, tree *parse.Tree) {
 		}
 
 		n.FirstChild.Data = strings.ReplaceAll(n.FirstChild.Data, parse.Zwsp, "")
-
 		if strings.HasPrefix(n.FirstChild.Data, " ") {
 			n.FirstChild.Data = strings.TrimLeft(n.FirstChild.Data, " ")
 			node.InsertBefore(&ast.Node{Type: ast.NodeText, Tokens: []byte(" ")})
@@ -571,6 +578,10 @@ func (lute *Lute) genASTByVditorDOM(n *html.Node, tree *parse.Tree) {
 			n.FirstChild.Data = strings.TrimRight(n.FirstChild.Data, " ")
 			n.InsertAfter(&html.Node{Type: html.TextNode, Data: " "})
 		}
+		if strings.HasSuffix(n.FirstChild.Data, "\n") {
+			n.FirstChild.Data = strings.TrimRight(n.FirstChild.Data, "\n")
+			n.InsertAfter(&html.Node{Type: html.TextNode, Data: "\n"})
+		}
 
 		tree.Context.Tip = node
 		defer tree.Context.ParentTip()