🎨 Improve HTML code block clipping siyuan-note/siyuan#12014

88250 · Jul 25, 2024 · ac4be43 · ac4be43
1 parent 170030b
commit ac4be43
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/h2m.go b/h2m.go
@@ -224,7 +224,9 @@ func (lute *Lute) genASTByDOM(n *html.Node, tree *parse.Tree) {
 				buf := &bytes.Buffer{}
 				node.LastChild.CodeBlockInfo = []byte(language)
 				buf.WriteString(util.DomText(n))
-				content := &ast.Node{Type: ast.NodeCodeBlockCode, Tokens: buf.Bytes()}
+				tokens := buf.Bytes()
+				tokens = bytes.ReplaceAll(tokens, []byte("\u00A0"), []byte(" "))
+				content := &ast.Node{Type: ast.NodeCodeBlockCode, Tokens: tokens}
 				node.AppendChild(content)
 				node.AppendChild(&ast.Node{Type: ast.NodeCodeBlockFenceCloseMarker, Tokens: util.StrToBytes("```"), CodeBlockFenceLen: 3})
 				tree.Context.Tip.AppendChild(node)
@@ -398,7 +400,7 @@ func (lute *Lute) genASTByDOM(n *html.Node, tree *parse.Tree) {
 			firstc = n.FirstChild
 		}
 
-		if html.TextNode == firstc.Type || atom.Span == firstc.DataAtom || atom.Code == firstc.DataAtom || atom.Section == firstc.DataAtom || atom.Pre == firstc.DataAtom || atom.A == firstc.DataAtom {
+		if html.TextNode == firstc.Type || atom.Span == firstc.DataAtom || atom.Code == firstc.DataAtom || atom.Section == firstc.DataAtom || atom.Pre == firstc.DataAtom || atom.A == firstc.DataAtom || atom.P == firstc.DataAtom {
 			node.Type = ast.NodeCodeBlock
 			node.IsFencedCodeBlock = true
 			node.AppendChild(&ast.Node{Type: ast.NodeCodeBlockFenceOpenMarker, Tokens: util.StrToBytes("```"), CodeBlockFenceLen: 3})

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/h2m_test.go b/test/h2m_test.go