linter package moved to pkg (#148)

incu6us · Dec 24, 2023 · fbbdf8c · fbbdf8c
1 parent ed23792
commit fbbdf8c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 99 deletions.
diff --git a/linter/README.md b/linter/README.md
diff --git a/linter/go.mod b/linter/go.mod
diff --git a/linter/go.sum b/linter/go.sum
diff --git a/linter/main.go b/linter/main.go
diff --git a/linter/analyzer.go → pkg/goanalysis/analyzer.go b/linter/analyzer.go → pkg/goanalysis/analyzer.go
@@ -1,31 +1,29 @@
-//go:build linter
-// +build linter
-
-package main
+package goanalysis
 
 import (
 	"flag"
 	"go/ast"
 	"go/parser"
 	"go/token"
 
-	"github.com/incu6us/goimports-reviser/v2/pkg/module"
-	"github.com/incu6us/goimports-reviser/v2/reviser"
 	"golang.org/x/tools/go/analysis"
+
+	"github.com/incu6us/goimports-reviser/v3/pkg/module"
+	"github.com/incu6us/goimports-reviser/v3/reviser"
 )
 
 const errMessage = "imports must be formatted"
 
-func NewAnalyzer(flagSet *flag.FlagSet, localPkgPrefixes string, options ...reviser.Option) *analysis.Analyzer {
+func NewAnalyzer(flagSet *flag.FlagSet, localPkgPrefixes string, options ...reviser.SourceFileOption) *analysis.Analyzer {
 	return &analysis.Analyzer{
-		Name:  "goimportsreviserlint",
-		Doc:   "Linter for imports sorting",
+		Name:  "goimportsreviser",
+		Doc:   "goimports-reviser linter",
 		Run:   run(localPkgPrefixes, options...),
 		Flags: *flagSet,
 	}
 }
 
-func run(localPkgPrefixes string, options ...reviser.Option) func(pass *analysis.Pass) (interface{}, error) {
+func run(localPkgPrefixes string, options ...reviser.SourceFileOption) func(pass *analysis.Pass) (interface{}, error) {
 	return func(pass *analysis.Pass) (interface{}, error) {
 		inspect := func(formattedFile *ast.File, hasChanged bool) func(node ast.Node) bool {
 			return func(node ast.Node) bool {
@@ -79,7 +77,7 @@ func run(localPkgPrefixes string, options ...reviser.Option) func(pass *analysis
 				}
 			}
 
-			formattedFileContent, hasChanged, err := reviser.Execute(projectName, filePath, localPkgPrefixes, options...)
+			formattedFileContent, hasChanged, err := reviser.NewSourceFile(projectName, filePath).Fix(options...)
 			if err != nil {
 				return nil, err
 			}

diff --git a/pkg/std/gen/gen.go b/pkg/std/gen/gen.go
@@ -13,7 +13,7 @@ import (
 	"golang.org/x/tools/go/packages"
 )
 
-//go:generate go run -tags gen github.com/incu6us/goimports-reviser/v2/pkg/std/gen
+//go:generate go run -tags gen github.com/incu6us/goimports-reviser/v3/pkg/std/gen
 
 const (
 	fileName = "package_list.go"