diff --git a/_conformance/conformance.pb.go b/_conformance/conformance.pb.go index af06eb35a7..b48fd726d8 100644 --- a/_conformance/conformance.pb.go +++ b/_conformance/conformance.pb.go @@ -1,18 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: conformance.proto -/* -Package conformance is a generated protocol buffer package. - -It is generated from these files: - conformance.proto - -It has these top-level messages: - ConformanceRequest - ConformanceResponse - TestAllTypes - ForeignMessage -*/ package conformance import proto "github.com/golang/protobuf/proto" diff --git a/_conformance/conformance_proto/conformance.pb.go b/_conformance/conformance_proto/conformance.pb.go index 0c32697a2a..de75f007ee 100644 --- a/_conformance/conformance_proto/conformance.pb.go +++ b/_conformance/conformance_proto/conformance.pb.go @@ -1,18 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: conformance_proto/conformance.proto -/* -Package conformance is a generated protocol buffer package. - -It is generated from these files: - conformance_proto/conformance.proto - -It has these top-level messages: - ConformanceRequest - ConformanceResponse - TestAllTypes - ForeignMessage -*/ package conformance import proto "github.com/golang/protobuf/proto" diff --git a/jsonpb/jsonpb_test_proto/more_test_objects.pb.go b/jsonpb/jsonpb_test_proto/more_test_objects.pb.go index cc54abae59..e0fbc02385 100644 --- a/jsonpb/jsonpb_test_proto/more_test_objects.pb.go +++ b/jsonpb/jsonpb_test_proto/more_test_objects.pb.go @@ -1,33 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: more_test_objects.proto -/* -Package jsonpb is a generated protocol buffer package. - -It is generated from these files: - more_test_objects.proto - test_objects.proto - -It has these top-level messages: - Simple3 - SimpleSlice3 - SimpleMap3 - SimpleNull3 - Mappy - Simple - NonFinites - Repeats - Widget - Maps - MsgWithOneof - Real - Complex - KnownTypes - MsgWithRequired - MsgWithIndirectRequired - MsgWithRequiredBytes - MsgWithRequiredWKT -*/ package jsonpb import proto "github.com/golang/protobuf/proto" diff --git a/proto/test_proto/test.pb.go b/proto/test_proto/test.pb.go index 40031cd4d7..cb354c57ae 100644 --- a/proto/test_proto/test.pb.go +++ b/proto/test_proto/test.pb.go @@ -1,45 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: test.proto -/* -Package test_proto is a generated protocol buffer package. - -It is generated from these files: - test.proto - -It has these top-level messages: - GoEnum - GoTestField - GoTest - GoTestRequiredGroupField - GoSkipTest - NonPackedTest - PackedTest - MaxTag - OldMessage - NewMessage - InnerMessage - OtherMessage - RequiredInnerMessage - MyMessage - Ext - ComplexExtension - DefaultsMessage - MyMessageSet - Empty - MessageList - Strings - Defaults - SubDefaults - RepeatedEnum - MoreRepeated - GroupOld - GroupNew - FloatingPoint - MessageWithMap - Oneof - Communique -*/ package test_proto import proto "github.com/golang/protobuf/proto" diff --git a/proto/test_proto/test.pb.go.golden b/proto/test_proto/test.pb.go.golden index 509e5486ed..55f4d866b0 100644 --- a/proto/test_proto/test.pb.go.golden +++ b/proto/test_proto/test.pb.go.golden @@ -1,45 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: test.proto -/* -Package test_proto is a generated protocol buffer package. - -It is generated from these files: - test.proto - -It has these top-level messages: - GoEnum - GoTestField - GoTest - GoTestRequiredGroupField - GoSkipTest - NonPackedTest - PackedTest - MaxTag - OldMessage - NewMessage - InnerMessage - OtherMessage - RequiredInnerMessage - MyMessage - Ext - ComplexExtension - DefaultsMessage - MyMessageSet - Empty - MessageList - Strings - Defaults - SubDefaults - RepeatedEnum - MoreRepeated - GroupOld - GroupNew - FloatingPoint - MessageWithMap - Oneof - Communique -*/ package test_proto import proto "github.com/golang/protobuf/proto" diff --git a/protoc-gen-go/generator/generator.go b/protoc-gen-go/generator/generator.go index c5e9314223..be38105630 100644 --- a/protoc-gen-go/generator/generator.go +++ b/protoc-gen-go/generator/generator.go @@ -1339,43 +1339,22 @@ func (g *Generator) generateHeader() { name := g.file.PackageName() - if g.file.index == 0 { - // Generate package docs for the first file in the package. + g.P("package ", name) + g.P() + + if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok { g.P("/*") - g.P("Package ", name, " is a generated protocol buffer package.") - g.P() - if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok { - // not using g.PrintComments because this is a /* */ comment block. - text := strings.TrimSuffix(loc.GetLeadingComments(), "\n") - for _, line := range strings.Split(text, "\n") { - line = strings.TrimPrefix(line, " ") - // ensure we don't escape from the block comment - line = strings.Replace(line, "*/", "* /", -1) - g.P(line) - } - g.P() - } - var topMsgs []string - g.P("It is generated from these files:") - for _, f := range g.genFiles { - g.P("\t", f.Name) - for _, msg := range f.desc { - if msg.parent != nil { - continue - } - topMsgs = append(topMsgs, CamelCaseSlice(msg.TypeName())) - } - } - g.P() - g.P("It has these top-level messages:") - for _, msg := range topMsgs { - g.P("\t", msg) + // not using g.PrintComments because this is a /* */ comment block. + text := strings.TrimSuffix(loc.GetLeadingComments(), "\n") + for _, line := range strings.Split(text, "\n") { + line = strings.TrimPrefix(line, " ") + // ensure we don't escape from the block comment + line = strings.Replace(line, "*/", "* /", -1) + g.P(line) } g.P("*/") + g.P() } - - g.P("package ", name) - g.P() } // deprecationComment is the standard comment added to deprecated diff --git a/protoc-gen-go/testdata/deprecated/deprecated.pb.go b/protoc-gen-go/testdata/deprecated/deprecated.pb.go index 2a1e4979b0..7676c6a806 100644 --- a/protoc-gen-go/testdata/deprecated/deprecated.pb.go +++ b/protoc-gen-go/testdata/deprecated/deprecated.pb.go @@ -1,19 +1,11 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // deprecated/deprecated.proto is a deprecated file. -/* -Package deprecated is a generated protocol buffer package. +package deprecated +/* package deprecated contains only deprecated messages and services. - -It is generated from these files: - deprecated/deprecated.proto - -It has these top-level messages: - DeprecatedRequest - DeprecatedResponse */ -package deprecated import proto "github.com/golang/protobuf/proto" import fmt "fmt" diff --git a/protoc-gen-go/testdata/extension_base/extension_base.pb.go b/protoc-gen-go/testdata/extension_base/extension_base.pb.go index be0cd7d38f..95a9dea91d 100644 --- a/protoc-gen-go/testdata/extension_base/extension_base.pb.go +++ b/protoc-gen-go/testdata/extension_base/extension_base.pb.go @@ -1,16 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: extension_base/extension_base.proto -/* -Package extension_base is a generated protocol buffer package. - -It is generated from these files: - extension_base/extension_base.proto - -It has these top-level messages: - BaseMessage - OldStyleMessage -*/ package extension_base import proto "github.com/golang/protobuf/proto" diff --git a/protoc-gen-go/testdata/extension_extra/extension_extra.pb.go b/protoc-gen-go/testdata/extension_extra/extension_extra.pb.go index 10b4caf1d0..79ab3f0702 100644 --- a/protoc-gen-go/testdata/extension_extra/extension_extra.pb.go +++ b/protoc-gen-go/testdata/extension_extra/extension_extra.pb.go @@ -1,15 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: extension_extra/extension_extra.proto -/* -Package extension_extra is a generated protocol buffer package. - -It is generated from these files: - extension_extra/extension_extra.proto - -It has these top-level messages: - ExtraMessage -*/ package extension_extra import proto "github.com/golang/protobuf/proto" diff --git a/protoc-gen-go/testdata/extension_user/extension_user.pb.go b/protoc-gen-go/testdata/extension_user/extension_user.pb.go index f3c5f7d58b..59255668ef 100644 --- a/protoc-gen-go/testdata/extension_user/extension_user.pb.go +++ b/protoc-gen-go/testdata/extension_user/extension_user.pb.go @@ -1,20 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: extension_user/extension_user.proto -/* -Package extension_user is a generated protocol buffer package. - -It is generated from these files: - extension_user/extension_user.proto - -It has these top-level messages: - UserMessage - LoudMessage - LoginMessage - Detail - Announcement - OldStyleParcel -*/ package extension_user import proto "github.com/golang/protobuf/proto" diff --git a/protoc-gen-go/testdata/grpc/grpc.pb.go b/protoc-gen-go/testdata/grpc/grpc.pb.go index 65bcf75642..779abab534 100644 --- a/protoc-gen-go/testdata/grpc/grpc.pb.go +++ b/protoc-gen-go/testdata/grpc/grpc.pb.go @@ -1,18 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: grpc/grpc.proto -/* -Package testing is a generated protocol buffer package. - -It is generated from these files: - grpc/grpc.proto - -It has these top-level messages: - SimpleRequest - SimpleResponse - StreamMsg - StreamMsg2 -*/ package testing import proto "github.com/golang/protobuf/proto" diff --git a/protoc-gen-go/testdata/imp/imp.pb.go b/protoc-gen-go/testdata/imp/imp.pb.go index 6a2c2c3070..051fac8f56 100644 --- a/protoc-gen-go/testdata/imp/imp.pb.go +++ b/protoc-gen-go/testdata/imp/imp.pb.go @@ -1,21 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: imp/imp.proto -/* -Package imp is a generated protocol buffer package. - -It is generated from these files: - imp/imp.proto - imp/imp2.proto - imp/imp3.proto - -It has these top-level messages: - ImportedMessage - ImportedMessage2 - ImportedExtendable - PubliclyImportedMessage - ForeignImportedMessage -*/ package imp import proto "github.com/golang/protobuf/proto" diff --git a/protoc-gen-go/testdata/multi/multi1.pb.go b/protoc-gen-go/testdata/multi/multi1.pb.go index dc2ff02ba1..a682a77286 100644 --- a/protoc-gen-go/testdata/multi/multi1.pb.go +++ b/protoc-gen-go/testdata/multi/multi1.pb.go @@ -1,19 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: multi/multi1.proto -/* -Package multitest is a generated protocol buffer package. - -It is generated from these files: - multi/multi1.proto - multi/multi2.proto - multi/multi3.proto - -It has these top-level messages: - Multi1 - Multi2 - Multi3 -*/ package multitest import proto "github.com/golang/protobuf/proto" diff --git a/protoc-gen-go/testdata/my_test/test.pb.go b/protoc-gen-go/testdata/my_test/test.pb.go index deba6d1b11..af3e3ecdd9 100644 --- a/protoc-gen-go/testdata/my_test/test.pb.go +++ b/protoc-gen-go/testdata/my_test/test.pb.go @@ -1,24 +1,11 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: my_test/test.proto -/* -Package test is a generated protocol buffer package. +package test +/* This package holds interesting messages. - -It is generated from these files: - my_test/test.proto - -It has these top-level messages: - Request - Reply - OtherBase - ReplyExtensions - OtherReplyExtensions - OldReply - Communique */ -package test import proto "github.com/golang/protobuf/proto" import fmt "fmt" diff --git a/protoc-gen-go/testdata/proto3/proto3.pb.go b/protoc-gen-go/testdata/proto3/proto3.pb.go index f268d7bd62..b12af4e481 100644 --- a/protoc-gen-go/testdata/proto3/proto3.pb.go +++ b/protoc-gen-go/testdata/proto3/proto3.pb.go @@ -1,16 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: proto3/proto3.proto -/* -Package proto3 is a generated protocol buffer package. - -It is generated from these files: - proto3/proto3.proto - -It has these top-level messages: - Request - Book -*/ package proto3 import proto "github.com/golang/protobuf/proto"