review

golangci · Jan 25, 2022 · 6b0798c · 6b0798c
1 parent fbbfdef
commit 6b0798c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/pkg/config/linters_settings.go b/pkg/config/linters_settings.go
@@ -378,17 +378,14 @@ func (cfg GovetSettings) Validate() error {
 }
 
 type GrouperSettings struct {
-	ConstRequireSingleConst bool `mapstructure:"const-require-single-const"`
-	ConstRequireGrouping    bool `mapstructure:"const-require-grouping"`
-
+	ConstRequireSingleConst   bool `mapstructure:"const-require-single-const"`
+	ConstRequireGrouping      bool `mapstructure:"const-require-grouping"`
 	ImportRequireSingleImport bool `mapstructure:"import-require-single-import"`
 	ImportRequireGrouping     bool `mapstructure:"import-require-grouping"`
-
-	TypeRequireSingleType bool `mapstructure:"type-require-single-type"`
-	TypeRequireGrouping   bool `mapstructure:"type-require-grouping"`
-
-	VarRequireSingleVar bool `mapstructure:"var-require-single-var"`
-	VarRequireGrouping  bool `mapstructure:"var-require-grouping"`
+	TypeRequireSingleType     bool `mapstructure:"type-require-single-type"`
+	TypeRequireGrouping       bool `mapstructure:"type-require-grouping"`
+	VarRequireSingleVar       bool `mapstructure:"var-require-single-var"`
+	VarRequireGrouping        bool `mapstructure:"var-require-grouping"`
 }
 
 type IfshortSettings struct {

diff --git a/pkg/golinters/grouper.go b/pkg/golinters/grouper.go
@@ -12,17 +12,14 @@ func NewGrouper(settings *config.GrouperSettings) *goanalysis.Linter {
 	linterCfg := map[string]map[string]interface{}{}
 	if settings != nil {
 		linterCfg["grouper"] = map[string]interface{}{
-			"const-require-single-const": settings.ConstRequireSingleConst,
-			"const-require-grouping":     settings.ConstRequireGrouping,
-
+			"const-require-single-const":   settings.ConstRequireSingleConst,
+			"const-require-grouping":       settings.ConstRequireGrouping,
 			"import-require-single-import": settings.ImportRequireSingleImport,
 			"import-require-grouping":      settings.ImportRequireGrouping,
-
-			"type-require-single-type": settings.TypeRequireSingleType,
-			"type-require-grouping":    settings.TypeRequireGrouping,
-
-			"var-require-single-var": settings.VarRequireSingleVar,
-			"var-require-grouping":   settings.VarRequireGrouping,
+			"type-require-single-type":     settings.TypeRequireSingleType,
+			"type-require-grouping":        settings.TypeRequireGrouping,
+			"var-require-single-var":       settings.VarRequireSingleVar,
+			"var-require-grouping":         settings.VarRequireGrouping,
 		}
 	}