New extension to generate ProtoSize methods instead of Size. Fixes go…

…go#56.

Regenerate files.

codec/codec.go

@@ -38,7 +38,20 @@ type Codec interface {
 
 type marshaler interface {
 	MarshalTo(data []byte) (n int, err error)
-	Size() (n int)
+}
+
+func getSize(v interface{}) (int, bool) {
+	if sz, ok := v.(interface {
+		Size() (n int)
+	}); ok {
+		return sz.Size(), true
+	} else if sz, ok := v.(interface {
+		ProtoSize() (n int)
+	}); ok {
+		return sz.ProtoSize(), true
+	} else {
+		return 0, false
+	}
 }
 
 type codec struct {
@@ -55,7 +68,10 @@ func New(size int) Codec {
 
 func (this *codec) Marshal(v interface{}) ([]byte, error) {
 	if m, ok := v.(marshaler); ok {
-		n := m.Size()
+		n, ok := getSize(v)
+		if !ok {
+			return proto.Marshal(v.(proto.Message))
+		}
 		if n > len(this.buf) {
 			this.buf = make([]byte, n)
 		}

gogoproto/gogo.proto

@@ -67,6 +67,8 @@ extend google.protobuf.FileOptions {
 	optional bool goproto_extensions_map_all = 63025;
 	optional bool goproto_unrecognized_all = 63026;
 	optional bool gogoproto_import = 63027;
+
+	optional bool protosizer_all = 63028;
 }
 
 extend google.protobuf.MessageOptions {
@@ -93,6 +95,8 @@ extend google.protobuf.MessageOptions {
 
 	optional bool goproto_extensions_map = 64025;
 	optional bool goproto_unrecognized = 64026;
+
+	optional bool protosizer = 64028;
 }
 
 extend google.protobuf.FieldOptions {

gogoproto/helper.go

@@ -213,6 +213,10 @@ func IsSizer(file *google_protobuf.FileDescriptorProto, message *google_protobuf
 	return proto.GetBoolExtension(message.Options, E_Sizer, proto.GetBoolExtension(file.Options, E_SizerAll, false))
 }
 
+func IsProtoSizer(file *google_protobuf.FileDescriptorProto, message *google_protobuf.DescriptorProto) bool {
+	return proto.GetBoolExtension(message.Options, E_Protosizer, proto.GetBoolExtension(file.Options, E_ProtosizerAll, false))
+}
+
 func IsGoEnumStringer(file *google_protobuf.FileDescriptorProto, enum *google_protobuf.EnumDescriptorProto) bool {
 	return proto.GetBoolExtension(enum.Options, E_GoprotoEnumStringer, proto.GetBoolExtension(file.Options, E_GoprotoEnumStringerAll, true))
 }

io/full.go

@@ -45,7 +45,13 @@ type fullWriter struct {
 func (this *fullWriter) WriteMsg(msg proto.Message) (err error) {
 	var data []byte
 	if m, ok := msg.(marshaler); ok {
-		n := m.Size()
+		n, ok := getSize(m)
+		if !ok {
+			data, err = proto.Marshal(msg)
+			if err != nil {
+				return err
+			}
+		}
 		if n >= len(this.buffer) {
 			this.buffer = make([]byte, n)
 		}

io/io.go

@@ -53,5 +53,18 @@ type ReadCloser interface {
 
 type marshaler interface {
 	MarshalTo(data []byte) (n int, err error)
-	Size() (n int)
+}
+
+func getSize(v interface{}) (int, bool) {
+	if sz, ok := v.(interface {
+		Size() (n int)
+	}); ok {
+		return sz.Size(), true
+	} else if sz, ok := v.(interface {
+		ProtoSize() (n int)
+	}); ok {
+		return sz.ProtoSize(), true
+	} else {
+		return 0, false
+	}
 }

io/uint32.go

@@ -51,7 +51,13 @@ type uint32Writer struct {
 func (this *uint32Writer) WriteMsg(msg proto.Message) (err error) {
 	var data []byte
 	if m, ok := msg.(marshaler); ok {
-		n := m.Size()
+		n, ok := getSize(m)
+		if !ok {
+			data, err = proto.Marshal(msg)
+			if err != nil {
+				return err
+			}
+		}
 		if n >= len(this.buffer) {
 			this.buffer = make([]byte, n)
 		}

io/varint.go

@@ -54,7 +54,13 @@ type varintWriter struct {
 func (this *varintWriter) WriteMsg(msg proto.Message) (err error) {
 	var data []byte
 	if m, ok := msg.(marshaler); ok {
-		n := m.Size()
+		n, ok := getSize(m)
+		if !ok {
+			data, err = proto.Marshal(msg)
+			if err != nil {
+				return err
+			}
+		}
 		if n >= len(this.buffer) {
 			this.buffer = make([]byte, n)
 		}

plugin/embedcheck/embedcheck.go

@@ -80,7 +80,8 @@ var overwriters []map[string]gogoproto.EnableFunc = []map[string]gogoproto.Enabl
 		"verboseequal": gogoproto.HasVerboseEqual,
 	},
 	{
-		"size": gogoproto.IsSizer,
+		"size":       gogoproto.IsSizer,
+		"protosizer": gogoproto.IsProtoSizer,
 	},
 	{
 		"unmarshaler":        gogoproto.IsUnmarshaler,

plugin/equal/equal.go

@@ -298,7 +298,7 @@ func (p *plugin) generateMsgNullAndTypeCheck(ccTypeName string, verbose bool) {
 
 func (p *plugin) generateField(file *generator.FileDescriptor, message *generator.Descriptor, field *descriptor.FieldDescriptorProto, verbose bool) {
 	proto3 := gogoproto.IsProto3(file.FileDescriptorProto)
-	fieldname := p.GetOneOfFieldName(message, field)
+	fieldname := p.GetOneOfFieldName(file, message, field)
 	repeated := field.IsRepeated()
 	ctype := gogoproto.IsCustomType(field)
 	nullable := gogoproto.IsNullable(field)
@@ -451,7 +451,7 @@ func (p *plugin) generateMessage(file *generator.FileDescriptor, message *genera
 	for _, field := range message.Field {
 		oneof := field.OneofIndex != nil
 		if oneof {
-			fieldname := p.GetFieldName(message, field)
+			fieldname := p.GetFieldName(file, message, field)
 			if _, ok := oneofs[fieldname]; ok {
 				continue
 			} else {
@@ -575,7 +575,7 @@ func (p *plugin) generateMessage(file *generator.FileDescriptor, message *genera
 		if !oneof {
 			continue
 		}
-		ccTypeName := p.OneOfTypeName(message, field)
+		ccTypeName := p.OneOfTypeName(file, message, field)
 		if verbose {
 			p.P(`func (this *`, ccTypeName, `) VerboseEqual(that interface{}) error {`)
 		} else {

plugin/face/face.go

@@ -174,7 +174,7 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
 		p.In()
 		p.P(`Proto() `, protoPkg.Use(), `.Message`)
 		for _, field := range message.Field {
-			fieldname := p.GetFieldName(message, field)
+			fieldname := p.GetFieldName(file, message, field)
 			goTyp, _ := p.GoType(message, field)
 			if p.IsMap(field) {
 				m := p.GoMapType(nil, field)
@@ -198,7 +198,7 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
 		p.P(`}`)
 		p.P(``)
 		for _, field := range message.Field {
-			fieldname := p.GetFieldName(message, field)
+			fieldname := p.GetFieldName(file, message, field)
 			goTyp, _ := p.GoType(message, field)
 			if generator.IsMap(file.FileDescriptorProto, field) {
 				m := p.GoMapType(nil, field)
@@ -216,7 +216,7 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
 		p.In()
 		p.P(`this := &`, ccTypeName, `{}`)
 		for _, field := range message.Field {
-			fieldname := p.GetFieldName(message, field)
+			fieldname := p.GetFieldName(file, message, field)
 			p.P(`this.`, fieldname, ` = that.Get`, fieldname, `()`)
 		}
 		p.P(`return this`)

plugin/gostring/gostring.go

@@ -164,7 +164,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
 		for _, field := range message.Field {
 			nullable := gogoproto.IsNullable(field)
 			repeated := field.IsRepeated()
-			fieldname := p.GetFieldName(message, field)
+			fieldname := p.GetFieldName(file, message, field)
 			oneof := field.OneofIndex != nil
 			if oneof {
 				if _, ok := oneofs[fieldname]; ok {
@@ -285,7 +285,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
 			if !oneof {
 				continue
 			}
-			ccTypeName := p.OneOfTypeName(message, field)
+			ccTypeName := p.OneOfTypeName(file, message, field)
 			p.P(`func (this *`, ccTypeName, `) GoString() string {`)
 			p.In()
 			p.P(`if this == nil {`)
@@ -294,7 +294,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
 			p.Out()
 			p.P(`}`)
 			outFlds := []string{}
-			fieldname := p.GetOneOfFieldName(message, field)
+			fieldname := p.GetOneOfFieldName(file, message, field)
 			if field.IsMessage() || p.IsGroup(field) {
 				tmp := strings.Join([]string{"`", fieldname, ":` + "}, "")
 				tmp += strings.Join([]string{fmtPkg.Use(), `.Sprintf("%#v", this.`, fieldname, `)`}, "")