Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add gofactory linter #4196

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .golangci.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,13 @@ linters-settings:
- OPTIMIZE # marks code that should be optimized before merging
- HACK # marks hack-around that should be removed before merging

gofactory:
# Default: []
blockedPkgs:
- github.com/author/repository/path/to/package
# Default: false
onlyBlockedPkgs: true

gofmt:
# Simplify code: gofmt with `-s` option.
# Default: true
Expand Down Expand Up @@ -2351,6 +2358,7 @@ linters:
- godot
- godox
- goerr113
- gofactory
- gofmt
- gofumpt
- goheader
Expand Down Expand Up @@ -2471,6 +2479,7 @@ linters:
- godot
- godox
- goerr113
- gofactory
- gofmt
- gofumpt
- goheader
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ require (
github.com/leonklingele/grouper v1.1.1
github.com/lufeee/execinquery v1.2.1
github.com/macabu/inamedparam v0.1.2
github.com/maranqz/go-factory-lint v1.0.4
ldez marked this conversation as resolved.
Show resolved Hide resolved
github.com/maratori/testableexamples v1.0.0
github.com/maratori/testpackage v1.1.1
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26
Expand Down
4 changes: 4 additions & 0 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions pkg/config/linters_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ type LintersSettings struct {
Gocyclo GoCycloSettings
Godot GodotSettings
Godox GodoxSettings
Gofactory GoFactoryLintSettings
Gofmt GoFmtSettings
Gofumpt GofumptSettings
Goheader GoHeaderSettings
Expand Down Expand Up @@ -478,6 +479,11 @@ type GodoxSettings struct {
Keywords []string
}

type GoFactoryLintSettings struct {
BlockedPkgs map[string]map[string]string `mapstructure:"BlockedPkgs"`
maranqz marked this conversation as resolved.
Show resolved Hide resolved
Antonboom marked this conversation as resolved.
Show resolved Hide resolved
OnlyBlockedPkgs string `mapstructure:"OnlyBlockedPkgs"`
maranqz marked this conversation as resolved.
Show resolved Hide resolved
}

type GoFmtSettings struct {
Simplify bool
RewriteRules []GoFmtRewriteRule `mapstructure:"rewrite-rules"`
Expand Down
30 changes: 30 additions & 0 deletions pkg/golinters/gofactorylint.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package golinters

import (
"github.com/maranqz/go-factory-lint"
"golang.org/x/tools/go/analysis"

"github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
)

func NewGoFactoryLint(settings *config.GoFactoryLintSettings) *goanalysis.Linter {
a := factory.NewAnalyzer()

cfg := make(map[string]map[string]any)
if settings != nil {
cfg[a.Name] = map[string]any{}

if len(settings.BlockedPkgs) > 0 {
cfg[a.Name]["blockedPkgs"] = settings.BlockedPkgs
cfg[a.Name]["onlyBlockedPkgs"] = settings.OnlyBlockedPkgs
}
}

return goanalysis.NewLinter(
a.Name,
a.Doc,
[]*analysis.Analyzer{a},
cfg,
).WithLoadMode(goanalysis.LoadModeTypesInfo)
}
7 changes: 7 additions & 0 deletions pkg/lint/lintersdb/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
gocycloCfg *config.GoCycloSettings
godotCfg *config.GodotSettings
godoxCfg *config.GodoxSettings
goFactoryCfg *config.GoFactoryLintSettings
gofmtCfg *config.GoFmtSettings
gofumptCfg *config.GofumptSettings
goheaderCfg *config.GoHeaderSettings
Expand Down Expand Up @@ -174,6 +175,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
gocycloCfg = &m.cfg.LintersSettings.Gocyclo
godotCfg = &m.cfg.LintersSettings.Godot
godoxCfg = &m.cfg.LintersSettings.Godox
goFactoryCfg = &m.cfg.LintersSettings.Gofactory
gofmtCfg = &m.cfg.LintersSettings.Gofmt
gofumptCfg = &m.cfg.LintersSettings.Gofumpt
goheaderCfg = &m.cfg.LintersSettings.Goheader
Expand Down Expand Up @@ -488,6 +490,11 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
WithLoadForGoAnalysis().
WithURL("https://github.com/Djarvur/go-err113"),

linter.NewConfig(golinters.NewGoFactoryLint(goFactoryCfg)).
WithSince("next_version").
maranqz marked this conversation as resolved.
Show resolved Hide resolved
WithPresets(linter.PresetStyle).
ldez marked this conversation as resolved.
Show resolved Hide resolved
WithURL("https://github.com/maranqz/go-factory-lint"),

linter.NewConfig(golinters.NewGofmt(gofmtCfg)).
WithSince("v1.0.0").
WithPresets(linter.PresetFormatting).
Expand Down
4 changes: 4 additions & 0 deletions test/testdata/configs/gofactory.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
linters-settings:
maranqz marked this conversation as resolved.
Show resolved Hide resolved
gofactory:
blockedPkgs: []
onlyBlockedPkgs: false
24 changes: 24 additions & 0 deletions test/testdata/gofactory/app.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package gofactory

import "github.com/golangci/golangci-lint/test/testdata/gofactory/nested"
Antonboom marked this conversation as resolved.
Show resolved Hide resolved

type Struct struct{}

var (
globalStruct = nested.Struct{} // want `Use factory for nested.Struct`
globalStructPtr = &nested.Struct{} // want `Use factory for nested.Struct`
)

func fn() {
_ = nested.Struct{} // want `Use factory for nested.Struct`
_ = &nested.Struct{} // want `Use factory for nested.Struct`

_ = []nested.Struct{{}, nested.Struct{}} // want `Use factory for nested.Struct`
_ = []*nested.Struct{{}, &nested.Struct{}} // want `Use factory for nested.Struct`

call(nested.Struct{}) // want `Use factory for nested.Struct`

_ = []Struct{{}, {}}
}

func call(_ nested.Struct) {}
3 changes: 3 additions & 0 deletions test/testdata/gofactory/nested/factory.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package nested

type Struct struct{}