✨ 所见即所得模式加入评论 Vanessa219/vditor#721

88250 · Oct 29, 2020 · 352823c · 352823c
1 parent 0713453
commit 352823c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 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/parse/inline.go b/parse/inline.go
@@ -36,10 +36,8 @@ func (t *Tree) parseInline(block *ast.Node, ctx *InlineContext) {
 		case lex.ItemNewline:
 			n = t.parseNewline(block, ctx)
 		case lex.ItemLess:
-			n = t.parseAutolink(ctx)
-			if nil == n {
-				n = t.parseAutoEmailLink(ctx)
-				if nil == n {
+			if n = t.parseAutolink(ctx); nil == n {
+				if n = t.parseAutoEmailLink(ctx); nil == n {
 					n = t.parseInlineHTML(ctx)
 				}
 			}

diff --git a/render/vditor_wysiwyg_renderer.go b/render/vditor_wysiwyg_renderer.go
@@ -705,6 +705,11 @@ func (r *VditorRenderer) renderInlineHTML(node *ast.Node, entering bool) ast.Wal
 		return ast.WalkStop
 	}
 
+	if bytes.Contains(node.Tokens, []byte("<span comment-id-")) || bytes.Equal(node.Tokens, []byte("</span>")) {
+		r.Write(node.Tokens)
+		return ast.WalkStop
+	}
+
 	if entering {
 		previousNodeText := node.PreviousNodeText()
 		previousNodeText = strings.ReplaceAll(previousNodeText, util.Caret, "")

diff --git a/test/m2v_test.go b/test/m2v_test.go
@@ -19,6 +19,7 @@ import (
 
 var md2VditorDOMTests = []parseTest{
 
+	{"21", "f<span comment-id-1>oo</span>", "<p data-block=\"0\">f<span comment-id-1>oo</span></p>"},
 	{"20", "\n      > foo", "<div class=\"vditor-wysiwyg__block\" data-type=\"code-block\" data-block=\"0\" data-marker=\"```\"><pre class=\"vditor-wysiwyg__pre\" style=\"display: none\"><code>  &gt; foo\n</code></pre><pre class=\"vditor-wysiwyg__preview\" data-render=\"2\"><code>  &gt; foo\n</code></pre></div>"},
 	{"19", "foo\n{: id=\"fooid\"}\nbar\n{: id=\"barid\"}", "<p data-block=\"0\" id=\"fooid\">foo</p><p data-block=\"0\" id=\"barid\">bar</p>"},
 	{"18", "![][foo]\n\n[foo]: bar", "<p data-block=\"0\">\u200b<img src=\"bar\" alt=\"\" data-type=\"link-ref\" data-link-label=\"foo\" /></p><div data-block=\"0\" data-type=\"link-ref-defs-block\">[foo]: bar\n</div>"},