0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 改进虚拟引用和反链提及搜索匹配 Fix https://github.com/siyuan-note/siyuan/issues/6600

Browse source
This commit is contained in:
Liang Ding 2022-11-18 08:44:10 +08:00
parent caf1180aff
commit 9bd3f1ad2e
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/search/mark.go
View file

@ -85,7 +85,7 @@ func EncloseHighlighting(text string, keywords []string, openMark, closeMark str
}
re := ic + "("
for i, k := range keywords {
k = keyword2regexp(k)
k = regexp.QuoteMeta(k)
re += "(" + k + ")"
if i < len(keywords)-1 {
re += "|"
@ -98,7 +98,7 @@ func EncloseHighlighting(text string, keywords []string, openMark, closeMark str
})
} else {
for _, k := range keywords {
k = keyword2regexp(k)
k = regexp.QuoteMeta(k)
var repls, words []string
if re, err := regexp.Compile(ic + k); nil == err {
words = re.FindAllString(text, -1)
@ -115,12 +115,3 @@ func EncloseHighlighting(text string, keywords []string, openMark, closeMark str
}
return text
}
func keyword2regexp(k string) string {
k = strings.ReplaceAll(k, "*", ".*")
k = strings.ReplaceAll(k, "?", ".")
k = strings.ReplaceAll(k, "%", ".*")
k = strings.ReplaceAll(k, "_", ".")
k = strings.ReplaceAll(k, "\\\\", "\\")
return k
}