From 86adbed3f0bfb10ae35d5ad4648e0da5f5a95de5 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 19 Dec 2024 10:46:46 +0800 Subject: [PATCH 1/2] :bug: Results not highlighted when searching using query syntax https://github.com/siyuan-note/siyuan/issues/13532 --- kernel/model/search.go | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/model/search.go b/kernel/model/search.go index ea53cca3d..44a0233c8 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -1517,7 +1517,6 @@ func fullTextSearchByLikeWithRoot(query, boxFilter, pathFilter, typeFilter, igno } func highlightByFTS(query, typeFilter, id string) (ret []string) { - query = stringQuery(query) const limit = 256 table := "blocks_fts" if !Conf.Search.CaseSensitive { From 81cb18e14d1b4d402df5f9677d77b299a6b856d7 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 19 Dec 2024 11:04:29 +0800 Subject: [PATCH 2/2] :bug: HTML tag search escaping issue https://github.com/siyuan-note/siyuan/issues/13354 --- kernel/model/search.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/model/search.go b/kernel/model/search.go index 44a0233c8..4fb207c55 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -475,6 +475,8 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids r, _ := regexp.Compile(keyword) escapedKey := util.EscapeHTML(keyword) + escapedKey = strings.ReplaceAll(escapedKey, """, """) + escapedKey = strings.ReplaceAll(escapedKey, "'", "'") escapedR, _ := regexp.Compile(escapedKey) ids = gulu.Str.RemoveDuplicatedElem(ids) var renameRoots []*ast.Node