Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve backmention highlighting https://github.com/siyuan-note/siyuan/issues/14103

Browse source
This commit is contained in:
Daniel 2025-02-15 23:36:11 +08:00
parent c43da2fcaa
commit 6080f86693
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/backlink.go
View file

@ -748,11 +748,11 @@ func buildTreeBackmention(defSQLBlock *sql.Block, refBlocks []*Block, keyword st
mentionKeywords = append(mentionKeywords, v.(string)) mentionKeywords = append(mentionKeywords, v.(string))
} }
mentionKeywords = prepareMarkKeywords(mentionKeywords) mentionKeywords = prepareMarkKeywords(mentionKeywords)
ret = searchBackmention(mentionKeywords, keyword, excludeBacklinkIDs, rootID, beforeLen) mentionKeywords, ret = searchBackmention(mentionKeywords, keyword, excludeBacklinkIDs, rootID, beforeLen)
return return
} }
func searchBackmention(mentionKeywords []string, keyword string, excludeBacklinkIDs *hashset.Set, rootID string, beforeLen int) (ret []*Block) { func searchBackmention(mentionKeywords []string, keyword string, excludeBacklinkIDs *hashset.Set, rootID string, beforeLen int) (retMentionKeywords []string, ret []*Block) {
ret = []*Block{} ret = []*Block{}
if 1 > len(mentionKeywords) { if 1 > len(mentionKeywords) {
return return
@ -825,6 +825,9 @@ func searchBackmention(mentionKeywords []string, keyword string, excludeBacklink
newText := markReplaceSpanWithSplit(text, mentionKeywords, search.GetMarkSpanStart(search.MarkDataType), search.GetMarkSpanEnd()) newText := markReplaceSpanWithSplit(text, mentionKeywords, search.GetMarkSpanStart(search.MarkDataType), search.GetMarkSpanEnd())
if text != newText { if text != newText {
tmp = append(tmp, b) tmp = append(tmp, b)
k := gulu.Str.SubstringsBetween(newText, search.GetMarkSpanStart(search.MarkDataType), search.GetMarkSpanEnd())
retMentionKeywords = append(retMentionKeywords, k...)
} else { } else {
// columnFilter 中的命名、别名和备注命中的情况 // columnFilter 中的命名、别名和备注命中的情况
// 反链提及搜索范围增加命名、别名和备注 https://github.com/siyuan-note/siyuan/issues/7639 // 反链提及搜索范围增加命名、别名和备注 https://github.com/siyuan-note/siyuan/issues/7639
@ -836,6 +839,8 @@ func searchBackmention(mentionKeywords []string, keyword string, excludeBacklink
} }
} }
blocks = tmp blocks = tmp
retMentionKeywords = gulu.Str.RemoveDuplicatedElem(retMentionKeywords)
mentionKeywords = retMentionKeywords
mentionBlockMap := map[string]*Block{} mentionBlockMap := map[string]*Block{}
for _, block := range blocks { for _, block := range blocks {