dev: clean configuration and code (#1830)

ldez · web-flow · commit 2ebc9d7202f9 · 2021-03-09T19:46:18.000+01:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -133,35 +133,9 @@ issues:
         - gocritic
       text: "unnecessaryDefer:"
 
-    # TODO temporary rule, must be removed
-    # seems related to v0.34.1, but I was not able to reproduce locally,
-    # I was also not able to reproduce in the CI of a fork,
-    # only the golangci-lint CI seems to be affected by this invalid analysis.
-    - path: pkg/golinters/scopelint.go
-      text: 'directive `//nolint:interfacer` is unused for linter interfacer'
-
-    # TODO temporary rule, must be removed
-    # related to https://github.com/golangci/golangci-lint/pull/1756
-    # must be replaced by '//nolint:staticcheck // require changes in github.com/OpenPeeDeeP/depguard'
-    - path: pkg/golinters/depguard.go
-      text: 'SA1019: package golang.org/x/tools/go/loader is deprecated'
-
-    # TODO temporary rule, must be removed
-    # related to https://github.com/golangci/golangci-lint/pull/1756
-    # must be replaced by '///nolint:staticcheck // it's an adapter for golang.org/x/tools/go/packages'
-    - path: pkg/golinters/goanalysis/adapters.go
-      text: 'SA1019: package golang.org/x/tools/go/loader is deprecated'
-
 run:
   skip-dirs:
     - test/testdata_etc
     - internal/cache
     - internal/renameio
     - internal/robustio
-
-# golangci.com configuration
-# https://github.com/golangci/golangci/wiki/Configuration
-service:
-  golangci-lint-version: 1.23.x # use the fixed version to not introduce new linters unexpectedly
-  prepare:
-    - echo "here I can run custom commands, but no preparation needed for this repo"
diff --git a/pkg/config/config_gocritic.go b/pkg/config/config_gocritic.go
@@ -5,11 +5,10 @@ import (
 	"sort"
 	"strings"
 
+	_ "github.com/go-critic/go-critic/checkers" // this import register checkers
 	"github.com/go-critic/go-critic/framework/linter"
 	"github.com/pkg/errors"
 
-	_ "github.com/go-critic/go-critic/checkers" // this import register checkers
-
 	"github.com/golangci/golangci-lint/pkg/logutils"
 )
 
diff --git a/pkg/config/config_gocritic_test.go b/pkg/config/config_gocritic_test.go
@@ -5,9 +5,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/golangci/golangci-lint/pkg/logutils"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/golangci/golangci-lint/pkg/logutils"
 )
 
 func TestUtils(t *testing.T) {
diff --git a/pkg/golinters/depguard.go b/pkg/golinters/depguard.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/OpenPeeDeeP/depguard"
 	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/loader"
+	"golang.org/x/tools/go/loader" //nolint:staticcheck // require changes in github.com/OpenPeeDeeP/depguard
 
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
diff --git a/pkg/golinters/goanalysis/adapters.go b/pkg/golinters/goanalysis/adapters.go
@@ -4,7 +4,7 @@ import (
 	"go/types"
 
 	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/loader"
+	"golang.org/x/tools/go/loader" //nolint:staticcheck // it's an adapter for golang.org/x/tools/go/packages
 )
 
 func MakeFakeLoaderProgram(pass *analysis.Pass) *loader.Program {
diff --git a/pkg/golinters/gochecknoglobals.go b/pkg/golinters/gochecknoglobals.go
@@ -1,9 +1,8 @@
 package golinters
 
 import (
-	"golang.org/x/tools/go/analysis"
-
 	"4d63.com/gochecknoglobals/checknoglobals"
+	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
 )
diff --git a/pkg/golinters/unparam.go b/pkg/golinters/unparam.go
@@ -3,10 +3,9 @@ package golinters
 import (
 	"sync"
 
-	"golang.org/x/tools/go/packages"
-
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/buildssa"
+	"golang.org/x/tools/go/packages"
 	"mvdan.cc/unparam/check"
 
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
diff --git a/pkg/result/processors/max_from_linter_test.go b/pkg/result/processors/max_from_linter_test.go
@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/golangci/golangci-lint/pkg/config"
-
 	"github.com/golangci/golangci-lint/pkg/logutils"
 )
 
diff --git a/pkg/result/processors/processor_test.go b/pkg/result/processors/processor_test.go
@@ -4,9 +4,9 @@ import (
 	"go/token"
 	"testing"
 
-	"github.com/golangci/golangci-lint/pkg/result"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/golangci/golangci-lint/pkg/result"
 )
 
 type issueTestCase struct {
diff --git a/scripts/expand_website_templates/main.go b/scripts/expand_website_templates/main.go
@@ -17,7 +17,6 @@ import (
 	"strings"
 
 	"github.com/golangci/golangci-lint/internal/renameio"
-
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
 )
diff --git a/test/testdata/fix/in/gofumpt.go b/test/testdata/fix/in/gofumpt.go
@@ -1,6 +1,6 @@
 //args: -Egofumpt
 //config: linters-settings.gofumpt.extra-rules=true
-package testdata
+package p
 
 import "fmt"
 
diff --git a/test/testdata/fix/out/gofumpt.go b/test/testdata/fix/out/gofumpt.go
@@ -1,6 +1,6 @@
 // args: -Egofumpt
 // config: linters-settings.gofumpt.extra-rules=true
-package testdata
+package p
 
 import "fmt"
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"go/types"`
`5`	`5`
`6`	`6`	`"golang.org/x/tools/go/analysis"`
`7`		`- "golang.org/x/tools/go/loader"`
	`7`	`+ "golang.org/x/tools/go/loader" //nolint:staticcheck // it's an adapter for golang.org/x/tools/go/packages`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func MakeFakeLoaderProgram(pass analysis.Pass) loader.Program {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`package golinters`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "golang.org/x/tools/go/analysis"`
`5`		`-`
`6`	`4`	`"4d63.com/gochecknoglobals/checknoglobals"`
	`5`	`+ "golang.org/x/tools/go/analysis"`
`7`	`6`
`8`	`7`	`"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"`
`9`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`	`6`	`"github.com/golangci/golangci-lint/pkg/config"`
`7`		`-`
`8`	`7`	`"github.com/golangci/golangci-lint/pkg/logutils"`
`9`	`8`	`)`
`10`	`9`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ import (`
`17`	`17`	`"strings"`
`18`	`18`
`19`	`19`	`"github.com/golangci/golangci-lint/internal/renameio"`
`20`		`-`
`21`	`20`	`"github.com/golangci/golangci-lint/pkg/lint/linter"`
`22`	`21`	`"github.com/golangci/golangci-lint/pkg/lint/lintersdb"`
`23`	`22`	`)`