fix: check proto3 syntax logic

zchee · zchee · commit ef1da1f771b3 · 2024-07-19T13:34:30.000+09:00
Signed-off-by: Koichi Shiraishi &lt;zchee.io@gmail.com&gt;
diff --git a/go.mod b/go.mod
@@ -5,5 +5,5 @@ go 1.17
 require (
 	github.com/bytedance/gopkg v0.0.0-20240531030433-5df24c0168e2
 	github.com/gogo/protobuf v1.3.2
-	google.golang.org/protobuf v1.28.0
+	google.golang.org/protobuf v1.33.0
 )
diff --git a/go.sum b/go.sum
@@ -49,8 +49,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/protoc-gen-fastpb/main.go b/protoc-gen-fastpb/main.go
@@ -40,14 +40,12 @@ func main() {
 	}
 
 	protogen.Options{}.Run(func(gen *protogen.Plugin) error {
-		// check: only support proto3 now
 		for _, f := range gen.Files {
+			// check: only support proto3 now
 			if f.Desc.Syntax() != protoreflect.Proto3 {
-				return nil
+				continue
 			}
-		}
-		// gen code here
-		for _, f := range gen.Files {
+			// gen code here
 			if f.Generate {
 				genfastpb.GenerateFile(gen, f)
 			}
diff --git a/version.go b/version.go
@@ -18,6 +18,6 @@ package fastpb
 
 const (
 	Name    = "Fastpb"
-	Version = "v0.0.2"
+	Version = "v0.0.4"
 	Home    = "https://github.com/cloudwego/fastpb"
 )

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ go 1.17`
`5`	`5`	`require (`
`6`	`6`	`github.com/bytedance/gopkg v0.0.0-20240531030433-5df24c0168e2`
`7`	`7`	`github.com/gogo/protobuf v1.3.2`
`8`		`- google.golang.org/protobuf v1.28.0`
	`8`	`+ google.golang.org/protobuf v1.33.0`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,12 @@ func main() {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`protogen.Options{}.Run(func(gen *protogen.Plugin) error {`
`43`		`- // check: only support proto3 now`
`44`	`43`	`for _, f := range gen.Files {`
	`44`	`+ // check: only support proto3 now`
`45`	`45`	`if f.Desc.Syntax() != protoreflect.Proto3 {`
`46`		`- return nil`
	`46`	`+ continue`
`47`	`47`	`}`
`48`		`- }`
`49`		`- // gen code here`
`50`		`- for _, f := range gen.Files {`
	`48`	`+ // gen code here`
`51`	`49`	`if f.Generate {`
`52`	`50`	`genfastpb.GenerateFile(gen, f)`
`53`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ package fastpb`
`18`	`18`
`19`	`19`	`const (`
`20`	`20`	`Name = "Fastpb"`
`21`		`- Version = "v0.0.2"`
	`21`	`+ Version = "v0.0.4"`
`22`	`22`	`Home = "https://github.com/cloudwego/fastpb"`
`23`	`23`	`)`