Fix further go lint ./... warnings

Author: sogko

examples/todo/main.go

@@ -75,12 +75,12 @@ var rootMutation = graphql.NewObject(graphql.ObjectConfig{
 				text, _ := params.Args["text"].(string)
 
 				// figure out new id
-				newId := RandStringRunes(8)
+				newID := RandStringRunes(8)
 
 				// perform mutation operation here
 				// for e.g. create a Todo and save to DB.
 				newTodo := Todo{
-					ID:   newId,
+					ID:   newID,
 					Text: text,
 					Done: false,
 				}

gqlerrors/located.go

@@ -5,7 +5,7 @@ import (
 	"github.com/graphql-go/graphql/language/ast"
 )
 
-// NewLocatedError
+// NewLocatedError creates a graphql.Error with location info
 // @deprecated 0.4.18
 // Already exists in `graphql.NewLocatedError()`
 func NewLocatedError(err interface{}, nodes []ast.Node) *Error {

language/lexer/lexer.go

@@ -121,7 +121,7 @@ func readName(source *source.Source, position int) Token {
 				code >= 48 && code <= 57 || // 0-9
 				code >= 65 && code <= 90 || // A-Z
 				code >= 97 && code <= 122) { // a-z
-			end += 1
+			end++
 			continue
 		} else {
 			break
@@ -140,11 +140,11 @@ func readNumber(s *source.Source, start int, firstCode rune) (Token, error) {
 	position := start
 	isFloat := false
 	if code == 45 { // -
-		position += 1
+		position++
 		code = charCodeAt(body, position)
 	}
 	if code == 48 { // 0
-		position += 1
+		position++
 		code = charCodeAt(body, position)
 		if code >= 48 && code <= 57 {
 			description := fmt.Sprintf("Invalid number, unexpected digit after 0: %v.", printCharCode(code))
@@ -160,7 +160,7 @@ func readNumber(s *source.Source, start int, firstCode rune) (Token, error) {
 	}
 	if code == 46 { // .
 		isFloat = true
-		position += 1
+		position++
 		code = charCodeAt(body, position)
 		p, err := readDigits(s, position, code)
 		if err != nil {
@@ -171,10 +171,10 @@ func readNumber(s *source.Source, start int, firstCode rune) (Token, error) {
 	}
 	if code == 69 || code == 101 { // E e
 		isFloat = true
-		position += 1
+		position++
 		code = charCodeAt(body, position)
 		if code == 43 || code == 45 { // + -
-			position += 1
+			position++
 			code = charCodeAt(body, position)
 		}
 		p, err := readDigits(s, position, code)
@@ -198,7 +198,7 @@ func readDigits(s *source.Source, start int, firstCode rune) (int, error) {
 	if code >= 48 && code <= 57 { // 0 - 9
 		for {
 			if code >= 48 && code <= 57 { // 0 - 9
-				position += 1
+				position++
 				code = charCodeAt(body, position)
 				continue
 			} else {
@@ -230,7 +230,7 @@ func readString(s *source.Source, start int) (Token, error) {
 			if code < 0x0020 && code != 0x0009 {
 				return Token{}, gqlerrors.NewSyntaxError(s, position, fmt.Sprintf(`Invalid character within String: %v.`, printCharCode(code)))
 			}
-			position += 1
+			position++
 			if code == 92 { // \
 				value += body[chunkStart : position-1]
 				code = charCodeAt(body, position)
@@ -278,7 +278,7 @@ func readString(s *source.Source, start int) (Token, error) {
 					return Token{}, gqlerrors.NewSyntaxError(s, position,
 						fmt.Sprintf(`Invalid character escape sequence: \\%c.`, code))
 				}
-				position += 1
+				position++
 				chunkStart = position
 			}
 			continue
@@ -313,11 +313,11 @@ func char2hex(a rune) int {
 		return int(a) - 48
 	} else if a >= 65 && a <= 70 { // A-F
 		return int(a) - 55
-	} else if a >= 97 && a <= 102 { // a-f
+	} else if a >= 97 && a <= 102 {
+		// a-f
 		return int(a) - 87
-	} else {
-		return -1
 	}
+	return -1
 }
 
 func makeToken(kind int, start int, end int, value string) Token {
@@ -409,9 +409,8 @@ func readToken(s *source.Source, fromPosition int) (Token, error) {
 		token, err := readNumber(s, position, code)
 		if err != nil {
 			return token, err
-		} else {
-			return token, nil
 		}
+		return token, nil
 	// "
 	case 34:
 		token, err := readString(s, position)
@@ -428,9 +427,9 @@ func charCodeAt(body string, position int) rune {
 	r := []rune(body)
 	if len(r) > position {
 		return r[position]
-	} else {
-		return -1
 	}
+	return -1
+
 }
 
 // Reads from body starting at startPosition until it finds a non-whitespace
@@ -453,16 +452,16 @@ func positionAfterWhitespace(body string, startPosition int) int {
 				code == 0x000D || // carriage return
 				// Comma
 				code == 0x002C {
-				position += 1
+				position++
 			} else if code == 35 { // #
-				position += 1
+				position++
 				for {
 					code := charCodeAt(body, position)
 					if position < bodyLength &&
 						code != 0 &&
 						// SourceCharacter but not LineTerminator
 						(code > 0x001F || code == 0x0009) && code != 0x000A && code != 0x000D {
-						position += 1
+						position++
 						continue
 					} else {
 						break
@@ -482,9 +481,8 @@ func positionAfterWhitespace(body string, startPosition int) int {
 func GetTokenDesc(token Token) string {
 	if token.Value == "" {
 		return GetTokenKindDesc(token.Kind)
-	} else {
-		return fmt.Sprintf("%s \"%s\"", GetTokenKindDesc(token.Kind), token.Value)
 	}
+	return fmt.Sprintf("%s \"%s\"", GetTokenKindDesc(token.Kind), token.Value)
 }
 
 func GetTokenKindDesc(kind int) string {

language/location/location.go

@@ -23,7 +23,7 @@ func GetLocation(s *source.Source, position int) SourceLocation {
 	for _, match := range matches {
 		matchIndex := match[0]
 		if matchIndex < position {
-			line += 1
+			line++
 			l := len(s.Body[match[0]:match[1]])
 			column = position + 1 - (matchIndex + l)
 			continue

language/parser/parser.go

@@ -363,9 +363,8 @@ func parseSelection(parser *Parser) (interface{}, error) {
 	if peek(parser, lexer.TokenKind[lexer.SPREAD]) {
 		r, err := parseFragment(parser)
 		return r, err
-	} else {
-		return parseField(parser)
 	}
+	return parseField(parser)
 }
 
 /**
@@ -1241,9 +1240,8 @@ func skip(parser *Parser, Kind int) (bool, error) {
 	if parser.Token.Kind == Kind {
 		err := advance(parser)
 		return true, err
-	} else {
-		return false, nil
 	}
+	return false, nil
 }
 
 // If the next token is of the given kind, return that token after advancing

language/type_info/type_info.go renamed to language/typeInfo/type_info.go

@@ -1,13 +1,10 @@
-package type_info
+package typeInfo
 
 import (
 	"github.com/graphql-go/graphql/language/ast"
 )
 
-/**
- * TypeInfoI defines the interface for TypeInfo
- * Implementation
- */
+// TypeInfoI defines the interface for TypeInfo Implementation
 type TypeInfoI interface {
 	Enter(node ast.Node)
 	Leave(node ast.Node)

language/visitor/visitor.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/graphql-go/graphql/language/ast"
-	"github.com/graphql-go/graphql/language/type_info"
+	"github.com/graphql-go/graphql/language/typeInfo"
 	"reflect"
 )
 
@@ -18,7 +18,7 @@ const (
 type KeyMap map[string][]string
 
 // note that the keys are in Capital letters, equivalent to the ast.Node field Names
-var QueryDocumentKeys KeyMap = KeyMap{
+var QueryDocumentKeys = KeyMap{
 	"Name":     []string{},
 	"Document": []string{"Definitions"},
 	"OperationDefinition": []string{
@@ -621,10 +621,9 @@ func updateNodeField(value interface{}, fieldName string, fieldValue interface{}
 					if isPtr == true {
 						retVal = val.Addr().Interface()
 						return retVal
-					} else {
-						retVal = val.Interface()
-						return retVal
 					}
+					retVal = val.Interface()
+					return retVal
 
 				}
 			}
@@ -710,12 +709,10 @@ func isNilNode(node interface{}) bool {
 	return val.Interface() == nil
 }
 
-/**
- * Creates a new visitor instance which delegates to many visitors to run in
- * parallel. Each visitor will be visited for each node before moving on.
- *
- * If a prior visitor edits a node, no following visitors will see that node.
- */
+// VisitInParallel Creates a new visitor instance which delegates to many visitors to run in
+// parallel. Each visitor will be visited for each node before moving on.
+//
+// If a prior visitor edits a node, no following visitors will see that node.
 func VisitInParallel(visitorOptsSlice ...*VisitorOptions) *VisitorOptions {
 	skipping := map[int]interface{}{}
 
@@ -768,23 +765,21 @@ func VisitInParallel(visitorOptsSlice ...*VisitorOptions) *VisitorOptions {
 	}
 }
 
-/**
- * Creates a new visitor instance which maintains a provided TypeInfo instance
- * along with visiting visitor.
- */
-func VisitWithTypeInfo(typeInfo type_info.TypeInfoI, visitorOpts *VisitorOptions) *VisitorOptions {
+// VisitWithTypeInfo Creates a new visitor instance which maintains a provided TypeInfo instance
+// along with visiting visitor.
+func VisitWithTypeInfo(ttypeInfo typeInfo.TypeInfoI, visitorOpts *VisitorOptions) *VisitorOptions {
 	return &VisitorOptions{
 		Enter: func(p VisitFuncParams) (string, interface{}) {
 			if node, ok := p.Node.(ast.Node); ok {
-				typeInfo.Enter(node)
+				ttypeInfo.Enter(node)
 				fn := GetVisitFn(visitorOpts, node.GetKind(), false)
 				if fn != nil {
 					action, result := fn(p)
 					if action == ActionUpdate {
-						typeInfo.Leave(node)
+						ttypeInfo.Leave(node)
 						if isNode(result) {
 							if result, ok := result.(ast.Node); ok {
-								typeInfo.Enter(result)
+								ttypeInfo.Enter(result)
 							}
 						}
 					}
@@ -801,17 +796,15 @@ func VisitWithTypeInfo(typeInfo type_info.TypeInfoI, visitorOpts *VisitorOptions
 				if fn != nil {
 					action, result = fn(p)
 				}
-				typeInfo.Leave(node)
+				ttypeInfo.Leave(node)
 			}
 			return action, result
 		},
 	}
 }
 
-/**
- * Given a visitor instance, if it is leaving or not, and a node kind, return
- * the function the visitor runtime should call.
- */
+// GetVisitFn Given a visitor instance, if it is leaving or not, and a node kind, return
+// the function the visitor runtime should call.
 func GetVisitFn(visitorOpts *VisitorOptions, kind string, isLeaving bool) VisitFunc {
 	if visitorOpts == nil {
 		return nil
@@ -825,35 +818,31 @@ func GetVisitFn(visitorOpts *VisitorOptions, kind string, isLeaving bool) VisitF
 		if isLeaving {
 			// { Kind: { leave() {} } }
 			return kindVisitor.Leave
-		} else {
-			// { Kind: { enter() {} } }
-			return kindVisitor.Enter
 		}
-	} else {
-
-		if isLeaving {
-			// { enter() {} }
-			specificVisitor := visitorOpts.Leave
-			if specificVisitor != nil {
-				return specificVisitor
-			}
-			if specificKindVisitor, ok := visitorOpts.LeaveKindMap[kind]; ok {
-				// { leave: { Kind() {} } }
-				return specificKindVisitor
-			}
+		// { Kind: { enter() {} } }
+		return kindVisitor.Enter
 
-		} else {
-			// { leave() {} }
-			specificVisitor := visitorOpts.Enter
-			if specificVisitor != nil {
-				return specificVisitor
-			}
-			if specificKindVisitor, ok := visitorOpts.EnterKindMap[kind]; ok {
-				// { enter: { Kind() {} } }
-				return specificKindVisitor
-			}
-		}
 	}
+	if isLeaving {
+		// { enter() {} }
+		specificVisitor := visitorOpts.Leave
+		if specificVisitor != nil {
+			return specificVisitor
+		}
+		if specificKindVisitor, ok := visitorOpts.LeaveKindMap[kind]; ok {
+			// { leave: { Kind() {} } }
+			return specificKindVisitor
+		}
 
+	}
+	// { leave() {} }
+	specificVisitor := visitorOpts.Enter
+	if specificVisitor != nil {
+		return specificVisitor
+	}
+	if specificKindVisitor, ok := visitorOpts.EnterKindMap[kind]; ok {
+		// { enter: { Kind() {} } }
+		return specificKindVisitor
+	}
 	return nil
 }