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

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

Browse source
This commit is contained in:
Vanessa 2022-10-14 23:42:07 +08:00
commit ca0b1ddeb6
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kernel/model/search.go
View file

@ -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, " ")
}