reflect/protodesc: restore edition in protodesc.ToDescriptorProto

I have choosen to implement this via interace assertion so that other implementers of protoreflect.FileDescriptor can implement this as well. Change-Id: Ib907895044e89bdba1009cc09129d3dd1224561f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/573055 Reviewed-by: Michael Stapelberg <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
protocolbuffers · Mar 21, 2024 · 59034d8 · 59034d8
1 parent 3039476
commit 59034d8
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/internal/filedesc/desc.go b/internal/filedesc/desc.go
@@ -108,9 +108,12 @@ func (fd *File) ParentFile() protoreflect.FileDescriptor { return fd }
 func (fd *File) Parent() protoreflect.Descriptor         { return nil }
 func (fd *File) Index() int                              { return 0 }
 func (fd *File) Syntax() protoreflect.Syntax             { return fd.L1.Syntax }
-func (fd *File) Name() protoreflect.Name                 { return fd.L1.Package.Name() }
-func (fd *File) FullName() protoreflect.FullName         { return fd.L1.Package }
-func (fd *File) IsPlaceholder() bool                     { return false }
+
+// Not exported and just used to reconstruct the original FileDescriptor proto
+func (fd *File) Edition() int32                  { return int32(fd.L1.Edition) }
+func (fd *File) Name() protoreflect.Name         { return fd.L1.Package.Name() }
+func (fd *File) FullName() protoreflect.FullName { return fd.L1.Package }
+func (fd *File) IsPlaceholder() bool             { return false }
 func (fd *File) Options() protoreflect.ProtoMessage {
 	if f := fd.lazyInit().Options; f != nil {
 		return f()

diff --git a/reflect/protodesc/file_test.go b/reflect/protodesc/file_test.go
@@ -52,7 +52,7 @@ var (
 	`)
 	protoEdition2023Message = mustParseFile(`
 		syntax:    "editions"
-		edition:   2023
+		edition:   EDITION_2023
 		name:      "proto_editions_2023_message.proto"
 		package:   "test.editions2023"
 		options: {
@@ -70,7 +70,7 @@ var (
 	`)
 	protoEdition2024Message = mustParseFile(`
 		syntax:    "editions"
-		edition:   2024
+		edition:   EDITION_2024
 		name:      "proto_editions_2024_message.proto"
 		package:   "test.editions2024"
 		message_type: [{
@@ -420,6 +420,20 @@ func TestNewFile(t *testing.T) {
 				field: [{name:"F" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE type_name:".fizz.M.M"}]
 			}]
 		`),
+	}, {
+		label: "basic editions tests",
+		inDesc: mustParseFile(`
+			syntax: "editions"
+			edition: EDITION_2023
+			name: "test.proto"
+			package: "fizz"
+		`),
+		wantDesc: mustParseFile(`
+			syntax: "editions"
+			edition: EDITION_2023
+			name: "test.proto"
+			package: "fizz"
+		`),
 	}, {
 		label: "namespace conflict on enum value",
 		inDesc: mustParseFile(`
@@ -842,7 +856,8 @@ func TestNewFile(t *testing.T) {
 	}, {
 		label: "proto editions implicit presence field with defaults",
 		inDesc: mustParseFile(`
-			syntax:  "proto3"
+			syntax:    "editions"
+			edition:   EDITION_2023
 			name:    "test.proto"
 			message_type: [{name:"M" nested_type:[{
 				name:       "M"

diff --git a/reflect/protodesc/proto.go b/reflect/protodesc/proto.go
@@ -73,6 +73,16 @@ func ToFileDescriptorProto(file protoreflect.FileDescriptor) *descriptorpb.FileD
 	if syntax := file.Syntax(); syntax != protoreflect.Proto2 && syntax.IsValid() {
 		p.Syntax = proto.String(file.Syntax().String())
 	}
+	if file.Syntax() == protoreflect.Editions {
+		desc := file
+		if fileImportDesc, ok := file.(protoreflect.FileImport); ok {
+			desc = fileImportDesc.FileDescriptor
+		}
+
+		if editionsInterface, ok := desc.(interface{ Edition() int32 }); ok {
+			p.Edition = descriptorpb.Edition(editionsInterface.Edition()).Enum()
+		}
+	}
 	return p
 }
 

diff --git a/reflect/protoreflect/proto.go b/reflect/protoreflect/proto.go
@@ -161,7 +161,7 @@ const (
 // IsValid reports whether the syntax is valid.
 func (s Syntax) IsValid() bool {
 	switch s {
-	case Proto2, Proto3:
+	case Proto2, Proto3, Editions:
 		return true
 	default:
 		return false