Skip to content

Commit 1384a4e

Browse files
leonklingeleldez
authored andcommitted
grouper: improve docs
1 parent 46c3c7e commit 1384a4e

File tree

3 files changed

+35
-20
lines changed

3 files changed

+35
-20
lines changed

.golangci.example.yml

+27-12
Original file line numberDiff line numberDiff line change
@@ -807,18 +807,33 @@ linters-settings:
807807
- unusedwrite
808808

809809
grouper:
810-
# const
811-
const-require-single-const: false
812-
const-require-grouping: false
813-
# import
814-
import-require-single-import: false
815-
import-require-grouping: false
816-
# type
817-
type-require-single-type: false
818-
type-require-grouping: false
819-
# var
820-
var-require-single-var: false
821-
var-require-grouping: false
810+
# Require the use of a single global 'const' declaration only.
811+
# Default: false
812+
const-require-single-const: true
813+
# Require the use of grouped global 'const' declarations.
814+
# Default: false
815+
const-require-grouping: true
816+
817+
# Require the use of a single 'import' declaration only.
818+
# Default: false
819+
import-require-single-import: true
820+
# Require the use of grouped 'import' declarations.
821+
# Default: false
822+
import-require-grouping: true
823+
824+
# Require the use of a single global 'type' declaration only.
825+
# Default: false
826+
type-require-single-type: true
827+
# Require the use of grouped global 'type' declarations.
828+
# Default: false
829+
type-require-grouping: true
830+
831+
# Require the use of a single global 'var' declaration only.
832+
# Default: false
833+
var-require-single-var: true
834+
# Require the use of grouped global 'var' declarations.
835+
# Default: false
836+
var-require-grouping: true
822837

823838
ifshort:
824839
# Maximum length of variable declaration measured in number of lines, after which linter won't suggest using short syntax.

pkg/config/linters_settings.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -378,16 +378,16 @@ func (cfg GovetSettings) Validate() error {
378378
}
379379

380380
type GrouperSettings struct {
381-
// const
381+
// const analyzer options
382382
ConstRequireSingleConst bool `mapstructure:"const-require-single-const"`
383383
ConstRequireGrouping bool `mapstructure:"const-require-grouping"`
384-
// import
384+
// import analyzer options
385385
ImportRequireSingleImport bool `mapstructure:"import-require-single-import"`
386386
ImportRequireGrouping bool `mapstructure:"import-require-grouping"`
387-
// type
387+
// type analyzer options
388388
TypeRequireSingleType bool `mapstructure:"type-require-single-type"`
389389
TypeRequireGrouping bool `mapstructure:"type-require-grouping"`
390-
// var
390+
// var analyzer options
391391
VarRequireSingleVar bool `mapstructure:"var-require-single-var"`
392392
VarRequireGrouping bool `mapstructure:"var-require-grouping"`
393393
}

pkg/golinters/grouper.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ func NewGrouper(settings *config.GrouperSettings) *goanalysis.Linter {
1313
linterCfg := map[string]map[string]interface{}{}
1414
if settings != nil {
1515
linterCfg["grouper"] = map[string]interface{}{
16-
// const
16+
// const analyzer options
1717
"const-require-single-const": settings.ConstRequireSingleConst,
1818
"const-require-grouping": settings.ConstRequireGrouping,
19-
// import
19+
// import analyzer options
2020
"import-require-single-import": settings.ImportRequireSingleImport,
2121
"import-require-grouping": settings.ImportRequireGrouping,
22-
// type
22+
// type analyzer options
2323
"type-require-single-type": settings.TypeRequireSingleType,
2424
"type-require-grouping": settings.TypeRequireGrouping,
25-
// var
25+
// var analyzer options
2626
"var-require-single-var": settings.VarRequireSingleVar,
2727
"var-require-grouping": settings.VarRequireGrouping,
2828
}

0 commit comments

Comments
 (0)