aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/github.com/ssgreg
diff options
context:
space:
mode:
authorTaras Madan <tarasmadan@google.com>2022-09-05 14:27:54 +0200
committerGitHub <noreply@github.com>2022-09-05 12:27:54 +0000
commitb2f2446b46bf02821d90ebedadae2bf7ae0e880e (patch)
tree923cf42842918d6bebca1d6bbdc08abed54d274d /vendor/github.com/ssgreg
parente6654faff4bcca4be92e9a8596fd4b77f747c39e (diff)
go.mod, vendor: update (#3358)
* go.mod, vendor: remove unnecessary dependencies Commands: 1. go mod tidy 2. go mod vendor * go.mod, vendor: update cloud.google.com/go Commands: 1. go get -u cloud.google.com/go 2. go mod tidy 3. go mod vendor * go.mod, vendor: update cloud.google.com/* Commands: 1. go get -u cloud.google.com/storage cloud.google.com/logging 2. go mod tidy 3. go mod vendor * go.mod, .golangci.yml, vendor: update *lint* Commands: 1. go get -u golang.org/x/tools github.com/golangci/golangci-lint@v1.47.0 2. go mod tidy 3. go mod vendor 4. edit .golangci.yml to suppress new errors (resolved in the same PR later) * all: fix lint errors hash.go: copy() recommended by gosimple parse.go: ent is never nil verifier.go: signal.Notify() with unbuffered channel is bad. Have no idea why. * .golangci.yml: adjust godot rules check-all is deprecated, but still work if you're hesitating too - I'll remove this commit
Diffstat (limited to 'vendor/github.com/ssgreg')
-rw-r--r--vendor/github.com/ssgreg/nlreturn/v2/pkg/nlreturn/nlreturn.go13
1 files changed, 11 insertions, 2 deletions
diff --git a/vendor/github.com/ssgreg/nlreturn/v2/pkg/nlreturn/nlreturn.go b/vendor/github.com/ssgreg/nlreturn/v2/pkg/nlreturn/nlreturn.go
index 52318ccfd..42b15e9b3 100644
--- a/vendor/github.com/ssgreg/nlreturn/v2/pkg/nlreturn/nlreturn.go
+++ b/vendor/github.com/ssgreg/nlreturn/v2/pkg/nlreturn/nlreturn.go
@@ -1,6 +1,7 @@
package nlreturn
import (
+ "flag"
"fmt"
"go/ast"
"go/token"
@@ -13,13 +14,20 @@ const (
linterDoc = `Linter requires a new line before return and branch statements except when the return is alone inside a statement group (such as an if statement) to increase code clarity.`
)
+var blockSize int
+
// NewAnalyzer returns a new nlreturn analyzer.
func NewAnalyzer() *analysis.Analyzer {
- return &analysis.Analyzer{
+ a := &analysis.Analyzer{
Name: linterName,
Doc: linterDoc,
Run: run,
}
+
+ a.Flags.Init("nlreturn", flag.ExitOnError)
+ a.Flags.IntVar(&blockSize, "block-size", 1, "set block size that is still ok")
+
+ return a
}
func run(pass *analysis.Pass) (interface{}, error) {
@@ -45,7 +53,8 @@ func inspectBlock(pass *analysis.Pass, block []ast.Stmt) {
for i, stmt := range block {
switch stmt.(type) {
case *ast.BranchStmt, *ast.ReturnStmt:
- if i == 0 {
+
+ if i == 0 || line(pass, stmt.Pos())-line(pass, block[0].Pos()) < blockSize {
return
}