From f2e31179557265f50900b8afdeb23f990f656b05 Mon Sep 17 00:00:00 2001 From: Mario Izquierdo Date: Wed, 16 Jun 2021 01:20:57 -0700 Subject: [PATCH] Cleanup header comments to be more clear and similar to the newer headers by protobuf --- CONTRIBUTING.md | 2 +- .../clientcompat/clientcompat.twirp.go | 13 +++------- example/service.twirp.go | 13 +++------- internal/gen/version.go | 2 +- .../empty_service/empty_service.twirp.go | 13 +++------- .../google_protobuf_imports/service.twirp.go | 13 +++------- .../twirptest/importable/importable.twirp.go | 16 +++--------- internal/twirptest/importer/importer.twirp.go | 16 +++--------- .../importer_local/importer_local.twirp.go | 13 +++------- internal/twirptest/importmapping/x/x.twirp.go | 13 +++------- .../json_serialization.twirp.go | 13 +++------- .../twirptest/multiple/multiple1.twirp.go | 17 +++--------- .../twirptest/multiple/multiple2.twirp.go | 6 +++-- .../no_package_name/no_package_name.twirp.go | 13 +++------- .../no_package_name_importer.twirp.go | 13 +++------- internal/twirptest/service.twirp.go | 13 +++------- .../service_method_same_name.twirp.go | 13 +++------- .../snake_case_names.twirp.go | 18 ++++--------- protoc-gen-twirp/generator.go | 26 ++++++------------- 19 files changed, 64 insertions(+), 182 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 26cc111d..edf02492 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,7 +72,7 @@ Twirp uses Github releases. To make a new release: 1. Merge all changes that should be included in the release into the master branch. 2. Update the version constant in `internal/gen/version.go`. Please respect [semantic versioning](http://semver.org/): `v..`. - 3. Run `make generate` and run tests. Check that generated test files include a header comment with the new version. + 3. Run `make test_all` to re-generate code and run tests. Check that generated test files include the new version in the header comment. 4. Add a new commit to master with a message like "Version vX.X.X release" and push. 5. Tag the commit you just made: `git tag vX.X.X` and `git push origin --tags`. 6. Go to Github https://github.com/twitchtv/twirp/releases and "Draft a new release". diff --git a/clientcompat/internal/clientcompat/clientcompat.twirp.go b/clientcompat/internal/clientcompat/clientcompat.twirp.go index 8378a9f1..812dd324 100644 --- a/clientcompat/internal/clientcompat/clientcompat.twirp.go +++ b/clientcompat/internal/clientcompat/clientcompat.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: clientcompat.proto -/* -Package clientcompat is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - clientcompat.proto -*/ package clientcompat import context "context" @@ -798,7 +791,7 @@ func (s *compatServiceServer) ServiceDescriptor() ([]byte, int) { } func (s *compatServiceServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -988,7 +981,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/example/service.twirp.go b/example/service.twirp.go index 1b9d9319..9211aed7 100644 --- a/example/service.twirp.go +++ b/example/service.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: service.proto -/* -Package example is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - service.proto -*/ package example import context "context" @@ -521,7 +514,7 @@ func (s *haberdasherServer) ServiceDescriptor() ([]byte, int) { } func (s *haberdasherServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -711,7 +704,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/gen/version.go b/internal/gen/version.go index 28a2313f..aae23b29 100644 --- a/internal/gen/version.go +++ b/internal/gen/version.go @@ -13,4 +13,4 @@ package gen -const Version = "v8.0.0" +const Version = "v8.1.0" diff --git a/internal/twirptest/empty_service/empty_service.twirp.go b/internal/twirptest/empty_service/empty_service.twirp.go index 5c1b6e24..203b4287 100644 --- a/internal/twirptest/empty_service/empty_service.twirp.go +++ b/internal/twirptest/empty_service/empty_service.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: empty_service.proto -/* -Package empty_service is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - empty_service.proto -*/ package empty_service import context "context" @@ -233,7 +226,7 @@ func (s *emptyServer) ServiceDescriptor() ([]byte, int) { } func (s *emptyServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -423,7 +416,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/google_protobuf_imports/service.twirp.go b/internal/twirptest/google_protobuf_imports/service.twirp.go index 01e83fbf..364bc991 100644 --- a/internal/twirptest/google_protobuf_imports/service.twirp.go +++ b/internal/twirptest/google_protobuf_imports/service.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: service.proto -/* -Package google_protobuf_imports is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - service.proto -*/ package google_protobuf_imports import context "context" @@ -522,7 +515,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -712,7 +705,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/importable/importable.twirp.go b/internal/twirptest/importable/importable.twirp.go index dc49d1a2..d04b8555 100644 --- a/internal/twirptest/importable/importable.twirp.go +++ b/internal/twirptest/importable/importable.twirp.go @@ -1,16 +1,8 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: importable.proto -/* -Package importable is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. +// Test to make sure that importing other packages doesnt break -Test to make sure that importing other packages doesnt break - - -It is generated from these files: - importable.proto -*/ package importable import context "context" @@ -522,7 +514,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -712,7 +704,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/importer/importer.twirp.go b/internal/twirptest/importer/importer.twirp.go index 496c5a42..5d845caf 100644 --- a/internal/twirptest/importer/importer.twirp.go +++ b/internal/twirptest/importer/importer.twirp.go @@ -1,16 +1,8 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: importer.proto -/* -Package importer is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. +// Test to make sure that importing other packages doesnt break -Test to make sure that importing other packages doesnt break - - -It is generated from these files: - importer.proto -*/ package importer import context "context" @@ -524,7 +516,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -714,7 +706,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/importer_local/importer_local.twirp.go b/internal/twirptest/importer_local/importer_local.twirp.go index 43e86a18..ee784777 100644 --- a/internal/twirptest/importer_local/importer_local.twirp.go +++ b/internal/twirptest/importer_local/importer_local.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: importer_local.proto -/* -Package importer_local is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - importer_local.proto -*/ package importer_local import context "context" @@ -519,7 +512,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -709,7 +702,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/importmapping/x/x.twirp.go b/internal/twirptest/importmapping/x/x.twirp.go index 2d9b4c6a..f18e4532 100644 --- a/internal/twirptest/importmapping/x/x.twirp.go +++ b/internal/twirptest/importmapping/x/x.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: x/x.proto -/* -Package x is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - x/x.proto -*/ package x import context "context" @@ -521,7 +514,7 @@ func (s *svc1Server) ServiceDescriptor() ([]byte, int) { } func (s *svc1Server) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -711,7 +704,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/json_serialization/json_serialization.twirp.go b/internal/twirptest/json_serialization/json_serialization.twirp.go index 04f27c25..c2d832ef 100644 --- a/internal/twirptest/json_serialization/json_serialization.twirp.go +++ b/internal/twirptest/json_serialization/json_serialization.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: json_serialization.proto -/* -Package json_serialization is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - json_serialization.proto -*/ package json_serialization import context "context" @@ -519,7 +512,7 @@ func (s *jSONSerializationServer) ServiceDescriptor() ([]byte, int) { } func (s *jSONSerializationServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -709,7 +702,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/multiple/multiple1.twirp.go b/internal/twirptest/multiple/multiple1.twirp.go index 5ea5bc0e..d573b2c9 100644 --- a/internal/twirptest/multiple/multiple1.twirp.go +++ b/internal/twirptest/multiple/multiple1.twirp.go @@ -1,17 +1,8 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: multiple1.proto -/* -Package multiple is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. +// Multiple proto files in one package -Multiple proto files in one package - - -It is generated from these files: - multiple1.proto - multiple2.proto -*/ package multiple import context "context" @@ -523,7 +514,7 @@ func (s *svc1Server) ServiceDescriptor() ([]byte, int) { } func (s *svc1Server) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -713,7 +704,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/multiple/multiple2.twirp.go b/internal/twirptest/multiple/multiple2.twirp.go index 7c01a4f4..792e855e 100644 --- a/internal/twirptest/multiple/multiple2.twirp.go +++ b/internal/twirptest/multiple/multiple2.twirp.go @@ -1,6 +1,8 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: multiple2.proto +// Multiple proto files in one package + package multiple import context "context" @@ -785,7 +787,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" diff --git a/internal/twirptest/no_package_name/no_package_name.twirp.go b/internal/twirptest/no_package_name/no_package_name.twirp.go index 0e4eca91..5c92e2de 100644 --- a/internal/twirptest/no_package_name/no_package_name.twirp.go +++ b/internal/twirptest/no_package_name/no_package_name.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: no_package_name.proto -/* -Package no_package_name is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - no_package_name.proto -*/ package no_package_name import context "context" @@ -519,7 +512,7 @@ func (s *svcServer) ServiceDescriptor() ([]byte, int) { } func (s *svcServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -709,7 +702,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go b/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go index e87d138c..e6e79fe9 100644 --- a/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go +++ b/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: no_package_name_importer/no_package_name_importer.proto -/* -Package no_package_name_importer is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - no_package_name_importer/no_package_name_importer.proto -*/ package no_package_name_importer import context "context" @@ -521,7 +514,7 @@ func (s *svc2Server) ServiceDescriptor() ([]byte, int) { } func (s *svc2Server) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -711,7 +704,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/service.twirp.go b/internal/twirptest/service.twirp.go index 7f2f7caf..e5548d4e 100644 --- a/internal/twirptest/service.twirp.go +++ b/internal/twirptest/service.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: service.proto -/* -Package twirptest is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - service.proto -*/ package twirptest import context "context" @@ -521,7 +514,7 @@ func (s *haberdasherServer) ServiceDescriptor() ([]byte, int) { } func (s *haberdasherServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -711,7 +704,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go b/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go index fd2ad2ae..3931dd59 100644 --- a/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go +++ b/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go @@ -1,13 +1,6 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: service_method_same_name.proto -/* -Package service_method_same_name is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. - -It is generated from these files: - service_method_same_name.proto -*/ package service_method_same_name import context "context" @@ -519,7 +512,7 @@ func (s *echoServer) ServiceDescriptor() ([]byte, int) { } func (s *echoServer) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -709,7 +702,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/internal/twirptest/snake_case_names/snake_case_names.twirp.go b/internal/twirptest/snake_case_names/snake_case_names.twirp.go index 5d81d225..d94408c1 100644 --- a/internal/twirptest/snake_case_names/snake_case_names.twirp.go +++ b/internal/twirptest/snake_case_names/snake_case_names.twirp.go @@ -1,17 +1,9 @@ -// Code generated by protoc-gen-twirp v8.0.0, DO NOT EDIT. +// Code generated by protoc-gen-twirp v8.1.0, DO NOT EDIT. // source: snake_case_names.proto -/* -Package snake_case_names is a generated twirp stub package. -This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v8.0.0. +// Test that protoc-gen-twirp follows the same behavior as protoc-gen-go +// for converting RPCs and message names from snake case to camel case. -Test that protoc-gen-twirp follows the same behavior as protoc-gen-go -for converting RPCs and message names from snake case to camel case. - - -It is generated from these files: - snake_case_names.proto -*/ package snake_case_names import context "context" @@ -542,7 +534,7 @@ func (s *haberdasherV1Server) ServiceDescriptor() ([]byte, int) { } func (s *haberdasherV1Server) ProtocGenTwirpVersion() string { - return "v8.0.0" + return "v8.1.0" } // PathPrefix returns the base service path, in the form: "//./" @@ -732,7 +724,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType } req.Header.Set("Accept", contentType) req.Header.Set("Content-Type", contentType) - req.Header.Set("Twirp-Version", "v8.0.0") + req.Header.Set("Twirp-Version", "v8.1.0") return req, nil } diff --git a/protoc-gen-twirp/generator.go b/protoc-gen-twirp/generator.go index 33309f95..4d7a2ce4 100644 --- a/protoc-gen-twirp/generator.go +++ b/protoc-gen-twirp/generator.go @@ -261,27 +261,17 @@ func (t *twirp) generateFileHeader(file *descriptor.FileDescriptorProto) { t.P("// Code generated by protoc-gen-twirp ", gen.Version, ", DO NOT EDIT.") t.P("// source: ", file.GetName()) t.P() - if t.filesHandled == 0 { - t.P("/*") - t.P("Package ", t.genPkgName, " is a generated twirp stub package.") - t.P("This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp ", gen.Version, ".") - t.P() - comment, err := t.reg.FileComments(file) - if err == nil && comment.Leading != "" { - for _, line := range strings.Split(comment.Leading, "\n") { - line = strings.TrimPrefix(line, " ") - // ensure we don't escape from the block comment - line = strings.Replace(line, "*/", "* /", -1) - t.P(line) + + comment, err := t.reg.FileComments(file) + if err == nil && comment.Leading != "" { + for _, line := range strings.Split(comment.Leading, "\n") { + if line != "" { + t.P("// " + strings.TrimPrefix(line, " ")) } - t.P() } - t.P("It is generated from these files:") - for _, f := range t.genFiles { - t.P("\t", f.GetName()) - } - t.P("*/") + t.P() } + t.P(`package `, t.genPkgName) t.P() }