merge

gogo · Aug 24, 2016 · 6b3c801 · 6b3c801
2 parents 909568b + c641daa
commit 6b3c801
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/protoc-gen-gogofast/main.go b/protoc-gen-gogofast/main.go
@@ -36,7 +36,7 @@ import (
 func main() {
 	req := command.Read()
 	files := req.GetProtoFile()
-	files = vanity.FilterFiles(files, vanity.NotInPackageGoogleProtobuf)
+	files = vanity.FilterFiles(files, vanity.NotGoogleProtobufDescriptorProto)
 
 	vanity.ForEachFile(files, vanity.TurnOnMarshalerAll)
 	vanity.ForEachFile(files, vanity.TurnOnSizerAll)

diff --git a/protoc-gen-gogofaster/main.go b/protoc-gen-gogofaster/main.go
@@ -36,7 +36,7 @@ import (
 func main() {
 	req := command.Read()
 	files := req.GetProtoFile()
-	files = vanity.FilterFiles(files, vanity.NotInPackageGoogleProtobuf)
+	files = vanity.FilterFiles(files, vanity.NotGoogleProtobufDescriptorProto)
 
 	vanity.ForEachFile(files, vanity.TurnOnMarshalerAll)
 	vanity.ForEachFile(files, vanity.TurnOnSizerAll)

diff --git a/protoc-gen-gogoslick/main.go b/protoc-gen-gogoslick/main.go
@@ -36,7 +36,7 @@ import (
 func main() {
 	req := command.Read()
 	files := req.GetProtoFile()
-	files = vanity.FilterFiles(files, vanity.NotInPackageGoogleProtobuf)
+	files = vanity.FilterFiles(files, vanity.NotGoogleProtobufDescriptorProto)
 
 	vanity.ForEachFile(files, vanity.TurnOnMarshalerAll)
 	vanity.ForEachFile(files, vanity.TurnOnSizerAll)

diff --git a/vanity/file.go b/vanity/file.go
@@ -29,15 +29,17 @@
 package vanity
 
 import (
-	"strings"
+	"path/filepath"
 
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 )
 
-func NotInPackageGoogleProtobuf(file *descriptor.FileDescriptorProto) bool {
-	return !strings.HasPrefix(file.GetPackage(), "google.protobuf")
+func NotGoogleProtobufDescriptorProto(file *descriptor.FileDescriptorProto) bool {
+	// can not just check if file.GetName() == "google/protobuf/descriptor.proto" because we do not want to assume compile path
+	_, fileName := filepath.Split(file.GetName())
+	return !(file.GetPackage() == "google.protobuf" && fileName == "descriptor.proto")
 }
 
 func FilterFiles(files []*descriptor.FileDescriptorProto, f func(file *descriptor.FileDescriptorProto) bool) []*descriptor.FileDescriptorProto {