mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-02 23:08:49 +01:00
♻️ Refactor Go to err != nil, err == nil (#12385)
This commit is contained in:
parent
473a159ef2
commit
b100721fee
147 changed files with 1661 additions and 1659 deletions
|
|
@ -177,7 +177,7 @@ func GetBlockTreeInfos(ids []string) (ret map[string]*BlockTreeInfo) {
|
|||
|
||||
func GetBlockSiblingID(id string) (parent, previous, next string) {
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -341,7 +341,7 @@ func TransferBlockRef(fromID, toID string, refIDs []string) (err error) {
|
|||
}
|
||||
}
|
||||
|
||||
if err = indexWriteTreeUpsertQueue(tree); nil != err {
|
||||
if err = indexWriteTreeUpsertQueue(tree); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
@ -352,7 +352,7 @@ func TransferBlockRef(fromID, toID string, refIDs []string) (err error) {
|
|||
|
||||
func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
|
||||
refTree, err := LoadTreeByBlockID(refID)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
refNode := treenode.GetNodeInTree(refTree, refID)
|
||||
|
|
@ -363,7 +363,7 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
|
|||
refNode = refNode.Parent
|
||||
}
|
||||
defTree, err := LoadTreeByBlockID(defID)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
sameTree := defTree.ID == refTree.ID
|
||||
|
|
@ -453,11 +453,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
|
|||
}
|
||||
refPivot.Unlink()
|
||||
|
||||
if err = indexWriteTreeUpsertQueue(refTree); nil != err {
|
||||
if err = indexWriteTreeUpsertQueue(refTree); err != nil {
|
||||
return
|
||||
}
|
||||
if !sameTree {
|
||||
if err = indexWriteTreeUpsertQueue(defTree); nil != err {
|
||||
if err = indexWriteTreeUpsertQueue(defTree); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
@ -468,7 +468,7 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
|
|||
|
||||
func GetHeadingDeleteTransaction(id string) (transaction *Transaction, err error) {
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -511,7 +511,7 @@ func GetHeadingDeleteTransaction(id string) (transaction *Transaction, err error
|
|||
|
||||
func GetHeadingChildrenIDs(id string) (ret []string) {
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
heading := treenode.GetNodeInTree(tree, id)
|
||||
|
|
@ -529,7 +529,7 @@ func GetHeadingChildrenIDs(id string) (ret []string) {
|
|||
|
||||
func GetHeadingChildrenDOM(id string) (ret string) {
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
heading := treenode.GetNodeInTree(tree, id)
|
||||
|
|
@ -547,7 +547,7 @@ func GetHeadingChildrenDOM(id string) (ret string) {
|
|||
|
||||
func GetHeadingLevelTransaction(id string, level int) (transaction *Transaction, err error) {
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -606,7 +606,7 @@ func GetBlockDOM(id string) (ret string) {
|
|||
}
|
||||
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
node := treenode.GetNodeInTree(tree, id)
|
||||
|
|
@ -621,7 +621,7 @@ func GetBlockKramdown(id string) (ret string) {
|
|||
}
|
||||
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -650,7 +650,7 @@ func GetChildBlocks(id string) (ret []*ChildBlock) {
|
|||
}
|
||||
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -702,7 +702,7 @@ func GetTailChildBlocks(id string, n int) (ret []*ChildBlock) {
|
|||
}
|
||||
|
||||
tree, err := LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -767,10 +767,10 @@ func getBlock(id string, tree *parse.Tree) (ret *Block, err error) {
|
|||
|
||||
if nil == tree {
|
||||
tree, err = LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
time.Sleep(1 * time.Second)
|
||||
tree, err = LoadTreeByBlockID(id)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue