From 591089429f0ac60fbf6a821b6920348641902842 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Fri, 14 Oct 2022 22:32:13 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=92=8C=E5=8F=8D=E9=93=BE=E6=8F=90=E5=8F=8A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=88=86=E8=AF=8D=20Fix=20https://github.com?=
 =?UTF-8?q?/siyuan-note/siyuan/issues/6176?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/model/search.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kernel/model/search.go b/kernel/model/search.go
index fd75a80bc..a1e7ef472 100644
--- a/kernel/model/search.go
+++ b/kernel/model/search.go
@@ -647,6 +647,7 @@ func markReplaceSpan(text string, keywords []string, replacementStart, replaceme
 			continue
 		}
 
+		var hitKeywords []string
 		for _, k := range keywords {
 			tmpPart := part
 			tmpK := k
@@ -658,19 +659,22 @@ func markReplaceSpan(text string, keywords []string, replacementStart, replaceme
 			if gulu.Str.IsASCII(tmpK) {
 				if gulu.Str.IsASCII(tmpPart) {
 					if tmpPart == tmpK {
-						parts[i] = replacementStart + part + replacementEnd
+						hitKeywords = append(hitKeywords, k)
 					}
 				} else {
 					if strings.Contains(tmpPart, tmpK) {
-						parts[i] = search.EncloseHighlighting(part, []string{k}, replacementStart, replacementEnd, Conf.Search.CaseSensitive)
+						hitKeywords = append(hitKeywords, k)
 					}
 				}
 			} else {
 				if strings.Contains(tmpPart, tmpK) {
-					parts[i] = search.EncloseHighlighting(part, []string{k}, replacementStart, replacementEnd, Conf.Search.CaseSensitive)
+					hitKeywords = append(hitKeywords, k)
 				}
 			}
 		}
+		if 0 < len(hitKeywords) {
+			parts[i] = search.EncloseHighlighting(part, hitKeywords, replacementStart, replacementEnd, Conf.Search.CaseSensitive)
+		}
 	}
 	return strings.Join(parts, " ")
 }