review

Author: ldez

pkg/config/linters_settings.go

@@ -41,6 +41,10 @@ var defaultLintersSettings = LintersSettings{
 	Forbidigo: ForbidigoSettings{
 		ExcludeGodocExamples: true,
 	},
+	FuncOrder: FuncOrderSettings{
+		Constructor:  true,
+		StructMethod: true,
+	},
 	Funlen: FunlenSettings{
 		IgnoreComments: true,
 	},
@@ -422,8 +426,8 @@ type ForbidigoPattern struct {
 }
 
 type FuncOrderSettings struct {
-	Constructor  *bool `mapstructure:"constructor,omitempty"`
-	StructMethod *bool `mapstructure:"struct-method,omitempty"`
+	Constructor  bool `mapstructure:"constructor,omitempty"`
+	StructMethod bool `mapstructure:"struct-method,omitempty"`
 }
 
 type FunlenSettings struct {

pkg/golinters/funcorder/funcorder.go

@@ -14,18 +14,9 @@ func New(settings *config.FuncOrderSettings) *goanalysis.Linter {
 	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{
-			analyzer.ConstructorCheckName:  constructor,
-			analyzer.StructMethodCheckName: structMethod,
+			analyzer.ConstructorCheckName:  settings.Constructor,
+			analyzer.StructMethodCheckName: settings.StructMethod,
 		}
 	}
 

pkg/golinters/funcorder/testdata/funcorder_disable_constructor.go

@@ -0,0 +1,41 @@
+//golangcitest:args -Efuncorder
+//golangcitest:config_path testdata/funcorder_disable_constructor.yml
+package testdata
+
+import "time"
+
+type MyStruct struct {
+	Name string
+}
+
+func (m MyStruct) lenName() int { // want `unexported method "lenName" for struct "MyStruct" should be placed after the exported method "SetName"`
+	return len(m.Name)
+}
+
+func (m MyStruct) GetName() string {
+	return m.Name
+}
+
+func (m *MyStruct) SetName(name string) {
+	m.Name = name
+}
+
+type MyStruct2 struct {
+	Name string
+}
+
+func (m MyStruct2) GetName() string {
+	return m.Name
+}
+
+func (m *MyStruct2) SetName(name string) {
+	m.Name = name
+}
+
+func NewMyStruct2() *MyStruct2 {
+	return &MyStruct2{Name: "John"}
+}
+
+func NewTime() time.Time {
+	return time.Now()
+}

pkg/golinters/funcorder/testdata/funcorder_disable_constructor.yml

@@ -0,0 +1,6 @@
+version: "2"
+
+linters:
+  settings:
+    funcorder:
+      constructor: false

pkg/golinters/funcorder/testdata/funcorder_struct_method.go

@@ -0,0 +1,41 @@
+//golangcitest:args -Efuncorder
+//golangcitest:config_path testdata/funcorder_struct_method.yml
+package testdata
+
+import "time"
+
+type MyStruct struct {
+	Name string
+}
+
+func (m MyStruct) lenName() int {
+	return len(m.Name)
+}
+
+func (m MyStruct) GetName() string {
+	return m.Name
+}
+
+func (m *MyStruct) SetName(name string) {
+	m.Name = name
+}
+
+type MyStruct2 struct {
+	Name string
+}
+
+func (m MyStruct2) GetName() string {
+	return m.Name
+}
+
+func (m *MyStruct2) SetName(name string) {
+	m.Name = name
+}
+
+func NewMyStruct2() *MyStruct2 { // want `constructor "NewMyStruct2" for struct "MyStruct2" should be placed before struct method "GetName"`
+	return &MyStruct2{Name: "John"}
+}
+
+func NewTime() time.Time {
+	return time.Now()
+}

pkg/golinters/funcorder/testdata/funcorder_struct_method.yml

@@ -0,0 +1,6 @@
+version: "2"
+
+linters:
+  settings:
+    funcorder:
+      struct-method: false