Skip to content

Commit 26b049f

Browse files
committed
grouper: improve docs
1 parent 0c0e3e9 commit 26b049f

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
@@ -560,18 +560,33 @@ linters-settings:
560560
disable-all: false
561561

562562
grouper:
563-
# const
564-
const-require-single-const: false
565-
const-require-grouping: false
566-
# import
567-
import-require-single-import: false
568-
import-require-grouping: false
569-
# type
570-
type-require-single-type: false
571-
type-require-grouping: false
572-
# var
573-
var-require-single-var: false
574-
var-require-grouping: false
563+
# Require the use of a single global 'const' declaration only.
564+
# Default: false
565+
const-require-single-const: true
566+
# Require the use of grouped global 'const' declarations.
567+
# Default: false
568+
const-require-grouping: true
569+
570+
# Require the use of a single 'import' declaration only.
571+
# Default: false
572+
import-require-single-import: true
573+
# Require the use of grouped 'import' declarations.
574+
# Default: false
575+
import-require-grouping: true
576+
577+
# Require the use of a single global 'type' declaration only.
578+
# Default: false
579+
type-require-single-type: true
580+
# Require the use of grouped global 'type' declarations.
581+
# Default: false
582+
type-require-grouping: true
583+
584+
# Require the use of a single global 'var' declaration only.
585+
# Default: false
586+
var-require-single-var: true
587+
# Require the use of grouped global 'var' declarations.
588+
# Default: false
589+
var-require-grouping: true
575590

576591
ifshort:
577592
# 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)