Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-28 03:06:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve error tip when renaming tags/bookmarks containing Markdown markers Fix https://github.com/siyuan-note/siyuan/issues/9248

Browse source
This commit is contained in:
Daniel 2023-09-28 10:59:50 +08:00
parent 20cd3c5f80
commit 4283f73407
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
8 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/bookmark.go
View file

@ -75,8 +75,8 @@ func RemoveBookmark(bookmark string) (err error) {
}
func RenameBookmark(oldBookmark, newBookmark string) (err error) {
if treenode.ContainsMarker(newBookmark) {
return errors.New(Conf.Language(112))
if invalidChar := treenode.ContainsMarker(newBookmark); "" != invalidChar {
return errors.New(fmt.Sprintf(Conf.Language(112), invalidChar))
}
newBookmark = strings.TrimSpace(newBookmark)

4
kernel/model/tag.go
View file

@ -105,8 +105,8 @@ func RemoveTag(label string) (err error) {
}
func RenameTag(oldLabel, newLabel string) (err error) {
if treenode.ContainsMarker(newLabel) {
return errors.New(Conf.Language(112))
if invalidChar := treenode.ContainsMarker(newLabel); "" != invalidChar {
return errors.New(fmt.Sprintf(Conf.Language(112), invalidChar))
}
newLabel = strings.TrimSpace(newLabel)

8
kernel/treenode/marker.go
View file

@ -21,17 +21,17 @@ import (
"github.com/88250/lute/lex"
)
func ContainsMarker(str string) bool {
func ContainsMarker(str string) (ret string) {
if !gulu.Str.IsASCII(str) {
return false
return
}
for _, token := range str {
if IsMarker(byte(token)) {
return true
return string(token)
}
}
return false
return
}
func IsMarker(token byte) bool {