Bump wsl to v2.0.0

Author: bombsimon

.golangci.example.yml

@@ -223,10 +223,12 @@ linters-settings:
     allow-assign-and-call: true
     # Allow multiline assignments to be cuddled. Default is true.
     allow-multiline-assign: true
-    # Allow case blocks to end with a whitespace.
-    allow-case-traling-whitespace: true
     # Allow declarations (var) to be cuddled.
     allow-cuddle-declarations: false
+    # Allow trailing comments in ending of blocks
+    allow-trailing-comment: false
+    # Force newlines in end of case at this limit (0 = never).
+    force-case-trailing-whitespace: 0
 
 linters:
   enable:

README.md

@@ -824,10 +824,12 @@ linters-settings:
     allow-assign-and-call: true
     # Allow multiline assignments to be cuddled. Default is true.
     allow-multiline-assign: true
-    # Allow case blocks to end with a whitespace.
-    allow-case-traling-whitespace: true
     # Allow declarations (var) to be cuddled.
     allow-cuddle-declarations: false
+    # Allow trailing comments in ending of blocks
+    allow-trailing-comment: false
+    # Force newlines in end of case at this limit (0 = never).
+    force-case-trailing-whitespace: 0
 
 linters:
   enable:

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/OpenPeeDeeP/depguard v1.0.1
-	github.com/bombsimon/wsl v1.2.5
+	github.com/bombsimon/wsl/v2 v2.0.0
 	github.com/fatih/color v1.7.0
 	github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db
 	github.com/go-lintpack/lintpack v0.5.2
@@ -41,8 +41,8 @@ require (
 	github.com/ultraware/whitespace v0.0.4
 	github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517
 	github.com/valyala/quicktemplate v1.2.0
-	golang.org/x/tools v0.0.0-20191010075000-0337d82405ff
-	gopkg.in/yaml.v2 v2.2.4
+	golang.org/x/tools v0.0.0-20191113232020-e2727e816f5a
+	gopkg.in/yaml.v2 v2.2.5
 	honnef.co/go/tools v0.0.1-2019.2.3
 	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed
 	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect

go.sum

@@ -11,8 +11,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/bombsimon/wsl v1.2.5 h1:9gTOkIwVtoDZywvX802SDHokeX4kW1cKnV8ZTVAPkRs=
-github.com/bombsimon/wsl v1.2.5/go.mod h1:43lEF/i0kpXbLCeDXL9LMT8c92HyBywXb0AsgMHYngM=
+github.com/bombsimon/wsl/v2 v2.0.0 h1:+Vjcn+/T5lSrO8Bjzhk4v14Un/2UyCA1E3V5j9nwTkQ=
+github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -311,8 +311,8 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

pkg/config/config.go

@@ -255,11 +255,12 @@ type GocognitSettings struct {
 }
 
 type WSLSettings struct {
-	StrictAppend                bool `mapstructure:"strict-append"`
-	AllowAssignAndCallCuddle    bool `mapstructure:"allow-assign-and-call"`
-	AllowMultiLineAssignCuddle  bool `mapstructure:"allow-multiline-assign"`
-	AllowCaseTrailingWhitespace bool `mapstructure:"allow-case-trailing-whitespace"`
-	AllowCuddleDeclaration      bool `mapstructure:"allow-cuddle-declarations"`
+	StrictAppend                     bool `mapstructure:"strict-append"`
+	AllowAssignAndCallCuddle         bool `mapstructure:"allow-assign-and-call"`
+	AllowMultiLineAssignCuddle       bool `mapstructure:"allow-multiline-assign"`
+	AllowCuddleDeclaration           bool `mapstructure:"allow-cuddle-declarations"`
+	AllowTrailingComment             bool `mapstructure:"allow-trailing-comment"`
+	CaseForceTrailingWhitespaceLimit int  `mapstructure:"force-case-trailing-whitespace:"`
 }
 
 var defaultLintersSettings = LintersSettings{
@@ -291,11 +292,12 @@ var defaultLintersSettings = LintersSettings{
 		MinComplexity: 30,
 	},
 	WSL: WSLSettings{
-		StrictAppend:                true,
-		AllowAssignAndCallCuddle:    true,
-		AllowMultiLineAssignCuddle:  true,
-		AllowCaseTrailingWhitespace: true,
-		AllowCuddleDeclaration:      false,
+		StrictAppend:                     true,
+		AllowAssignAndCallCuddle:         true,
+		AllowMultiLineAssignCuddle:       true,
+		AllowCuddleDeclaration:           false,
+		AllowTrailingComment:             false,
+		CaseForceTrailingWhitespaceLimit: 0,
 	},
 }
 

pkg/golinters/wsl.go

@@ -3,7 +3,7 @@ package golinters
 import (
 	"sync"
 
-	"github.com/bombsimon/wsl"
+	"github.com/bombsimon/wsl/v2"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
@@ -37,13 +37,14 @@ func NewWSL() *goanalysis.Linter {
 				files        = []string{}
 				linterCfg    = lintCtx.Cfg.LintersSettings.WSL
 				processorCfg = wsl.Configuration{
-					StrictAppend:                linterCfg.StrictAppend,
-					AllowAssignAndCallCuddle:    linterCfg.AllowAssignAndCallCuddle,
-					AllowMultiLineAssignCuddle:  linterCfg.AllowMultiLineAssignCuddle,
-					AllowCaseTrailingWhitespace: linterCfg.AllowCaseTrailingWhitespace,
-					AllowCuddleDeclaration:      linterCfg.AllowCuddleDeclaration,
-					AllowCuddleWithCalls:        []string{"Lock", "RLock"},
-					AllowCuddleWithRHS:          []string{"Unlock", "RUnlock"},
+					StrictAppend:                     linterCfg.StrictAppend,
+					AllowAssignAndCallCuddle:         linterCfg.AllowAssignAndCallCuddle,
+					AllowMultiLineAssignCuddle:       linterCfg.AllowMultiLineAssignCuddle,
+					AllowCuddleDeclaration:           linterCfg.AllowCuddleDeclaration,
+					AllowTrailingComment:             linterCfg.AllowTrailingComment,
+					CaseForceTrailingWhitespaceLimit: linterCfg.CaseForceTrailingWhitespaceLimit,
+					AllowCuddleWithCalls:             []string{"Lock", "RLock"},
+					AllowCuddleWithRHS:               []string{"Unlock", "RUnlock"},
 				}
 			)
 

test/testdata/wsl.go

@@ -159,7 +159,7 @@ func allowTrailing(i int) {
 
 	case 2:
 		fmt.Println("two")
-
+		// Comments OK too!
 	case 3:
 		fmt.Println("three")
 	}
@@ -172,3 +172,41 @@ func ExampleSomeOutput() {
 	// Output:
 	// Hello, world
 }
+
+func IncDecStmt() {
+	counter := 0
+	for range make([]int, 5) {
+		counter++
+	}
+
+	type t struct {
+		counter int
+	}
+
+	x := t{5}
+
+	x.counter--
+	if x.counter > 0 {
+		fmt.Println("not yet 0")
+	}
+}
+
+func AnonymousBlock() {
+	func(a, b int) { // ERROR "block should not start with a whitespace"
+
+		fmt.Println(a + b)
+	}(1, 1)
+}
+
+func MultilineComment() {
+	if true {
+		/*
+			Ok to start block with
+			a
+			long
+			multiline
+			cmoment
+		*/
+		fmt.Println("true")
+	}
+}