🎨 Vditor 支持

When link with "" and ctrl+k Fix Vanessa219/vditor#261
88250 · Apr 2, 2020 · 68743e5 · 68743e5
1 parent 0cd1684
commit 68743e5
Show file tree

Hide file tree

Showing 4 changed files with 24 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
@@ -207,9 +207,25 @@ func (t *Tree) parseCloseBracket(ctx *InlineContext) *ast.Node {
 			matched = isLink && 0 < len(remains)
 			if matched {
 				if t.Context.Option.VditorWYSIWYG {
-					if bytes.HasPrefix(remains, []byte(Caret + ")")) {
-						remains = remains[len([]byte(Caret + ")")):]
-						remains = append([]byte(")" + Caret), remains...)
+					if bytes.HasPrefix(remains, []byte(Caret+")")) {
+						if 0 < len(title) {
+							// 将 ‸) 换位为 )‸
+							remains = remains[len([]byte(Caret+")")):]
+							remains = append([]byte(")"+Caret), remains...)
+							copy(ctx.tokens[ctx.pos-1:], remains) // 同时也将 tokens 换位，后续解析从光标位置开始
+						} else {
+							// 将 ""‸ 换位为 "‸"
+							title = []byte(Caret)
+							remains = remains[len([]byte(Caret)):]
+							ctx.pos += 3
+						}
+					} else if bytes.HasPrefix(remains, []byte(")"+Caret)) {
+						if 0 == len(title) {
+							// 将 "")‸ 换位为 "‸")
+							title = []byte(Caret)
+							remains = bytes.ReplaceAll(remains, []byte(Caret), nil)
+							ctx.pos += 3
+						}
 					}
 				}
 				matched = lex.ItemCloseParen == remains[0]

diff --git a/test/spinv_test.go b/test/spinv_test.go
@@ -154,7 +154,9 @@ func TestSpinVditorDOM(t *testing.T) {
 
 var spinVditorIRDOMTests = []*parseTest{
 
-	{"21", "<p data-block=\"0\">[foo](bar \"b\"<wbr>)\n</p>", ""},
+	{"23", "<p data-block=\"0\">[foo](bar \"\")<wbr>\n</p>", "<p data-block=\"0\"><span data-type=\"a\" class=\"vditor-ir__node vditor-ir__node--expand\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__link vditor-ir__marker--linktext\">foo</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">bar</span> <span class=\"vditor-ir__marker vditor-ir__marker--title\">\"<wbr>\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span></span>\n</p>"},
+	{"22", "<p data-block=\"0\">[foo](bar \"\"<wbr>)\n</p>", "<p data-block=\"0\"><span data-type=\"a\" class=\"vditor-ir__node vditor-ir__node--expand\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__link vditor-ir__marker--linktext\">foo</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">bar</span> <span class=\"vditor-ir__marker vditor-ir__marker--title\">\"<wbr>\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span></span>\n</p>"},
+	{"21", "<p data-block=\"0\">[foo](bar \"b\"<wbr>)\n</p>", "<p data-block=\"0\"><span data-type=\"a\" class=\"vditor-ir__node vditor-ir__node--expand\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__link vditor-ir__marker--linktext\">foo</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">bar</span> <span class=\"vditor-ir__marker vditor-ir__marker--title\">\"b\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span></span><wbr>\n</p>"},
 	{"20", "<p data-block=\"0\"><span data-type=\"a\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__link vditor-ir__marker--linktext\">foo</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">bar</span> <span class=\"vditor-ir__marker vditor-ir__marker--title\">\"b<wbr>\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span></span>\n</p>", "<p data-block=\"0\"><span data-type=\"a\" class=\"vditor-ir__node vditor-ir__node--expand\"><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">[</span><span class=\"vditor-ir__link vditor-ir__marker--linktext\">foo</span><span class=\"vditor-ir__marker vditor-ir__marker--bracket\">]</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">(</span><span class=\"vditor-ir__marker vditor-ir__marker--link\">bar</span> <span class=\"vditor-ir__marker vditor-ir__marker--title\">\"b<wbr>\"</span><span class=\"vditor-ir__marker vditor-ir__marker--paren\">)</span></span>\n</p>"},
 	{"19", "<p data-block=\"0\">&lt;foo<wbr>&gt;\n</p>", "<p data-block=\"0\"><span data-type=\"inline-node\" class=\"vditor-ir__node\"><code class=\"vditor-ir__marker\">&lt;foo<wbr>&gt;</code><span class=\"vditor-ir__preview\" data-render=\"1\"><foo></span></span>\n</p>"},
 	{"18", "<p data-block=\"0\">&lt;<wbr>\n</p>", "<p data-block=\"0\">&lt;<wbr>\n</p>"},