mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-02-28 05:32:52 +00:00
🎨 Improve error tip when renaming tags/bookmarks containing Markdown markers Fix https://github.com/siyuan-note/siyuan/issues/9248
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user