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

♻️ Refactor Go to err != nil, err == nil (#12385)

Browse source
This commit is contained in:
Oleksandr Redko 2024-09-04 04:40:50 +03:00 • committed by GitHub
parent 473a159ef2
commit b100721fee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
147 changed files with 1661 additions and 1659 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/model/export_merge.go
View file

@ -27,7 +27,7 @@ import (
func mergeSubDocs(rootTree *parse.Tree) (ret *parse.Tree, err error) {
ret = rootTree
rootBlock := &Block{Box: rootTree.Box, ID: rootTree.ID, Path: rootTree.Path, HPath: rootTree.HPath}
if err = buildBlockChildren(rootBlock); nil != err {
if err = buildBlockChildren(rootBlock); err != nil {
return
}
@ -53,7 +53,7 @@ func mergeSubDocs(rootTree *parse.Tree) (ret *parse.Tree, err error) {
for {
i := 0
if err = walkBlock(insertPoint, rootBlock, i); nil != err {
if err = walkBlock(insertPoint, rootBlock, i); err != nil {
return
}
if nil == rootBlock.Children {
@ -67,7 +67,7 @@ func walkBlock(insertPoint *ast.Node, block *Block, level int) (err error) {
level++
for i := len(block.Children) - 1; i >= 0; i-- {
c := block.Children[i]
if err = walkBlock(insertPoint, c, level); nil != err {
if err = walkBlock(insertPoint, c, level); err != nil {
return
}
@ -87,7 +87,7 @@ func walkBlock(insertPoint *ast.Node, block *Block, level int) (err error) {
func loadTreeNodes(box string, p string, level int) (ret []*ast.Node, err error) {
luteEngine := NewLute()
tree, err := filesys.LoadTree(box, p, luteEngine)
if nil != err {
if err != nil {
return
}
@ -112,7 +112,7 @@ func loadTreeNodes(box string, p string, level int) (ret []*ast.Node, err error)
func buildBlockChildren(block *Block) (err error) {
files, _, err := ListDocTree(block.Box, block.Path, util.SortModeUnassigned, false, false, Conf.FileTree.MaxListCount)
if nil != err {
if err != nil {
return
}
@ -122,7 +122,7 @@ func buildBlockChildren(block *Block) (err error) {
}
for _, c := range block.Children {
if err = buildBlockChildren(c); nil != err {
if err = buildBlockChildren(c); err != nil {
return
}
}