Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 06:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve tag escaping

Browse source
This commit is contained in:
Daniel 2025-04-23 22:17:06 +08:00
parent fc58892ce8
commit 618269e7df
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kernel/model/tag.go
View file

@ -308,6 +308,11 @@ func SearchTags(keyword string) (ret []string) {
labels := labelBlocksByKeyword(keyword) labels := labelBlocksByKeyword(keyword)
keyword = strings.Join(strings.Split(keyword, " "), search.TermSep) keyword = strings.Join(strings.Split(keyword, " "), search.TermSep)
for label := range labels { for label := range labels {
if "" == keyword {
ret = append(ret, util.EscapeHTML(label))
continue
}
_, t := search.MarkText(label, keyword, 1024, Conf.Search.CaseSensitive) _, t := search.MarkText(label, keyword, 1024, Conf.Search.CaseSensitive)
ret = append(ret, t) ret = append(ret, t)
} }

6
kernel/search/mark.go
View file

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