From b774f9804433951641c6cde9d380e5c3bcb1dcc4 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sun, 2 Oct 2022 22:48:36 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=9D=97=E5=BC=95=E7=94=A8=E4=B8=8E?=
 =?UTF-8?q?=E6=89=80=E5=BC=95=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9=E5=9D=97?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BA=A4=E6=8D=A2=20https://github.com/siyua?=
 =?UTF-8?q?n-note/siyuan/issues/4981?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/block.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/kernel/model/block.go b/kernel/model/block.go
index 2c5275236..d661ed8f1 100644
--- a/kernel/model/block.go
+++ b/kernel/model/block.go
@@ -110,10 +110,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
 	if nil == defNode {
 		return
 	}
+	var defNodeChildren []*ast.Node
 	if ast.NodeListItem == defNode.Parent.Type {
 		defNode = defNode.Parent
 	} else if ast.NodeHeading == defNode.Type && includeChildren {
-
+		defNodeChildren = treenode.HeadingChildren(defNode)
 	}
 
 	refPivot := parse.NewParagraph()
@@ -141,21 +142,24 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
 	} else {
 		if ast.NodeListItem == refNode.Type {
 			newID := ast.NewNodeID()
-			li := &ast.Node{ID: newID, Type: ast.NodeListItem, ListData: &ast.ListData{Typ: refNode.Parent.ListData.Typ}}
-			li.SetIALAttr("id", newID)
-			li.SetIALAttr("updated", newID[:14])
-			li.AppendChild(defNode)
-			refPivot.InsertAfter(li)
-
-			newID = ast.NewNodeID()
 			list := &ast.Node{ID: newID, Type: ast.NodeList, ListData: &ast.ListData{Typ: refNode.Parent.ListData.Typ}}
 			list.SetIALAttr("id", newID)
 			list.SetIALAttr("updated", newID[:14])
 			list.AppendChild(refNode)
 			defNode.InsertAfter(list)
+
+			newID = ast.NewNodeID()
+			li := &ast.Node{ID: newID, Type: ast.NodeListItem, ListData: &ast.ListData{Typ: refNode.Parent.ListData.Typ}}
+			li.SetIALAttr("id", newID)
+			li.SetIALAttr("updated", newID[:14])
+			li.AppendChild(defNode)
+			refPivot.InsertAfter(li)
 		} else {
 			defNode.InsertAfter(refNode)
 			refPivot.InsertAfter(defNode)
+			for i := len(defNodeChildren) - 1; -1 < i; i-- {
+				refPivot.InsertAfter(defNodeChildren[i])
+			}
 		}
 	}
 	refPivot.Unlink()