5 files changed, 25 insertions, 12 deletions
diff --git a/vendor/github.com/bombsimon/wsl/v4/.gitignore b/vendor/github.com/bombsimon/wsl/v4/.gitignore
index 1c8eba613..b37c69481 100644
--- a/vendor/github.com/bombsimon/wsl/v4/.gitignore
+++ b/vendor/github.com/bombsimon/wsl/v4/.gitignore
@@ -68,3 +68,5 @@ tags
 
 
 # End of https://www.gitignore.io/api/go,vim,macos
+
+.idea/
diff --git a/vendor/github.com/bombsimon/wsl/v4/.golangci.yml b/vendor/github.com/bombsimon/wsl/v4/.golangci.yml
index 543012008..bde0ae54e 100644
--- a/vendor/github.com/bombsimon/wsl/v4/.golangci.yml
+++ b/vendor/github.com/bombsimon/wsl/v4/.golangci.yml
@@ -1,24 +1,25 @@
 ---
 run:
-  deadline: 1m
+  timeout: 1m
   issues-exit-code: 1
   tests: true
-  skip-dirs:
-    - vendor$
 
 output:
-  format: colored-line-number
   print-issued-lines: false
+  sort-results: true
+  formats:
+    - format: colored-line-number
 
 linters-settings:
   gocognit:
     min-complexity: 10
 
   depguard:
-    list-type: blacklist
-    include-go-root: false
-    packages:
-      - github.com/davecgh/go-spew/spew
+    rules:
+      main:
+        deny:
+          - pkg: "github.com/davecgh/go-spew/spew"
+            desc: not allowed
 
   misspell:
     locale: US
@@ -70,8 +71,6 @@ linters:
     - varcheck
     - varnamelen
     - wastedassign
-  fast: false
-
 
 issues:
   exclude-use-default: true
diff --git a/vendor/github.com/bombsimon/wsl/v4/README.md b/vendor/github.com/bombsimon/wsl/v4/README.md
index 0bcf01d96..c9c42341e 100644
--- a/vendor/github.com/bombsimon/wsl/v4/README.md
+++ b/vendor/github.com/bombsimon/wsl/v4/README.md
@@ -20,7 +20,7 @@ make something configurable!
 
 ```sh
 # Latest release
-go install github.com/bombsimon/wsl/v4/cmd/wsl
+go install github.com/bombsimon/wsl/v4/cmd/wsl@latest
 
 # Main branch
 go install github.com/bombsimon/wsl/v4/cmd/wsl@master
diff --git a/vendor/github.com/bombsimon/wsl/v4/analyzer.go b/vendor/github.com/bombsimon/wsl/v4/analyzer.go
index b8eac1587..46d5019a7 100644
--- a/vendor/github.com/bombsimon/wsl/v4/analyzer.go
+++ b/vendor/github.com/bombsimon/wsl/v4/analyzer.go
@@ -2,6 +2,7 @@ package wsl
 
 import (
 	"flag"
+	"go/ast"
 	"strings"
 
 	"golang.org/x/tools/go/analysis"
@@ -30,6 +31,7 @@ func defaultConfig() *Configuration {
 		ForceCuddleErrCheckAndAssign:     false,
 		ForceExclusiveShortDeclarations:  false,
 		StrictAppend:                     true,
+		IncludeGenerated:                 false,
 		AllowCuddleWithCalls:             []string{"Lock", "RLock"},
 		AllowCuddleWithRHS:               []string{"Unlock", "RUnlock"},
 		ErrorVariableNames:               []string{"err"},
@@ -64,6 +66,7 @@ func (wa *wslAnalyzer) flags() flag.FlagSet {
 	flags.BoolVar(&wa.config.ForceCuddleErrCheckAndAssign, "force-err-cuddling", false, "Force cuddling of error checks with error var assignment")
 	flags.BoolVar(&wa.config.ForceExclusiveShortDeclarations, "force-short-decl-cuddling", false, "Force short declarations to cuddle by themselves")
 	flags.BoolVar(&wa.config.StrictAppend, "strict-append", true, "Strict rules for append")
+	flags.BoolVar(&wa.config.IncludeGenerated, "include-generated", false, "Include generated files")
 	flags.IntVar(&wa.config.ForceCaseTrailingWhitespaceLimit, "force-case-trailing-whitespace", 0, "Force newlines for case blocks > this number.")
 
 	flags.Var(&multiStringValue{slicePtr: &wa.config.AllowCuddleWithCalls}, "allow-cuddle-with-calls", "Comma separated list of idents that can have cuddles after")
@@ -75,6 +78,10 @@ func (wa *wslAnalyzer) flags() flag.FlagSet {
 
 func (wa *wslAnalyzer) run(pass *analysis.Pass) (interface{}, error) {
 	for _, file := range pass.Files {
+		if !wa.config.IncludeGenerated && ast.IsGenerated(file) {
+			continue
+		}
+
 		filename := pass.Fset.PositionFor(file.Pos(), false).Filename
 		if !strings.HasSuffix(filename, ".go") {
 			continue
diff --git a/vendor/github.com/bombsimon/wsl/v4/wsl.go b/vendor/github.com/bombsimon/wsl/v4/wsl.go
index 6fd33335a..76f4abf61 100644
--- a/vendor/github.com/bombsimon/wsl/v4/wsl.go
+++ b/vendor/github.com/bombsimon/wsl/v4/wsl.go
@@ -174,6 +174,11 @@ type Configuration struct {
 	//
 	// is not allowed. This logic overrides ForceCuddleErrCheckAndAssign among others.
 	ForceExclusiveShortDeclarations bool
+
+	// IncludeGenerated will include generated files in the analysis and report
+	// errors even for generated files. Can be useful when developing
+	// generators.
+	IncludeGenerated bool
 }
 
 // fix is a range to fixup.
@@ -578,7 +583,7 @@ func (p *processor) parseBlockStatements(statements []ast.Stmt) {
 				}
 
 				p.addWhitespaceBeforeError(t, reasonExpressionCuddledWithDeclOrRet)
-			case *ast.IfStmt, *ast.RangeStmt, *ast.SwitchStmt:
+			case *ast.IfStmt, *ast.RangeStmt, *ast.SwitchStmt, *ast.TypeSwitchStmt, *ast.ForStmt:
 				p.addWhitespaceBeforeError(t, reasonExpressionCuddledWithBlock)
 			}