newlinter: adding funcorder settings

Author: manuelarte

.golangci.next.reference.yml

@@ -531,6 +531,12 @@ linters:
       # Default: false
       analyze-types: true
 
+    funcorder:
+      # Enable/disable feature to check constructors are placed after struct declaration
+      constructor: true
+      # Enable/disable feature to check whether the exported struct's methods are placed before the non-exported
+      struct-method: true
+
     funlen:
       # Checks the number of lines in a function.
       # If lower than 0, disable the check.

go.mod

@@ -73,7 +73,7 @@ require (
 	github.com/ldez/usetesting v0.4.2
 	github.com/leonklingele/grouper v1.1.2
 	github.com/macabu/inamedparam v0.2.0
-	github.com/manuelarte/funcorder v0.1.2
+	github.com/manuelarte/funcorder v0.2.0
 	github.com/maratori/testableexamples v1.0.0
 	github.com/maratori/testpackage v1.1.1
 	github.com/matoous/godox v1.1.0

go.sum

@@ -217,6 +217,7 @@ type LintersSettings struct {
 	Exhaustruct     ExhaustructSettings     `mapstructure:"exhaustruct"`
 	Fatcontext      FatcontextSettings      `mapstructure:"fatcontext"`
 	Forbidigo       ForbidigoSettings       `mapstructure:"forbidigo"`
+	FuncOrder       FuncOrderSettings       `mapstructure:"funcorder"`
 	Funlen          FunlenSettings          `mapstructure:"funlen"`
 	GinkgoLinter    GinkgoLinterSettings    `mapstructure:"ginkgolinter"`
 	Gocognit        GocognitSettings        `mapstructure:"gocognit"`
@@ -420,6 +421,11 @@ type ForbidigoPattern struct {
 	Msg     string `yaml:"msg,omitempty" mapstructure:"msg,omitempty"`
 }
 
+type FuncOrderSettings struct {
+	Constructor  *bool `mapstructure:"constructor,omitempty"`
+	StructMethod *bool `mapstructure:"struct-method,omitempty"`
+}
+
 type FunlenSettings struct {
 	Lines          int  `mapstructure:"lines"`
 	Statements     int  `mapstructure:"statements"`

pkg/config/linters_settings.go

@@ -1,19 +1,39 @@
 package funcorder
 
 import (
-	"github.com/manuelarte/funcorder/pkg/analyzer"
+	"github.com/manuelarte/funcorder/analyzer"
 	"golang.org/x/tools/go/analysis"
 
+	"github.com/golangci/golangci-lint/v2/pkg/config"
+
 	"github.com/golangci/golangci-lint/v2/pkg/goanalysis"
 )
 
-func New() *goanalysis.Linter {
+func New(settings *config.FuncOrderSettings) *goanalysis.Linter {
 	a := analyzer.NewAnalyzer()
 
+	cfg := map[string]map[string]any{}
+
+	if settings != nil {
+		constructor := true
+		if settings.Constructor != nil {
+			constructor = *settings.Constructor
+		}
+		structMethod := true
+		if settings.StructMethod != nil {
+			structMethod = *settings.StructMethod
+		}
+
+		cfg[a.Name] = map[string]any{
+			"constructor":   constructor,
+			"struct-method": structMethod,
+		}
+	}
+
 	return goanalysis.NewLinter(
 		a.Name,
 		a.Doc,
 		[]*analysis.Analyzer{a},
-		nil,
+		cfg,
 	).WithLoadMode(goanalysis.LoadModeSyntax)
 }

pkg/golinters/funcorder/funcorder.go

@@ -255,7 +255,7 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithLoadForGoAnalysis().
 			WithURL("https://github.com/gostaticanalysis/forcetypeassert"),
 
-		linter.NewConfig(funcorder.New()).
+		linter.NewConfig(funcorder.New(&cfg.Linters.Settings.FuncOrder)).
 			WithSince("v2.1.0").
 			WithURL("https://github.com/manuelarte/funcorder"),