🐛 IR Block HTML <scope> 标签解析渲染问题 siyuan-note/siyuan#374

88250 · Oct 31, 2020 · e44e63a · e44e63a
1 parent 1c6b5ba
commit e44e63a
Show file tree

Hide file tree

Showing 4 changed files with 5 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_ir_block_test.go b/test/spinv_ir_block_test.go
@@ -19,6 +19,8 @@ import (
 
 var spinVditorIRBlockDOMTests = []*parseTest{
 
+	{"51", "<p data-block=\"0\" data-node-id=\"20201031192117-afs5xrf\" data-type=\"p\"><foo><span data-type=\"html-inline\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker\">&lt;foo<wbr></span></span></foo></p>", "<p data-block=\"0\" data-node-id=\"20201031192117-afs5xrf\" data-type=\"p\">&lt;foo<wbr></p>"},
+	{"50", "<p data-block=\"0\" data-node-id=\"20201031192117-afs5xrf\" data-type=\"p\"><scope><span data-type=\"html-inline\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker\">&lt;scope<wbr></span></span></scope></p>", "<p data-block=\"0\" data-node-id=\"20201031192117-afs5xrf\" data-type=\"p\">&lt;scope<wbr></p>"},
 	{"49", "<p data-block=\"0\" data-node-id=\"20201031152227-htm3oni\" data-type=\"p\"><span data-type=\"code\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker\">`</span><code data-newline=\"1\">foo</code><span class=\"vditor-ir__marker\">`</span></span>\n<span data-type=\"code\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker\">`</span><code data-newline=\"1\">bar</code><span class=\"vditor-ir__marker\">`f<wbr></span></span></p>", "<p data-block=\"0\" data-node-id=\"20201031152227-htm3oni\" data-type=\"p\"><span data-type=\"code\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker\">`</span><code data-newline=\"1\">foo</code><span class=\"vditor-ir__marker\">`</span></span>\n<span data-type=\"code\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker\">`</span><code data-newline=\"1\">bar</code><span class=\"vditor-ir__marker\">`</span></span> f<wbr></p>"},
 	{"48", "<p data-block=\"0\" data-node-id=\"20201031145942-iy2es7t\" data-type=\"p\"><span data-type=\"code\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker\">`</span><code data-newline=\"1\">foo</code><span class=\"vditor-ir__marker\">`</span></span>\n`bar`<wbr></p>", "<p data-block=\"0\" data-node-id=\"20201031145942-iy2es7t\" data-type=\"p\"><span data-type=\"code\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker\">`</span><code data-newline=\"1\">foo</code><span class=\"vditor-ir__marker\">`</span></span>\n<span data-type=\"code\" class=\"vditor-ir__node vditor-ir__node--expand\"><span class=\"vditor-ir__marker\">`</span><code data-newline=\"1\">bar</code><span class=\"vditor-ir__marker\">`</span></span><wbr></p>"},
 	{"47", "<ul data-tight=\"true\" data-marker=\"*\" data-block=\"0\" data-node-id=\"20201031143107-zrt7hxm\" data-type=\"ul\"><li data-marker=\"*\" data-node-id=\"20201031143110-pnxlq5h\">foo</li><li data-marker=\"*\" data-node-id=\"20201031143402-nsuhkoq\"><span data-type=\"em\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker vditor-ir__marker--em\">*</span><em data-newline=\"1\">bar</em><span class=\"vditor-ir__marker vditor-ir__marker--em\">*</span></span>ba<wbr></li></ul>", "<ul data-tight=\"true\" data-marker=\"*\" data-block=\"0\" data-node-id=\"20201031143107-zrt7hxm\" data-type=\"ul\"><li data-marker=\"*\" data-node-id=\"20201031143110-pnxlq5h\">foo</li><li data-marker=\"*\" data-node-id=\"20201031143402-nsuhkoq\"><span data-type=\"em\" class=\"vditor-ir__node\"><span class=\"vditor-ir__marker vditor-ir__marker--em\">*</span><em data-newline=\"1\">bar</em><span class=\"vditor-ir__marker vditor-ir__marker--em\">*</span></span>ba<wbr></li></ul>"},

diff --git a/vditor_ir_block.go b/vditor_ir_block.go
@@ -309,7 +309,7 @@ func (lute *Lute) genASTByVditorIRBlockDOM(n *html.Node, tree *parse.Tree) {
 	}
 
 	switch n.DataAtom {
-	case 0:
+	case 0, atom.Scope:
 		if "" == content {
 			return
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	switch n.DataAtom {
-    	case 0:
+    	case 0, atom.Scope:
     		if "" == content {
     			return
     		}
@@ Expand Down @@