🎨 Vditor 支持 When link with "" and ctrl+k Vanessa219/vditor#261

88250 · Apr 2, 2020 · 0cd1684 · 0cd1684
1 parent bed933a
commit 0cd1684
Show file tree

Hide file tree

Showing 4 changed files with 13 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/parse/inline.go b/parse/inline.go
@@ -204,7 +204,16 @@ func (t *Tree) parseCloseBracket(ctx *InlineContext) *ast.Node {
 			ctx.pos += len(passed)
 			isLink, passed, remains = lex.Spnl(remains)
 			ctx.pos += len(passed)
-			matched = isLink && 0 < len(remains) && lex.ItemCloseParen == remains[0]
+			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...)
+					}
+				}
+				matched = lex.ItemCloseParen == remains[0]
+			}
 			closeParen = remains[0:]
 			break
 		}

diff --git a/test/spinv_test.go b/test/spinv_test.go
@@ -154,6 +154,7 @@ func TestSpinVditorDOM(t *testing.T) {
 
 var spinVditorIRDOMTests = []*parseTest{
 
+	{"21", "<p data-block=\"0\">[foo](bar \"b\"<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>"},