From f712621172589f2db185982077a1bf1a7154a78d Mon Sep 17 00:00:00 2001 From: moznion Date: Sun, 19 Jan 2020 22:05:05 +0900 Subject: [PATCH] Update gowrtr to the latest (v1.4.0) for code generation ref: https://github.com/moznion/gowrtr/pull/8 --- cmd/gonstructor/gonstructor.go | 2 +- go.mod | 2 +- go.sum | 9 +++++++-- internal/constructor/all_args_constructor_generator.go | 2 +- internal/constructor/builder_constructor_generator.go | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cmd/gonstructor/gonstructor.go b/cmd/gonstructor/gonstructor.go index 8151f3c..d2bc0fd 100644 --- a/cmd/gonstructor/gonstructor.go +++ b/cmd/gonstructor/gonstructor.go @@ -99,7 +99,7 @@ func main() { rootStmt = rootStmt.AddStatements(internal.GenerateGetters(*typeName, fields)) } - code, err := rootStmt.EnableGoimports().EnableSyntaxChecking().Generate(0) + code, err := rootStmt.Goimports().EnableSyntaxChecking().Generate(0) if err != nil { log.Fatal(fmt.Errorf("[error] failed to generate code: %w", err)) } diff --git a/go.mod b/go.mod index 4f62d7a..0d3e201 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7 - github.com/moznion/gowrtr v1.0.0 + github.com/moznion/gowrtr v1.4.0 github.com/stretchr/testify v1.3.0 golang.org/x/tools v0.0.0-20191206204035-259af5ff87bd ) diff --git a/go.sum b/go.sum index 9009587..cee379a 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,14 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7 h1:ux/56T2xqZO/3cP1I2F86qpeoYPCOzk+KF/UH/Ar+lk= github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/moznion/go-errgen v1.3.1/go.mod h1:+BkSRLNc98WWAJmdtxYcxxucQ7sl8m4sroepmHio33Y= -github.com/moznion/gowrtr v1.0.0 h1:YMLzSisD2hycCY25kLWdr8tZAeZtNqo+hBQQvPczseM= -github.com/moznion/gowrtr v1.0.0/go.mod h1:u2ZFWAHT1c56nmSP3w0C4N9MZtI2UE7YwbkItJAsF78= +github.com/moznion/go-errgen v1.3.2/go.mod h1:dROwlwGrLPlSudszQRjX56OlWxWnG5tPGel0It/5LrI= +github.com/moznion/gowrtr v0.0.0-20190121085203-08e30cf60446/go.mod h1:u2ZFWAHT1c56nmSP3w0C4N9MZtI2UE7YwbkItJAsF78= +github.com/moznion/gowrtr v1.4.0 h1:vA2S5GyKGZq/CXEoFg/+8UrYbow9Rh2iQUUyNbH34IA= +github.com/moznion/gowrtr v1.4.0/go.mod h1:5/DxTrHHNshUFR1aFL2q3kb+VRerTDKYcZbWu8bwa6s= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -17,6 +21,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190111214448-fc1d57b08d7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190121143147-24cd39ecf745/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191206204035-259af5ff87bd h1:Zc7EU2PqpsNeIfOoVA7hvQX4cS3YDJEs5KlfatT3hLo= golang.org/x/tools v0.0.0-20191206204035-259af5ff87bd/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/constructor/all_args_constructor_generator.go b/internal/constructor/all_args_constructor_generator.go index 532a01e..7485977 100644 --- a/internal/constructor/all_args_constructor_generator.go +++ b/internal/constructor/all_args_constructor_generator.go @@ -23,7 +23,7 @@ func (cg *AllArgsConstructorGenerator) Generate() g.Statement { if field.ShouldIgnore { continue } - funcSignature = funcSignature.AddFuncParameters(g.NewFuncParameter(strcase.ToLowerCamel(field.FieldName), field.FieldType)) + funcSignature = funcSignature.AddParameters(g.NewFuncParameter(strcase.ToLowerCamel(field.FieldName), field.FieldType)) retStructureKeyValues = append(retStructureKeyValues, fmt.Sprintf("%s: %s", field.FieldName, strcase.ToLowerCamel(field.FieldName))) } diff --git a/internal/constructor/builder_constructor_generator.go b/internal/constructor/builder_constructor_generator.go index 6f08854..c01e93b 100644 --- a/internal/constructor/builder_constructor_generator.go +++ b/internal/constructor/builder_constructor_generator.go @@ -42,7 +42,7 @@ func (cg *BuilderGenerator) Generate() g.Statement { fieldRegistererFunctions = append(fieldRegistererFunctions, g.NewFunc( g.NewFuncReceiver("b", "*"+builderType), g.NewFuncSignature(strcase.ToCamel(field.FieldName)). - AddFuncParameters(g.NewFuncParameter(strcase.ToLowerCamel(field.FieldName), field.FieldType)). + AddParameters(g.NewFuncParameter(strcase.ToLowerCamel(field.FieldName), field.FieldType)). AddReturnTypes("*"+builderType), g.NewRawStatement(fmt.Sprintf("b.%s = %s", strcase.ToLowerCamel(field.FieldName), strcase.ToLowerCamel(field.FieldName))), g.NewReturnStatement("b"),