From 07b68fd1c8e22082f12ef1a1664e0813a80a0590 Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 8 Apr 2024 09:31:11 +0200 Subject: [PATCH 1/2] chore: make generate organize imports --- cmd/tools/decorate.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/tools/decorate.go b/cmd/tools/decorate.go index cff45133da..9d0fdc38dc 100644 --- a/cmd/tools/decorate.go +++ b/cmd/tools/decorate.go @@ -14,6 +14,7 @@ import ( combinations "github.com/mxschmitt/golang-combinations" "github.com/spf13/pflag" + "golang.org/x/tools/imports" ) //go:embed decorate.tpl @@ -177,8 +178,9 @@ func main() { target = &gofile } + var name string if target != nil { - name := *target + name = *target if !strings.HasSuffix(name, ".go") { name += ".go" } @@ -198,6 +200,12 @@ func main() { formatted = []byte(generated) } + formatted, err = imports.Process(name, formatted, nil) + if err != nil { + fmt.Println(err) + os.Exit(3) + } + if _, err := out.Write(formatted); err != nil { fmt.Println(err) os.Exit(2) From d6cf6f176c7a2036fc31274b2127acffa25f5381 Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 8 Apr 2024 09:32:07 +0200 Subject: [PATCH 2/2] wip --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index be137471db..44e8d46492 100644 --- a/go.mod +++ b/go.mod @@ -188,7 +188,7 @@ require ( golang.org/x/mod v0.16.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect - golang.org/x/tools v0.19.0 // indirect + golang.org/x/tools v0.19.0 google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect gopkg.in/go-playground/validator.v9 v9.31.0 // indirect