🐛 切换编辑模式 SV 脚注缩进丢失 Vanessa219/vditor#1270

88250 · Aug 4, 2022 · 7056148 · 7056148
1 parent e8092b6
commit 7056148
Show file tree

Hide file tree

Showing 4 changed files with 9 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_sv_renderer.go b/render/vditor_sv_renderer.go
@@ -408,9 +408,13 @@ func (r *VditorSVRenderer) renderFootnotesDef(node *ast.Node, entering bool) ast
 		r.WriteString("<span>: </span>")
 		for c := node.FirstChild; nil != c; c = c.Next {
 			ast.Walk(c, func(n *ast.Node, entering bool) ast.WalkStatus {
-				if entering && n != node.FirstChild && n.IsBlock() {
+				if entering && n != node.FirstChild && (n.IsBlock() || ast.NodeCodeBlockCode == n.Type || ast.NodeCodeBlockFenceCloseMarker == n.Type) {
 					indentSpacesStr := `<span data-type="padding">    </span>`
-					r.WriteString(indentSpacesStr)
+					if ast.NodeCodeBlockFenceCloseMarker == n.Type {
+						n.Tokens = append([]byte(indentSpacesStr), n.Tokens...)
+					} else {
+						r.WriteString(indentSpacesStr)
+					}
 				}
 				return r.RendererFuncs[n.Type](n, entering)
 			})

diff --git a/test/spin_sv_test.go b/test/spin_sv_test.go
@@ -18,7 +18,7 @@ import (
 
 var spinVditorSVDOMTests = []*parseTest{
 
-	{"64", "[^1]: foo\n\n    bar‸", "<span class=\"vditor-sv__marker--bracket\">[</span><span class=\"vditor-sv__marker--link\" data-type=\"footnotes-link\">^1</span><span class=\"vditor-sv__marker--bracket\">]</span><span>: </span><span data-type=\"text\">foo</span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"padding\">    </span><span data-type=\"text\">bar<wbr></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span>"},
+	{"64", "[^1]: foo\n\n    bar\n\n    ```\n    baz\n    ```", "<span class=\"vditor-sv__marker--bracket\">[</span><span class=\"vditor-sv__marker--link\" data-type=\"footnotes-link\">^1</span><span class=\"vditor-sv__marker--bracket\">]</span><span>: </span><span data-type=\"text\">foo</span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"padding\">    </span><span data-type=\"text\">bar</span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"padding\">    </span><span data-type=\"code-block-open-marker\" class=\"vditor-sv__marker\">```</span><span class=\"vditor-sv__marker--info\" data-type=\"code-block-info\"></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"padding\">    </span><span data-type=\"text\">baz</span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"code-block-close-marker\" class=\"vditor-sv__marker\"><span data-type=\"padding\">    </span>```</span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span>"},
 	{"63", "123\n456\n| a | b |\n| - | - |\n| d | e |\n", "<span data-type=\"text\">123</span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"text\">456</span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"table\">| a | b |\n| - | - |\n| d | e |<span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span></span>"},
 	{"62", "| foo | bar |\n| - | - |\n| baz | bazz |\n", "<span data-type=\"table\">| foo | bar |\n| - | - |\n| baz | bazz |<span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span></span>"},
 	{"61", "![text][foo]\n\n[foo]: bar", "<span class=\"vditor-sv__marker\">!</span><span class=\"vditor-sv__marker--bracket\">[</span><span class=\"vditor-sv__marker--bracket\">text</span><span class=\"vditor-sv__marker--bracket\">]</span><span class=\"vditor-sv__marker--link\">[foo]</span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span class=\"vditor-sv__marker--bracket\">[</span><span class=\"vditor-sv__marker--link\" data-type=\"link-ref-defs-block\">foo</span><span class=\"vditor-sv__marker--bracket\">]</span><span>: </span>bar<span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span><span data-type=\"newline\"><br /><span style=\"display: none\">\n</span></span>"},