chore: enable whitespace linter and fix errors (robertkrimen#456)

Enable the whitespace linter and fix the errors resulting from it.

Also:
* Remove unneeded golangci-lint config for disabled linters.
* Correct test number for panic in previous commit.

.golangci.yml

@@ -1,5 +1,4 @@
 run:
-  concurrency: 4
   deadline: 6m
   skip-dirs:
     - terst
@@ -9,17 +8,9 @@ run:
 linters-settings:
   govet:
     check-shadowing: false
-  gocyclo:
-    min-complexity: 20
-  maligned:
-    suggest-new: true
-  dupl:
-    threshold: 100
   goconst:
     min-len: 2
     min-occurrences: 4
-  cyclop:
-    max-complexity: 15
 
 linters:
   enable-all: true
@@ -62,7 +53,6 @@ linters:
     - nakedret
     - nestif
     - revive
-    - whitespace
     - errorlint
     - exhaustive
     - forcetypeassert
@@ -81,8 +71,3 @@ linters:
     - dupword
     - gci
 
-issues:
-  exclude:
-    - .*Id.* should be .*ID.*
-  exclude-use-default: false
-  max-same-issues: 0

builtin.go

@@ -287,7 +287,6 @@ func builtin_escape(input string) string {
 				)
 			}
 			index += width
-
 		} else {
 			output = append(output, input[index])
 			index += 1

builtin_array.go

@@ -389,7 +389,6 @@ func sortCompare(thisObject *_object, index0, index1 uint, compare *_object) int
 }
 
 func arraySortSwap(thisObject *_object, index0, index1 uint) {
-
 	j := struct {
 		name   string
 		exists bool

builtin_string.go

@@ -262,7 +262,6 @@ func builtinString_replace(call FunctionCall) Value {
 				result = append(result, []byte(replacement)...)
 				lastIndex = match[1]
 			}
-
 		} else {
 			replace := []byte(replaceValue.string())
 			for _, match := range found {
@@ -373,7 +372,6 @@ func builtinString_split(call FunctionCall) Value {
 
 	RETURN:
 		return toValue_object(call.runtime.newArrayOf(valueArray))
-
 	} else {
 		separator := separatorValue.string()
 

clone.go

@@ -13,7 +13,6 @@ type _clone struct {
 }
 
 func (in *_runtime) clone() *_runtime {
-
 	in.lck.Lock()
 	defer in.lck.Unlock()
 

cmpl_evaluate.go

@@ -18,7 +18,6 @@ func (self *_runtime) cmpl_evaluate_nodeProgram(node *_nodeProgram, eval bool) V
 }
 
 func (self *_runtime) cmpl_call_nodeFunction(function *_object, stash *_fnStash, node *_nodeFunctionLiteral, this Value, argumentList []Value) Value {
-
 	indexOfParameterName := make([]string, len(argumentList))
 	// function(abc, def, ghi)
 	// indexOfParameterName[0] = "abc"

cmpl_evaluate_expression.go

@@ -23,7 +23,6 @@ func (self *_runtime) cmpl_evaluate_nodeExpression(node _nodeExpression) Value {
 	}
 
 	switch node := node.(type) {
-
 	case *_nodeArrayLiteral:
 		return self.cmpl_evaluate_nodeArrayLiteral(node)
 
@@ -102,7 +101,6 @@ func (self *_runtime) cmpl_evaluate_nodeExpression(node _nodeExpression) Value {
 }
 
 func (self *_runtime) cmpl_evaluate_nodeArrayLiteral(node *_nodeArrayLiteral) Value {
-
 	valueArray := []Value{}
 
 	for _, node := range node.value {
@@ -119,7 +117,6 @@ func (self *_runtime) cmpl_evaluate_nodeArrayLiteral(node *_nodeArrayLiteral) Va
 }
 
 func (self *_runtime) cmpl_evaluate_nodeAssignExpression(node *_nodeAssignExpression) Value {
-
 	left := self.cmpl_evaluate_nodeExpression(node.left)
 	right := self.cmpl_evaluate_nodeExpression(node.right)
 	rightValue := right.resolve()
@@ -135,7 +132,6 @@ func (self *_runtime) cmpl_evaluate_nodeAssignExpression(node *_nodeAssignExpres
 }
 
 func (self *_runtime) cmpl_evaluate_nodeBinaryExpression(node *_nodeBinaryExpression) Value {
-
 	left := self.cmpl_evaluate_nodeExpression(node.left)
 	leftValue := left.resolve()
 
@@ -159,7 +155,6 @@ func (self *_runtime) cmpl_evaluate_nodeBinaryExpression(node *_nodeBinaryExpres
 }
 
 func (self *_runtime) cmpl_evaluate_nodeBinaryExpression_comparison(node *_nodeBinaryExpression) Value {
-
 	left := self.cmpl_evaluate_nodeExpression(node.left).resolve()
 	right := self.cmpl_evaluate_nodeExpression(node.right).resolve()
 
@@ -312,7 +307,6 @@ func (self *_runtime) cmpl_evaluate_nodeNewExpression(node *_nodeNewExpression)
 }
 
 func (self *_runtime) cmpl_evaluate_nodeObjectLiteral(node *_nodeObjectLiteral) Value {
-
 	result := self.newObject()
 
 	for _, property := range node.value {
@@ -349,7 +343,6 @@ func (self *_runtime) cmpl_evaluate_nodeSequenceExpression(node *_nodeSequenceEx
 }
 
 func (self *_runtime) cmpl_evaluate_nodeUnaryExpression(node *_nodeUnaryExpression) Value {
-
 	target := self.cmpl_evaluate_nodeExpression(node.operand)
 	switch node.operator {
 	case token.TYPEOF, token.DELETE:

cmpl_evaluate_statement.go

@@ -22,7 +22,6 @@ func (self *_runtime) cmpl_evaluate_nodeStatement(node _nodeStatement) Value {
 	}
 
 	switch node := node.(type) {
-
 	case *_nodeBlockStatement:
 		labels := self.labels
 		self.labels = nil
@@ -109,7 +108,6 @@ func (self *_runtime) cmpl_evaluate_nodeStatement(node _nodeStatement) Value {
 
 	case *_nodeWithStatement:
 		return self.cmpl_evaluate_nodeWithStatement(node)
-
 	}
 
 	panic(fmt.Errorf("Here be dragons: evaluate_nodeStatement(%T)", node))
@@ -136,7 +134,6 @@ func (self *_runtime) cmpl_evaluate_nodeStatementList(list []_nodeStatement) Val
 }
 
 func (self *_runtime) cmpl_evaluate_nodeDoWhileStatement(node *_nodeDoWhileStatement) Value {
-
 	labels := append(self.labels, "")
 	self.labels = nil
 
@@ -172,7 +169,6 @@ resultBreak:
 }
 
 func (self *_runtime) cmpl_evaluate_nodeForInStatement(node *_nodeForInStatement) Value {
-
 	labels := append(self.labels, "")
 	self.labels = nil
 
@@ -235,7 +231,6 @@ func (self *_runtime) cmpl_evaluate_nodeForInStatement(node *_nodeForInStatement
 }
 
 func (self *_runtime) cmpl_evaluate_nodeForStatement(node *_nodeForStatement) Value {
-
 	labels := append(self.labels, "")
 	self.labels = nil
 
@@ -309,7 +304,6 @@ func (self *_runtime) cmpl_evaluate_nodeIfStatement(node *_nodeIfStatement) Valu
 }
 
 func (self *_runtime) cmpl_evaluate_nodeSwitchStatement(node *_nodeSwitchStatement) Value {
-
 	labels := append(self.labels, "")
 	self.labels = nil
 
@@ -388,7 +382,6 @@ func (self *_runtime) cmpl_evaluate_nodeTryStatement(node *_nodeTryStatement) Va
 }
 
 func (self *_runtime) cmpl_evaluate_nodeWhileStatement(node *_nodeWhileStatement) Value {
-
 	test := node.test
 	body := node.body
 	labels := append(self.labels, "")

cmpl_parse.go

@@ -20,7 +20,6 @@ func (cmpl *_compiler) parseExpression(in ast.Expression) _nodeExpression {
 	}
 
 	switch in := in.(type) {
-
 	case *ast.ArrayLiteral:
 		out := &_nodeArrayLiteral{
 			value: make([]_nodeExpression, len(in.Value)),
@@ -190,7 +189,6 @@ func (cmpl *_compiler) parseExpression(in ast.Expression) _nodeExpression {
 			name:        in.Name,
 			initializer: cmpl.parseExpression(in.Initializer),
 		}
-
 	}
 
 	panic(fmt.Errorf("Here be dragons: cmpl.parseExpression(%T)", in))
@@ -202,7 +200,6 @@ func (cmpl *_compiler) parseStatement(in ast.Statement) _nodeStatement {
 	}
 
 	switch in := in.(type) {
-
 	case *ast.BlockStatement:
 		out := &_nodeBlockStatement{
 			list: make([]_nodeStatement, len(in.List)),
@@ -353,7 +350,6 @@ func (cmpl *_compiler) parseStatement(in ast.Statement) _nodeStatement {
 			object: cmpl.parseExpression(in.Object),
 			body:   cmpl.parseStatement(in.Body),
 		}
-
 	}
 
 	panic(fmt.Errorf("Here be dragons: cmpl.parseStatement(%T)", in))

cmpl_test.go

@@ -34,7 +34,6 @@ func Test_cmpl(t *testing.T) {
 
 func TestParse_cmpl(t *testing.T) {
 	tt(t, func() {
-
 		test := func(src string) {
 			program, err := parser.ParseFile(nil, "", src, 0)
 			is(err, nil)

console.go

@@ -46,6 +46,5 @@ func builtinConsole_assert(call FunctionCall) Value {
 }
 
 func (runtime *_runtime) newConsole() *_object {
-
 	return newConsoleObject(runtime)
 }

error_test.go

@@ -245,7 +245,6 @@ func TestErrorContext(t *testing.T) {
 			is(len(err1.trace), 1)
 			is(err1.trace[0].location(), "C (file1.js:7:5)")
 		}
-
 	})
 }
 

evaluate.go

@@ -53,11 +53,9 @@ func (self *_runtime) evaluateModulo(left float64, right float64) Value {
 }
 
 func (self *_runtime) calculateBinaryExpression(operator token.Token, left Value, right Value) Value {
-
 	leftValue := left.resolve()
 
 	switch operator {
-
 	// Additive
 	case token.PLUS:
 		leftValue = toPrimitive(leftValue)
@@ -209,7 +207,6 @@ var lessThanTable [4](map[_lessThanResult]bool) = [4](map[_lessThanResult]bool){
 }
 
 func (self *_runtime) calculateComparison(comparator token.Token, left Value, right Value) bool {
-
 	// FIXME Use strictEqualityComparison?
 	// TODO This might be redundant now (with regards to evaluateComparison)
 	x := left.resolve()

global.go

@@ -42,7 +42,6 @@ var (
 )
 
 func newContext() *_runtime {
-
 	self := &_runtime{}
 
 	self.globalStash = self.newObjectStash(nil, nil)
@@ -131,7 +130,6 @@ func (runtime *_runtime) newNumber(value Value) *_object {
 }
 
 func (runtime *_runtime) newRegExp(patternValue Value, flagsValue Value) *_object {
-
 	pattern := ""
 	flags := ""
 	if object := patternValue._object(); object != nil && object.class == classRegExp {

issue_test.go

@@ -765,7 +765,6 @@ func Test_issue266(t *testing.T) {
 				return a - b;
 			});
         `, "-200000000000,0,200000000000")
-
 	})
 }
 
@@ -929,7 +928,7 @@ func Test_issue386(t *testing.T) {
 	}
 }
 
-func Test_issue382(t *testing.T) {
+func Test_issue383(t *testing.T) {
 	vm := New()
 	vm.Set("panicFunc", func(call FunctionCall) Value {
 		panic("test")

object_class.go

@@ -244,7 +244,6 @@ func _objectCanPut(self *_object, name string) (canPut bool, property *_property
 
 // 8.12.5
 func objectPut(self *_object, name string, value Value, throw bool) {
-
 	if true {
 		// Shortcut...
 		//

otto.go

@@ -532,7 +532,6 @@ func (self Otto) ContextSkip(limit int, skipNative bool) (ctx Context) {
 //	// value is [ 1, 2, 3, undefined, 4, 5, 6, 7, "abc" ]
 //	value, _ := vm.Call(`[ 1, 2, 3, undefined, 4 ].concat`, nil, 5, 6, 7, "abc")
 func (self Otto) Call(source string, this interface{}, argumentList ...interface{}) (Value, error) {
-
 	thisValue := Value{}
 
 	construct := false

otto_error_test.go

@@ -43,6 +43,5 @@ func TestOttoError(t *testing.T) {
             xyzzy
         `)
 		is(err, "ReferenceError: 'xyzzy' is not defined")
-
 	})
 }

otto_test.go

@@ -913,7 +913,6 @@ func TestDotMember(t *testing.T) {
 
 func Test_stringToFloat(t *testing.T) {
 	tt(t, func() {
-
 		is(parseNumber("10e10000"), _Infinity)
 		is(parseNumber("10e10_."), _NaN)
 	})
@@ -1350,7 +1349,6 @@ func TestOttoCall_clone(t *testing.T) {
 			is(err, nil)
 			is(value, `function() { return "abc"; },function() { return "ghi"; }`)
 		}
-
 	})
 }
 

parser/comments_test.go

@@ -1418,7 +1418,6 @@ a = /*comment1*/new /*comment2*/ obj/*comment3*/()
 		is(checkComments((parser.comments.CommentMap)[program.Body[0].(*ast.ExpressionStatement).Expression.(*ast.AssignExpression).Right], []string{"comment1"}, ast.LEADING), nil)
 		is(checkComments((parser.comments.CommentMap)[program.Body[0].(*ast.ExpressionStatement).Expression.(*ast.AssignExpression).Right.(*ast.NewExpression).Callee], []string{"comment2"}, ast.LEADING), nil)
 		is(checkComments((parser.comments.CommentMap)[program.Body[0].(*ast.ExpressionStatement).Expression.(*ast.AssignExpression).Right.(*ast.NewExpression).Callee], []string{"comment3"}, ast.TRAILING), nil)
-
 	})
 }
 
@@ -1439,6 +1438,5 @@ a = /*comment1*/new /*comment2*/ obj/*comment3*/()
 		n := program.Body[0]
 		fmt.Printf("FOUND NODE: %v, number of comments: %v\n", reflect.TypeOf(n), len(parser.comments.CommentMap[n]))
 		displayComments(parser.comments.CommentMap)
-
 	})
 }