chore: improve analyzer constructor

Author: ldez

cmd/nakedret/main.go

@@ -19,6 +19,12 @@ func init() {
 }
 
 func main() {
-	analyzer := nakedret.NakedReturnAnalyzer(DefaultLines, DefaultSkipTestFiles)
+	nakedRet := &nakedret.NakedReturnRunner{}
+
+	analyzer := nakedret.NakedReturnAnalyzer(nakedRet)
+
+	analyzer.Flags.UintVar(&nakedRet.MaxLength, "l", DefaultLines, "maximum number of lines for a naked return function")
+	analyzer.Flags.BoolVar(&nakedRet.SkipTestFiles, "skip-test-files", DefaultSkipTestFiles, "set to true to skip test files")
+
 	singlechecker.Main(analyzer)
 }

nakedret.go

@@ -21,19 +21,14 @@ import (
 
 const pwd = "./"
 
-func NakedReturnAnalyzer(defaultLines uint, skipTestFiles bool) *analysis.Analyzer {
-	nakedRet := &NakedReturnRunner{}
-
+func NakedReturnAnalyzer(nakedRet *NakedReturnRunner) *analysis.Analyzer {
 	a := &analysis.Analyzer{
 		Name:     "nakedret",
 		Doc:      "Checks that functions with naked returns are not longer than a maximum size (can be zero).",
 		Run:      nakedRet.run,
 		Requires: []*analysis.Analyzer{inspect.Analyzer},
 	}
 
-	a.Flags.UintVar(&nakedRet.MaxLength, "l", defaultLines, "maximum number of lines for a naked return function")
-	a.Flags.BoolVar(&nakedRet.SkipTestFiles, "skip-test-files", skipTestFiles, "set to true to skip test files")
-
 	return a
 }
 
@@ -91,7 +86,7 @@ func checkNakedReturns(args []string, maxLength *uint, skipTestFiles bool, setEx
 		return errors.New("max length nil")
 	}
 
-	analyzer := NakedReturnAnalyzer(*maxLength, skipTestFiles)
+	analyzer := NakedReturnAnalyzer(&NakedReturnRunner{MaxLength: *maxLength, SkipTestFiles: skipTestFiles})
 	pass := &analysis.Pass{
 		Analyzer: analyzer,
 		Fset:     fset,

nakedret_test.go

@@ -109,7 +109,7 @@ func TestAll(t *testing.T) {
 	}
 
 	testdata := filepath.Join(wd, "testdata")
-	analysistest.Run(t, testdata, NakedReturnAnalyzer(0, true), "x")
+	analysistest.Run(t, testdata, NakedReturnAnalyzer(&NakedReturnRunner{SkipTestFiles: true}), "x")
 }
 
 func TestAllFixes(t *testing.T) {
@@ -119,5 +119,5 @@ func TestAllFixes(t *testing.T) {
 	}
 
 	testdata := filepath.Join(wd, "testdata")
-	analysistest.RunWithSuggestedFixes(t, testdata, NakedReturnAnalyzer(0, true), "x")
+	analysistest.RunWithSuggestedFixes(t, testdata, NakedReturnAnalyzer(&NakedReturnRunner{0, true}), "x")
 }