fix golint issues, else blocks (#457)

tools/goctl/api/parser/g4/ast/ast.go

@@ -203,41 +203,40 @@ func (e *defaultExpr) IsNotNil() bool {
 
 func EqualDoc(spec1, spec2 Spec) bool {
 	if spec1 == nil {
-		if spec2 != nil {
+		return spec2 == nil
+	}
+
+	if spec2 == nil {
+		return false
+	}
+
+	var expectDoc, actualDoc []Expr
+	expectDoc = append(expectDoc, spec2.Doc()...)
+	actualDoc = append(actualDoc, spec1.Doc()...)
+	sort.Slice(expectDoc, func(i, j int) bool {
+		return expectDoc[i].Line() < expectDoc[j].Line()
+	})
+
+	for index, each := range actualDoc {
+		if !each.Equal(actualDoc[index]) {
 			return false
 		}
-		return true
-	} else {
-		if spec2 == nil {
-			return false
-		}
-
-		var expectDoc, actualDoc []Expr
-		expectDoc = append(expectDoc, spec2.Doc()...)
-		actualDoc = append(actualDoc, spec1.Doc()...)
-		sort.Slice(expectDoc, func(i, j int) bool {
-			return expectDoc[i].Line() < expectDoc[j].Line()
-		})
-
-		for index, each := range actualDoc {
-			if !each.Equal(actualDoc[index]) {
-				return false
-			}
-		}
-
-		if spec1.Comment() != nil {
-			if spec2.Comment() == nil {
-				return false
-			}
-			if !spec1.Comment().Equal(spec2.Comment()) {
-				return false
-			}
-		} else {
-			if spec2.Comment() != nil {
-				return false
-			}
-		}
 	}
+
+	if spec1.Comment() != nil {
+		if spec2.Comment() == nil {
+			return false
+		}
+
+		if !spec1.Comment().Equal(spec2.Comment()) {
+			return false
+		}
+	} else {
+		if spec2.Comment() != nil {
+			return false
+		}
+	}
+
 	return true
 }
 
@@ -295,8 +294,10 @@ func (v *ApiVisitor) getHiddenTokensToLeft(t TokenStream, channel int, containsC
 				}
 			}
 		}
+
 		list = append(list, v.newExprWithToken(each))
 	}
+
 	return list
 }
 
@@ -307,6 +308,7 @@ func (v *ApiVisitor) getHiddenTokensToRight(t TokenStream, channel int) []Expr {
 	for _, each := range tokens {
 		list = append(list, v.newExprWithToken(each))
 	}
+
 	return list
 }
 
@@ -314,6 +316,7 @@ func (v *ApiVisitor) exportCheck(expr Expr) {
 	if expr == nil || !expr.IsNotNil() {
 		return
 	}
+
 	if api.IsBasicType(expr.Text()) {
 		return
 	}

tools/goctl/api/parser/g4/ast/service.go

@@ -508,9 +508,9 @@ func (s *ServiceRoute) Format() error {
 func (s *ServiceRoute) GetHandler() Expr {
 	if s.AtHandler != nil {
 		return s.AtHandler.Name
-	} else {
-		return s.AtServer.Kv.Get("handler")
 	}
+
+	return s.AtServer.Kv.Get("handler")
 }
 
 func (a *ServiceApi) Format() error {

tools/goctl/api/parser/parser.go

@@ -1,7 +1,6 @@
 package parser
 
 import (
-	"errors"
 	"fmt"
 	"path/filepath"
 	"unicode"
@@ -101,7 +100,7 @@ func (p parser) fillTypes() error {
 				Docs:    p.stringExprs(v.Doc()),
 			})
 		default:
-			return errors.New(fmt.Sprintf("unknown type %+v", v))
+			return fmt.Errorf("unknown type %+v", v)
 		}
 	}
 
@@ -116,16 +115,16 @@ func (p parser) fillTypes() error {
 					tp, err := p.findDefinedType(v.RawName)
 					if err != nil {
 						return err
-					} else {
-						member.Type = *tp
 					}
+
+					member.Type = *tp
 				}
 				members = append(members, member)
 			}
 			v.Members = members
 			types = append(types, v)
 		default:
-			return errors.New(fmt.Sprintf("unknown type %+v", v))
+			return fmt.Errorf("unknown type %+v", v)
 		}
 	}
 	p.spec.Types = types
@@ -141,7 +140,8 @@ func (p parser) findDefinedType(name string) (*spec.Type, error) {
 			}
 		}
 	}
-	return nil, errors.New(fmt.Sprintf("type %s not defined", name))
+
+	return nil, fmt.Errorf("type %s not defined", name)
 }
 
 func (p parser) fieldToMember(field *ast.TypeField) spec.Member {
@@ -172,9 +172,9 @@ func (p parser) astTypeToSpec(in ast.DataType) spec.Type {
 		raw := v.Literal.Text()
 		if api.IsBasicType(raw) {
 			return spec.PrimitiveType{RawName: raw}
-		} else {
-			return spec.DefineStruct{RawName: raw}
 		}
+
+		return spec.DefineStruct{RawName: raw}
 	case *ast.Interface:
 		return spec.InterfaceType{RawName: v.Literal.Text()}
 	case *ast.Map:
@@ -185,9 +185,9 @@ func (p parser) astTypeToSpec(in ast.DataType) spec.Type {
 		raw := v.Name.Text()
 		if api.IsBasicType(raw) {
 			return spec.PointerType{RawName: v.PointerExpr.Text(), Type: spec.PrimitiveType{RawName: raw}}
-		} else {
-			return spec.PointerType{RawName: v.PointerExpr.Text(), Type: spec.DefineStruct{RawName: raw}}
 		}
+
+		return spec.PointerType{RawName: v.PointerExpr.Text(), Type: spec.DefineStruct{RawName: raw}}
 	}
 
 	panic(fmt.Sprintf("unspported type %+v", in))
@@ -246,8 +246,8 @@ func (p parser) fillService() error {
 
 				for _, char := range route.Handler {
 					if !unicode.IsDigit(char) && !unicode.IsLetter(char) {
-						return errors.New(fmt.Sprintf("route [%s] handler [%s] invalid, handler name should only contains letter or digit",
-							route.Path, route.Handler))
+						return fmt.Errorf("route [%s] handler [%s] invalid, handler name should only contains letter or digit",
+							route.Path, route.Handler)
 					}
 				}
 			}
@@ -278,7 +278,7 @@ func (p parser) fillService() error {
 
 			name := item.ServiceApi.Name.Text()
 			if len(p.spec.Service.Name) > 0 && p.spec.Service.Name != name {
-				return errors.New(fmt.Sprintf("mulit service name defined %s and %s", name, p.spec.Service.Name))
+				return fmt.Errorf("mulit service name defined %s and %s", name, p.spec.Service.Name)
 			}
 			p.spec.Service.Name = name
 		}