Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2026-01-20 21:15:30 +08:00
commit 9a20844e7e

View file

@ -115,12 +115,14 @@ func EncloseHighlighting(text string, keywords []string, openMark, closeMark str
ret = strings.ReplaceAll(ret, """, "\ue000")
ret = strings.ReplaceAll(ret, "<", "\ue001")
ret = strings.ReplaceAll(ret, ">", "\ue002")
ret = strings.ReplaceAll(ret, "'", "\ue003")
if reg, err := regexp.Compile(re); err == nil {
ret = reg.ReplaceAllStringFunc(ret, func(s string) string { return openMark + s + closeMark })
}
ret = strings.ReplaceAll(ret, "\ue000", """)
ret = strings.ReplaceAll(ret, "\ue001", "<")
ret = strings.ReplaceAll(ret, "\ue002", ">")
ret = strings.ReplaceAll(ret, "\ue003", "'")
// 搜索结果预览包含转义符问题 Search results preview contains escape character issue https://github.com/siyuan-note/siyuan/issues/9790
ret = strings.ReplaceAll(ret, "\\<span", "\\\\<span")