From 96c59433e2fa37a9d84249aae1f8e7fa95db65e6 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sat, 7 Dec 2024 11:48:14 +0800 Subject: [PATCH] :art: Clean code https://github.com/siyuan-note/siyuan/issues/13378 --- kernel/model/blockinfo.go | 18 ++++++++++++------ kernel/model/push_reload.go | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/kernel/model/blockinfo.go b/kernel/model/blockinfo.go index a6b75365c..fb2c43b22 100644 --- a/kernel/model/blockinfo.go +++ b/kernel/model/blockinfo.go @@ -267,17 +267,23 @@ func getNodeRefText(node *ast.Node) string { return getNodeRefText0(node, Conf.Editor.BlockRefDynamicAnchorTextMaxLen) } -func getNodeAvBlockText(node *ast.Node) string { +func getNodeAvBlockText(node *ast.Node) (ret string) { if nil == node { return "" } - if ret := node.IALAttr("name"); "" != ret { - ret = strings.TrimSpace(ret) - ret = util.EscapeHTML(ret) - return ret + if name := node.IALAttr("name"); "" != name { + name = strings.TrimSpace(name) + name = util.EscapeHTML(name) + ret = name + } else { + ret = getNodeRefText0(node, 1024) } - return getNodeRefText0(node, 1024) + + //if icon := node.IALAttr("icon"); "" != icon { + // ret = icon + " " + ret + //} + return } func getNodeRefText0(node *ast.Node, maxLen int) string { diff --git a/kernel/model/push_reload.go b/kernel/model/push_reload.go index 96f519d68..35a270f3b 100644 --- a/kernel/model/push_reload.go +++ b/kernel/model/push_reload.go @@ -269,7 +269,7 @@ func refreshDynamicRefTexts(updatedDefNodes map[string]*ast.Node, updatedTrees m for _, blockValue := range blockValues.Values { if blockValue.Block.ID == updatedDefNode.ID { - newContent := getNodeRefText(updatedDefNode) + newContent := getNodeAvBlockText(updatedDefNode) if newContent != blockValue.Block.Content { blockValue.Block.Content = newContent changedAv = true