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

🐛 Fix NPE https://github.com/siyuan-note/siyuan/issues/11497

Browse source
This commit is contained in:
Daniel 2024-05-23 11:30:33 +08:00
parent f10c0bcd4d
commit 98e8083122
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/render.go
View file

@ -93,6 +93,10 @@ func renderOutline(heading *ast.Node, luteEngine *lute.Lute) (ret string) {
} }
func renderBlockText(node *ast.Node, excludeTypes []string) (ret string) { func renderBlockText(node *ast.Node, excludeTypes []string) (ret string) {
if nil == node {
return
}
ret = sql.NodeStaticContent(node, excludeTypes, false, false, false, GetBlockAttrsWithoutWaitWriting) ret = sql.NodeStaticContent(node, excludeTypes, false, false, false, GetBlockAttrsWithoutWaitWriting)
ret = strings.TrimSpace(ret) ret = strings.TrimSpace(ret)
ret = strings.ReplaceAll(ret, "\n", "") ret = strings.ReplaceAll(ret, "\n", "")

4
kernel/sql/block.go
View file

@ -139,6 +139,10 @@ func indexNode(tx *sql.Tx, id string) (err error) {
func NodeStaticContent(node *ast.Node, excludeTypes []string, includeTextMarkATitleURL, includeAssetPath, fullAttrView bool, func NodeStaticContent(node *ast.Node, excludeTypes []string, includeTextMarkATitleURL, includeAssetPath, fullAttrView bool,
GetBlockAttrsWithoutWaitWriting func(id string) (ret map[string]string)) string { GetBlockAttrsWithoutWaitWriting func(id string) (ret map[string]string)) string {
if nil == node {
return ""
}
if ast.NodeAttributeView == node.Type { if ast.NodeAttributeView == node.Type {
if fullAttrView { if fullAttrView {
return getAttributeViewContent(node.AttributeViewID, GetBlockAttrsWithoutWaitWriting) return getAttributeViewContent(node.AttributeViewID, GetBlockAttrsWithoutWaitWriting)

4
kernel/sql/block_query.go
View file

@ -812,6 +812,10 @@ func GetContainerText(container *ast.Node) string {
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
buf.Grow(4096) buf.Grow(4096)
leaf := treenode.FirstLeafBlock(container) leaf := treenode.FirstLeafBlock(container)
if nil == leaf {
return ""
}
ast.Walk(leaf, func(n *ast.Node, entering bool) ast.WalkStatus { ast.Walk(leaf, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering { if !entering {
return ast.WalkContinue return ast.WalkContinue