From c5dc86bf8e75e246f81fe6c373130ab2e20668ad Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Fri, 8 Nov 2024 11:44:57 +0800
Subject: [PATCH] :art: Improve markdown importing
 https://github.com/siyuan-note/siyuan/issues/13080

---
 kernel/model/import.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/kernel/model/import.go b/kernel/model/import.go
index 2b65d2426..de0d3513f 100644
--- a/kernel/model/import.go
+++ b/kernel/model/import.go
@@ -1102,7 +1102,7 @@ func imgHtmlBlock2InlineImg(tree *parse.Tree) {
 			return ast.WalkContinue
 		}
 
-		if ast.NodeHTMLBlock == n.Type {
+		if ast.NodeHTMLBlock == n.Type || (ast.NodeText == n.Type && bytes.HasPrefix(bytes.ToLower(n.Tokens), []byte("<img "))) {
 			tokens := bytes.TrimSpace(n.Tokens)
 			if bytes.HasPrefix(tokens, []byte("<div>")) {
 				tokens = bytes.TrimPrefix(tokens, []byte("<div>"))
@@ -1151,7 +1151,12 @@ func imgHtmlBlock2InlineImg(tree *parse.Tree) {
 		}
 		img.AppendChild(&ast.Node{Type: ast.NodeCloseParen})
 
-		n.InsertBefore(p)
+		if nil != n.Parent && ast.NodeText == n.Type {
+			// 行级 HTML 会被解析为文本，所以这里要在父级段落前面插入，避免形成段落嵌套 https://github.com/siyuan-note/siyuan/issues/13080
+			n.Parent.InsertBefore(p)
+		} else {
+			n.InsertBefore(p)
+		}
 		n.Unlink()
 	}
 	return