Update whitespace to v0.0.4 (#786)

NiseVoid · jirfag · commit fbbd24575f02 · 2019-10-04T15:12:07.000+03:00
diff --git a/.golangci.example.yml b/.golangci.example.yml
@@ -209,7 +209,8 @@ linters-settings:
     max-blank-identifiers: 2
 
   whitespace:
-    multi-if: false
+    multi-if: false   # Enforces newlines (or comments) after every multi-line if statement
+    multi-func: false # Enforces newlines (or comments) after every multi-line function signature
 
 linters:
   enable:
diff --git a/README.md b/README.md
@@ -799,7 +799,8 @@ linters-settings:
     max-blank-identifiers: 2
 
   whitespace:
-    multi-if: false
+    multi-if: false   # Enforces newlines (or comments) after every multi-line if statement
+    multi-func: false # Enforces newlines (or comments) after every multi-line function signature
 
 linters:
   enable:
diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/stretchr/testify v1.4.0
 	github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e
 	github.com/ultraware/funlen v0.0.2
-	github.com/ultraware/whitespace v0.0.3
+	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-20190912215617-3720d1ec3678
diff --git a/go.sum b/go.sum
@@ -232,8 +232,8 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ultraware/funlen v0.0.2 h1:Av96YVBwwNSe4MLR7iI/BIa3VyI7/djnto/pK3Uxbdo=
 github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
-github.com/ultraware/whitespace v0.0.3 h1:S5BCRRB5sttNy0bSOhbpw+0mb+cHiCmWfrvxpEzuUk0=
-github.com/ultraware/whitespace v0.0.3/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
+github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg=
+github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
 github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517 h1:ChMKTho2hWKpks/nD/FL2KqM1wuVt62oJeiE8+eFpGs=
 github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -175,7 +175,8 @@ type LintersSettings struct {
 		Statements int
 	}
 	Whitespace struct {
-		MultiIf bool `mapstructure:"multi-if"`
+		MultiIf   bool `mapstructure:"multi-if"`
+		MultiFunc bool `mapstructure:"multi-func"`
 	}
 
 	Lll      LllSettings
diff --git a/pkg/golinters/whitespace.go b/pkg/golinters/whitespace.go
@@ -28,7 +28,8 @@ func NewWhitespace() *goanalysis.Linter {
 		[]*analysis.Analyzer{analyzer},
 		nil,
 	).WithContextSetter(func(lintCtx *linter.Context) {
-		settings := whitespace.Settings{MultiIf: lintCtx.Cfg.LintersSettings.Whitespace.MultiIf}
+		cfg := lintCtx.Cfg.LintersSettings.Whitespace
+		settings := whitespace.Settings{MultiIf: cfg.MultiIf, MultiFunc: cfg.MultiFunc}
 
 		analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
 			var issues []whitespace.Message
diff --git a/test/testdata/fix/in/whitespace.go b/test/testdata/fix/in/whitespace.go
@@ -1,5 +1,6 @@
 //args: -Ewhitespace
 //config: linters-settings.whitespace.multi-if=true
+//config: linters-settings.whitespace.multi-func=true
 package p
 
 import "fmt"
@@ -47,9 +48,14 @@ func twoLeadingNewlines() {
 	fmt.Println("Hello world")
 }
 
+func multiFuncFunc(a int,
+	b int) {
+	fmt.Println("Hello world")
+}
+
 func multiIfFunc() {
 	if 1 == 1 &&
 		2 == 2 {
-		fmt.Println(`Hello multi-line world`)
+		fmt.Println("Hello multi-line world")
 	}
 }
diff --git a/test/testdata/fix/out/whitespace.go b/test/testdata/fix/out/whitespace.go
@@ -1,5 +1,6 @@
 //args: -Ewhitespace
 //config: linters-settings.whitespace.multi-if=true
+//config: linters-settings.whitespace.multi-func=true
 package p
 
 import "fmt"
@@ -43,10 +44,16 @@ func twoLeadingNewlines() {
 	fmt.Println("Hello world")
 }
 
+func multiFuncFunc(a int,
+	b int) {
+
+	fmt.Println("Hello world")
+}
+
 func multiIfFunc() {
 	if 1 == 1 &&
 		2 == 2 {
 
-		fmt.Println(`Hello multi-line world`)
+		fmt.Println("Hello multi-line world")
 	}
 }
diff --git a/vendor/github.com/ultraware/whitespace/README.md b/vendor/github.com/ultraware/whitespace/README.md
diff --git a/vendor/github.com/ultraware/whitespace/main.go b/vendor/github.com/ultraware/whitespace/main.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -168,7 +168,7 @@ github.com/stretchr/testify/require
 github.com/timakin/bodyclose/passes/bodyclose
 # github.com/ultraware/funlen v0.0.2
 github.com/ultraware/funlen
-# github.com/ultraware/whitespace v0.0.3
+# github.com/ultraware/whitespace v0.0.4
 github.com/ultraware/whitespace
 # github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517
 github.com/uudashr/gocognit

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,8 @@ type LintersSettings struct {`
`175`	`175`	`Statements int`
`176`	`176`	`}`
`177`	`177`	`Whitespace struct {`
`178`		- MultiIf bool `mapstructure:"multi-if"`
	`178`	+ MultiIf bool `mapstructure:"multi-if"`
	`179`	+ MultiFunc bool `mapstructure:"multi-func"`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`Lll LllSettings`