nit: include _test.go files

cmd/nit/main.go

@@ -6,6 +6,7 @@ import (
  "go/build"
  "os"
  "path/filepath"
+ "strings"
 
  "github.com/MarioCarrion/nit"
 )
@@ -28,6 +29,7 @@ func main() {
 
  localPkg := flag.String("pkg", "", "local package")
  skipGenerated := flag.Bool("skip-generated", false, "skip generated files")
+ includeTests := flag.Bool("include-tests", false, "include test files")
  showVersion := flag.Bool("version", false, "prints current version information")
 
  flag.Parse()
@@ -45,26 +47,35 @@ func main() {
 
  var failed bool
 
- for _, pkg := range flag.Args() {
- p, err := build.Import(pkg, ".", 0)
- if err != nil {
- fmt.Printf("error importing %s\n", pkg)
- os.Exit(1)
- }
+ nitpick := func(files []string) {
+ for _, f := range files {
+ if strings.HasSuffix(f, "_test.go") && !*includeTests {
+ continue
+ }
 
- for _, f := range p.GoFiles {
- fullpath := filepath.Join(p.Dir, f)
  v := nit.Nitpicker{
  LocalPath: *localPkg,
  SkipGeneratedFile: *skipGenerated,
  }
- if err := v.Validate(fullpath); err != nil {
+
+ if err := v.Validate(f); err != nil {
  failed = true
  fmt.Println(err)
  }
  }
  }
 
+ for _, pkg := range flag.Args() {
+ p, err := build.Import(pkg, ".", 0)
+ if err != nil {
+ fmt.Printf("error importing %s\n", pkg)
+ os.Exit(1)
+ }
+
+ gofiles, _ := filepath.Glob(filepath.Join(p.Dir, "*.go"))
+ nitpick(gofiles)
+ }
+
  if failed {
  os.Exit(1)
  }

file_sections_test.go

@@ -20,6 +20,8 @@ func TestNewFileSectionTransition(t *testing.T) {
  }
 }
 
+//-
+
 func TestFileSectionMachine(t *testing.T) {
  s := nit.FileSectionMachine{}
 

imports_test.go

@@ -44,6 +44,8 @@ func TestNewImportsSection(t *testing.T) {
  }
 }
 
+//-
+
 //nolint:dupl
 func TestImportsValidator(t *testing.T) {
  tests := [...]struct {
@@ -98,6 +100,8 @@ func TestImportsValidator(t *testing.T) {
  }
 }
 
+//-
+
 func TestNewImportsTransition(t *testing.T) {
  tests := [...]struct {
  name string
@@ -136,6 +140,8 @@ func TestNewImportsTransition(t *testing.T) {
  }
 }
 
+//-
+
 func TestImportsTransitionExternal(t *testing.T) {
  i, _ := nit.NewImportsTransition(nit.ImportsSectionExternal)
 

nitpicking.go

@@ -37,7 +37,6 @@ func (v *Nitpicker) Validate(filename string) error {
  }
 
  for _, s := range f.Decls {
- // fmt.Printf("%d == %T - %+v -- %t\n", v.fset.PositionFor(s.Pos(), false).Line, s, s, s.End().IsValid())
  if err := v.validateToken(s); err != nil {
  return err
  }