force goimport

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,6 +12,7 @@ Please delete options that are not relevant.
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - [ ] This change requires a documentation update
+- [ ] Refactoring
 
 # How Has This Been Tested?
 
@@ -28,6 +29,7 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] New and existing unit tests pass locally with my changes
 - [ ] Any dependent changes have been merged and published in downstream modules
+- [ ] I ran `make goimports`
 - [ ] I ran [golangci-lint](https://github.com/golangci/golangci-lint)
 
 @nunnatsa

.github/workflows/sanity.yml

@@ -37,4 +37,6 @@ jobs:
 
     # make sure we can build the cli
     - name: Build
-      run: make
+      run: |
+        make build
+        git diff --exit-code

Makefile

@@ -5,7 +5,7 @@ HASH_FLAG := -X github.com/nunnatsa/ginkgolinter/version.gitHash=$(COMMIT_HASH)
 
 BUILD_ARGS := -ldflags "$(VERSION_FLAG) $(HASH_FLAG)"
 
-build:
+build: goimports
 	go build $(BUILD_ARGS) -o ginkgolinter ./cmd/ginkgolinter
 
 unit-test:
@@ -27,3 +27,7 @@ test-cli:
 	cd tests; go test -v ./
 
 test: unit-test test-cli
+
+goimports:
+	go install golang.org/x/tools/cmd/goimports@latest
+	goimports -w -local="github.com/nunnatsa/ginkgolinter" $(shell find . -type f -name '*.go' ! -path "*/vendor/*")

cmd/ginkgolinter/cli/cli.go

@@ -2,11 +2,13 @@ package cli
 
 import (
 	"fmt"
-	"github.com/nunnatsa/ginkgolinter"
-	"github.com/nunnatsa/ginkgolinter/version"
-	"golang.org/x/tools/go/analysis/singlechecker"
 	"os"
 	"runtime"
+
+	"golang.org/x/tools/go/analysis/singlechecker"
+
+	"github.com/nunnatsa/ginkgolinter"
+	"github.com/nunnatsa/ginkgolinter/version"
 )
 
 func Main() int {

internal/expression/actual/actualarg.go

@@ -4,6 +4,7 @@ import (
 	"go/ast"
 	"go/token"
 	gotypes "go/types"
+
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/nunnatsa/ginkgolinter/internal/expression/value"

internal/expression/expression.go

@@ -2,11 +2,12 @@ package expression
 
 import (
 	"fmt"
-	"github.com/nunnatsa/ginkgolinter/internal/formatter"
 	"go/ast"
 	"go/token"
 	gotypes "go/types"
 
+	"github.com/nunnatsa/ginkgolinter/internal/formatter"
+
 	"github.com/go-toolsmith/astcopy"
 	"golang.org/x/tools/go/analysis"
 

internal/gomegahandler/handler.go

@@ -2,6 +2,7 @@ package gomegahandler
 
 import (
 	"go/ast"
+
 	"golang.org/x/tools/go/analysis"
 )
 

internal/gomegahandler/namedhandler.go

@@ -1,9 +1,10 @@
 package gomegahandler
 
 import (
-	"github.com/nunnatsa/ginkgolinter/internal/gomegainfo"
 	"go/ast"
 
+	"github.com/nunnatsa/ginkgolinter/internal/gomegainfo"
+
 	"golang.org/x/tools/go/analysis"
 )
 

internal/gomegainfo/gomegainfo.go

@@ -3,8 +3,9 @@ package gomegainfo
 import (
 	"go/ast"
 	gotypes "go/types"
-	"golang.org/x/tools/go/analysis"
 	"regexp"
+
+	"golang.org/x/tools/go/analysis"
 )
 
 const ( // gomega actual method names

internal/reports/report-builder.go

@@ -2,11 +2,12 @@ package reports
 
 import (
 	"fmt"
-	"github.com/nunnatsa/ginkgolinter/internal/formatter"
 	"go/ast"
 	"go/token"
 	"strings"
 
+	"github.com/nunnatsa/ginkgolinter/internal/formatter"
+
 	"golang.org/x/tools/go/analysis"
 )
 

internal/rules/equaldifferenttypesrule.go

@@ -1,11 +1,12 @@
 package rules
 
 import (
+	gotypes "go/types"
+
 	"github.com/nunnatsa/ginkgolinter/internal/expression"
 	"github.com/nunnatsa/ginkgolinter/internal/expression/matcher"
 	"github.com/nunnatsa/ginkgolinter/internal/reports"
 	"github.com/nunnatsa/ginkgolinter/types"
-	gotypes "go/types"
 )
 
 const compareDifferentTypes = "use %[1]s with different types: Comparing %[2]s with %[3]s; either change the expected value type if possible, or use the BeEquivalentTo() matcher, instead of %[1]s()"

internal/rules/nilcomparerule.go

@@ -1,12 +1,13 @@
 package rules
 
 import (
+	"go/token"
+
 	"github.com/nunnatsa/ginkgolinter/internal/expression"
 	"github.com/nunnatsa/ginkgolinter/internal/expression/actual"
 	"github.com/nunnatsa/ginkgolinter/internal/expression/matcher"
 	"github.com/nunnatsa/ginkgolinter/internal/reports"
 	"github.com/nunnatsa/ginkgolinter/types"
-	"go/token"
 )
 
 const (

linter/ginkgo_linter.go

@@ -2,6 +2,7 @@ package linter
 
 import (
 	"go/ast"
+
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/nunnatsa/ginkgolinter/internal/expression"

testdata/src/a/comparetypes/comparetypes.gomega_test.go

@@ -2,6 +2,7 @@ package comparetypes_test
 
 import (
 	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 )

testdata/src/a/comparetypes/comparetypes_test.go

@@ -2,6 +2,7 @@ package comparetypes_test
 
 import (
 	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

testdata/src/a/comparetypesconfig/comparetypes.gomega_test.go

@@ -2,6 +2,7 @@ package comparetypes_test
 
 import (
 	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 )

testdata/src/a/comparison/comparison.go

@@ -1,9 +1,10 @@
 package comparison
 
 import (
+	"time"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"time"
 )
 
 var exampleInt = 1

testdata/src/a/comparison/comparison.gomega.go

@@ -1,9 +1,10 @@
 package comparison
 
 import (
+	"time"
+
 	. "github.com/onsi/ginkgo/v2"
 	g "github.com/onsi/gomega"
-	"time"
 )
 
 var _ = Describe("remove comparison", func() {

testdata/src/a/confighaveoccurred/haveoccurred.go

@@ -2,6 +2,7 @@ package haveoccurred
 
 import (
 	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

testdata/src/a/confighaveoccurred/haveoccurred.gomega.go

@@ -2,6 +2,7 @@ package haveoccurred
 
 import (
 	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 )

testdata/src/a/eventually/issue88.go

@@ -1,13 +1,14 @@
 package eventually
 
 import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	. "github.com/onsi/gomega/gexec"
 	"os"
 	"os/exec"
 	"testing"
 	"time"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
 )
 
 func Test(t *testing.T) {

testdata/src/a/haveoccurred/haveoccurred.go

@@ -2,6 +2,7 @@ package haveoccurred
 
 import (
 	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

testdata/src/a/haveoccurred/haveoccurred.gomega.go

@@ -2,6 +2,7 @@ package haveoccurred
 
 import (
 	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 )

testdata/src/a/noassersion/ginkgo.go

@@ -1,9 +1,10 @@
 package noassersion
 
 import (
+	"time"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"time"
 )
 
 var _ = Describe("", func() {

testdata/src/a/pointerval/pointerval.go

@@ -2,6 +2,7 @@ package pointerval
 
 import (
 	"fmt"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

utils/setwanted/setWanted.go

@@ -3,11 +3,12 @@ package main
 import (
 	"bufio"
 	"fmt"
-	"golang.org/x/sync/errgroup"
 	"log"
 	"os"
 	"strconv"
 	"strings"
+
+	"golang.org/x/sync/errgroup"
 )
 
 func main() {