Skip to content

Commit

Permalink
grouper: coding style updates
Browse files Browse the repository at this point in the history
  • Loading branch information
leonklingele committed Jan 20, 2022
1 parent 26b049f commit 7fa2a96
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 3 additions & 4 deletions pkg/config/linters_settings.go
Expand Up @@ -378,16 +378,15 @@ func (cfg GovetSettings) Validate() error {
}

type GrouperSettings struct {
// const analyzer options
ConstRequireSingleConst bool `mapstructure:"const-require-single-const"`
ConstRequireGrouping bool `mapstructure:"const-require-grouping"`
// import analyzer options

ImportRequireSingleImport bool `mapstructure:"import-require-single-import"`
ImportRequireGrouping bool `mapstructure:"import-require-grouping"`
// type analyzer options

TypeRequireSingleType bool `mapstructure:"type-require-single-type"`
TypeRequireGrouping bool `mapstructure:"type-require-grouping"`
// var analyzer options

VarRequireSingleVar bool `mapstructure:"var-require-single-var"`
VarRequireGrouping bool `mapstructure:"var-require-grouping"`
}
Expand Down
7 changes: 3 additions & 4 deletions pkg/golinters/grouper.go
Expand Up @@ -13,16 +13,15 @@ func NewGrouper(settings *config.GrouperSettings) *goanalysis.Linter {
linterCfg := map[string]map[string]interface{}{}
if settings != nil {
linterCfg["grouper"] = map[string]interface{}{
// const analyzer options
"const-require-single-const": settings.ConstRequireSingleConst,
"const-require-grouping": settings.ConstRequireGrouping,
// import analyzer options

"import-require-single-import": settings.ImportRequireSingleImport,
"import-require-grouping": settings.ImportRequireGrouping,
// type analyzer options

"type-require-single-type": settings.TypeRequireSingleType,
"type-require-grouping": settings.TypeRequireGrouping,
// var analyzer options

"var-require-single-var": settings.VarRequireSingleVar,
"var-require-grouping": settings.VarRequireGrouping,
}
Expand Down

0 comments on commit 7fa2a96

Please sign in to comment.