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

h2m.go

@@ -425,7 +425,9 @@ func (lute *Lute) genASTByDOM(n *html.Node, tree *parse.Tree) {
 
 			buf := &bytes.Buffer{}
 			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})
 

util/html.go

@@ -206,6 +206,21 @@ func IsTempMarkSpan(n *html.Node) bool {
 
 }
 
+func SetDomAttrValue(n *html.Node, attrName, attrVal string) {
+	if nil == n {
+		return
+	}
+
+	for _, attr := range n.Attr {
+		if attr.Key == attrName {
+			attr.Val = attrVal
+			return
+		}
+	}
+
+	n.Attr = append(n.Attr, &html.Attribute{Key: attrName, Val: attrVal})
+}
+
 func DomAttrValue(n *html.Node, attrName string) string {
 	if nil == n {
 		return ""

vditor_wysiwyg.go

@@ -218,6 +218,49 @@ func (lute *Lute) adjustVditorDOM(root *html.Node) {
 	for c := root.FirstChild; nil != c; c = c.NextSibling {
 		lute.mergeSameStrong(c)
 	}
+
+	for c := root.FirstChild; nil != c; c = c.NextSibling {
+		lute.adjustTableCode(c)
+	}
+}
+
+func (lute *Lute) adjustTableCode(n *html.Node) {
+	if atom.Table == n.DataAtom {
+		// 表格类型的代码块进行预处理 https://github.com/siyuan-note/siyuan/issues/11540
+		// 移除 <td class="gutter">
+		// td class="code"> 下的 <div class="container"> 改为 <pre>
+
+		tds := util.DomChildrenByType(n, atom.Td)
+		var unlinks []*html.Node
+		for _, td := range tds {
+			tdClass := util.DomAttrValue(td, "class")
+			if strings.Contains(tdClass, "gutter") {
+				unlinks = append(unlinks, td)
+				continue
+			}
+
+			if strings.Contains(tdClass, "code") {
+				if c := td.FirstChild; nil != c && atom.Div == c.DataAtom {
+					c.DataAtom = atom.Pre
+					c.Data = "pre"
+					lang := util.DomAttrValue(n, "class")
+					lang = strings.ReplaceAll(lang, "syntaxhighlighter", "")
+					lang = strings.TrimSpace(lang)
+					if "" != lang {
+						util.SetDomAttrValue(c, "class", lang)
+					}
+					for div := c.FirstChild; nil != div; div = div.NextSibling {
+						div.DataAtom = atom.Code
+						div.Data = "code"
+					}
+				}
+			}
+		}
+	}
+
+	for c := n.FirstChild; nil != c; c = c.NextSibling {
+		lute.adjustTableCode(c)
+	}
 }
 
 func (lute *Lute) mergeSameStrong(n *html.Node) {