From c9d9a4e39972a3da239d9ed5c82645c0ad280619 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Sat, 25 Feb 2023 21:23:54 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8B=E6=96=B9=E5=9D=97=E5=92=8C=E5=88=97=E8=A1=A8=E9=A1=B9?=
 =?UTF-8?q?=E5=AD=90=E5=9D=97=E5=BC=95=E7=94=A8=E6=97=B6=E7=9A=84=E5=8F=8D?=
 =?UTF-8?q?=E9=93=BE=E5=AE=9A=E4=BD=8D=20Fix=20https://github.com/siyuan-n?=
 =?UTF-8?q?ote/siyuan/issues/7484?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/backlink.go | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/kernel/model/backlink.go b/kernel/model/backlink.go
index c9e46a59c..6f2d9ac56 100644
--- a/kernel/model/backlink.go
+++ b/kernel/model/backlink.go
@@ -503,16 +503,37 @@ func buildLinkRefs(defRootID string, refs []*sql.Ref, keyword string) (ret []*Bl
 		refsCount += len(link.Refs)
 	}
 
-	processedParagraphs := hashset.New()
-	var paragraphParentIDs []string
+	parentRefParagraphs := map[string]*Block{}
 	for _, link := range links {
 		for _, ref := range link.Refs {
 			if "NodeParagraph" == ref.Type {
-				paragraphParentIDs = append(paragraphParentIDs, ref.ParentID)
+				parentRefParagraphs[ref.ParentID] = ref
 			}
 		}
 	}
 
+	var paragraphParentIDs []string
+	for parentID, _ := range parentRefParagraphs {
+		paragraphParentIDs = append(paragraphParentIDs, parentID)
+	}
+	paragraphParents := sql.GetBlocks(paragraphParentIDs)
+
+	processedParagraphs := hashset.New()
+	for _, p := range paragraphParents {
+		// 改进标题下方块和列表项子块引用时的反链定位 https://github.com/siyuan-note/siyuan/issues/7484
+		if "i" == p.Type {
+			refBlock := parentRefParagraphs[p.ID]
+			if nil != refBlock && p.FContent == refBlock.Content { // 使用内容判断是否是列表项下第一个子块
+				// 如果是列表项下第一个子块，则后续会通过列表项传递或关联处理，所以这里就不处理这个段落了
+				processedParagraphs.Add(p.ID)
+				if !strings.Contains(p.Content, keyword) {
+					refsCount--
+					continue
+				}
+				ret = append(ret, fromSQLBlock(p, "", 12))
+			}
+		}
+	}
 	for _, link := range links {
 		for _, ref := range link.Refs {
 			if "NodeParagraph" == ref.Type {