Merge branch 'master' into grpc_client_files
diff --git a/protoc_plugin/lib/src/file_generator.dart b/protoc_plugin/lib/src/file_generator.dart
index a784958..f9b99de 100644
--- a/protoc_plugin/lib/src/file_generator.dart
+++ b/protoc_plugin/lib/src/file_generator.dart
@@ -658,10 +658,10 @@
     }
 
     out.println('''
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: ${descriptor.name}
-//
+// Generated from ${descriptor.name}.
+
 // @dart = 3.3
 ''');
     ignorelines.forEach(out.println);
diff --git a/protoc_plugin/lib/src/gen/dart_options.pb.dart b/protoc_plugin/lib/src/gen/dart_options.pb.dart
index 3b26594..5534342 100644
--- a/protoc_plugin/lib/src/gen/dart_options.pb.dart
+++ b/protoc_plugin/lib/src/gen/dart_options.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: dart_options.proto
-//
+// Generated from dart_options.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/dart_options.pbenum.dart b/protoc_plugin/lib/src/gen/dart_options.pbenum.dart
index 528ff8b..35fa9cb 100644
--- a/protoc_plugin/lib/src/gen/dart_options.pbenum.dart
+++ b/protoc_plugin/lib/src/gen/dart_options.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: dart_options.proto
-//
+// Generated from dart_options.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/api/client.pb.dart b/protoc_plugin/lib/src/gen/google/api/client.pb.dart
index 16ca1e9..4660db8 100644
--- a/protoc_plugin/lib/src/gen/google/api/client.pb.dart
+++ b/protoc_plugin/lib/src/gen/google/api/client.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/client.proto
-//
+// Generated from google/api/client.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/api/client.pbenum.dart b/protoc_plugin/lib/src/gen/google/api/client.pbenum.dart
index 48c8eeb..d6b803e 100644
--- a/protoc_plugin/lib/src/gen/google/api/client.pbenum.dart
+++ b/protoc_plugin/lib/src/gen/google/api/client.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/client.proto
-//
+// Generated from google/api/client.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/api/http.pb.dart b/protoc_plugin/lib/src/gen/google/api/http.pb.dart
index 979b62f..2fa07e3 100644
--- a/protoc_plugin/lib/src/gen/google/api/http.pb.dart
+++ b/protoc_plugin/lib/src/gen/google/api/http.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/http.proto
-//
+// Generated from google/api/http.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/api/http.pbenum.dart b/protoc_plugin/lib/src/gen/google/api/http.pbenum.dart
index 78d2dc2..6ed73bf 100644
--- a/protoc_plugin/lib/src/gen/google/api/http.pbenum.dart
+++ b/protoc_plugin/lib/src/gen/google/api/http.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/http.proto
-//
+// Generated from google/api/http.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/api/launch_stage.pb.dart b/protoc_plugin/lib/src/gen/google/api/launch_stage.pb.dart
index fe9d66f..4d97868 100644
--- a/protoc_plugin/lib/src/gen/google/api/launch_stage.pb.dart
+++ b/protoc_plugin/lib/src/gen/google/api/launch_stage.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/launch_stage.proto
-//
+// Generated from google/api/launch_stage.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/api/launch_stage.pbenum.dart b/protoc_plugin/lib/src/gen/google/api/launch_stage.pbenum.dart
index 35b891f..b441be8 100644
--- a/protoc_plugin/lib/src/gen/google/api/launch_stage.pbenum.dart
+++ b/protoc_plugin/lib/src/gen/google/api/launch_stage.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/launch_stage.proto
-//
+// Generated from google/api/launch_stage.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/api/routing.pb.dart b/protoc_plugin/lib/src/gen/google/api/routing.pb.dart
index 38a6218..c8c7627 100644
--- a/protoc_plugin/lib/src/gen/google/api/routing.pb.dart
+++ b/protoc_plugin/lib/src/gen/google/api/routing.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/routing.proto
-//
+// Generated from google/api/routing.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/api/routing.pbenum.dart b/protoc_plugin/lib/src/gen/google/api/routing.pbenum.dart
index 7c90eaf..765f1e3 100644
--- a/protoc_plugin/lib/src/gen/google/api/routing.pbenum.dart
+++ b/protoc_plugin/lib/src/gen/google/api/routing.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/api/routing.proto
-//
+// Generated from google/api/routing.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pb.dart b/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pb.dart
index c803da7..023287a 100644
--- a/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pb.dart
+++ b/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/protobuf/compiler/plugin.proto
-//
+// Generated from google/protobuf/compiler/plugin.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pbenum.dart b/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pbenum.dart
index 35788ac..b97b431 100644
--- a/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pbenum.dart
+++ b/protoc_plugin/lib/src/gen/google/protobuf/compiler/plugin.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/protobuf/compiler/plugin.proto
-//
+// Generated from google/protobuf/compiler/plugin.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pb.dart b/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pb.dart
index 95b3027..fe6bf47 100644
--- a/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pb.dart
+++ b/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/protobuf/descriptor.proto
-//
+// Generated from google/protobuf/descriptor.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pbenum.dart b/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pbenum.dart
index d8b96fe..f7479ef 100644
--- a/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pbenum.dart
+++ b/protoc_plugin/lib/src/gen/google/protobuf/descriptor.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/protobuf/descriptor.proto
-//
+// Generated from google/protobuf/descriptor.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/duration.pb.dart b/protoc_plugin/lib/src/gen/google/protobuf/duration.pb.dart
index 7ec7a47..5cba230 100644
--- a/protoc_plugin/lib/src/gen/google/protobuf/duration.pb.dart
+++ b/protoc_plugin/lib/src/gen/google/protobuf/duration.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/protobuf/duration.proto
-//
+// Generated from google/protobuf/duration.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/lib/src/gen/google/protobuf/duration.pbenum.dart b/protoc_plugin/lib/src/gen/google/protobuf/duration.pbenum.dart
index 0a7e27f..bc98025 100644
--- a/protoc_plugin/lib/src/gen/google/protobuf/duration.pbenum.dart
+++ b/protoc_plugin/lib/src/gen/google/protobuf/duration.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: google/protobuf/duration.proto
-//
+// Generated from google/protobuf/duration.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/deprecations.pb.dart b/protoc_plugin/test/goldens/deprecations.pb.dart
index b62fa9a..60c0dfa 100644
--- a/protoc_plugin/test/goldens/deprecations.pb.dart
+++ b/protoc_plugin/test/goldens/deprecations.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: deprecations.proto
-//
+// Generated from deprecations.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/deprecations.pbenum.dart b/protoc_plugin/test/goldens/deprecations.pbenum.dart
index 2230917..835b3ab 100644
--- a/protoc_plugin/test/goldens/deprecations.pbenum.dart
+++ b/protoc_plugin/test/goldens/deprecations.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: deprecations.proto
-//
+// Generated from deprecations.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/doc_comments.pb.dart b/protoc_plugin/test/goldens/doc_comments.pb.dart
index ced5a5d..8688dde 100644
--- a/protoc_plugin/test/goldens/doc_comments.pb.dart
+++ b/protoc_plugin/test/goldens/doc_comments.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: doc_comments.proto
-//
+// Generated from doc_comments.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/doc_comments.pbenum.dart b/protoc_plugin/test/goldens/doc_comments.pbenum.dart
index 2a94e45..70c8fda 100644
--- a/protoc_plugin/test/goldens/doc_comments.pbenum.dart
+++ b/protoc_plugin/test/goldens/doc_comments.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: doc_comments.proto
-//
+// Generated from doc_comments.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/grpc_service.pb.dart b/protoc_plugin/test/goldens/grpc_service.pb.dart
index ccd4679..cfb2b22 100644
--- a/protoc_plugin/test/goldens/grpc_service.pb.dart
+++ b/protoc_plugin/test/goldens/grpc_service.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/grpc_service.pbgrpc.~dart b/protoc_plugin/test/goldens/grpc_service.pbgrpc.~dart
index 3c576d0..a0968c4 100644
--- a/protoc_plugin/test/goldens/grpc_service.pbgrpc.~dart
+++ b/protoc_plugin/test/goldens/grpc_service.pbgrpc.~dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/header_in_package.pb.dart b/protoc_plugin/test/goldens/header_in_package.pb.dart
index 2d0998c..3664f16 100644
--- a/protoc_plugin/test/goldens/header_in_package.pb.dart
+++ b/protoc_plugin/test/goldens/header_in_package.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/header_with_fixnum.pb.dart b/protoc_plugin/test/goldens/header_with_fixnum.pb.dart
index 314c9c2..33ea570 100644
--- a/protoc_plugin/test/goldens/header_with_fixnum.pb.dart
+++ b/protoc_plugin/test/goldens/header_with_fixnum.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/imports.pb.dart b/protoc_plugin/test/goldens/imports.pb.dart
index f22d64b..dcc8d34 100644
--- a/protoc_plugin/test/goldens/imports.pb.dart
+++ b/protoc_plugin/test/goldens/imports.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test.proto
-//
+// Generated from test.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/imports.pbjson.dart b/protoc_plugin/test/goldens/imports.pbjson.dart
index 19bbec6..73d19b9 100644
--- a/protoc_plugin/test/goldens/imports.pbjson.dart
+++ b/protoc_plugin/test/goldens/imports.pbjson.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test.proto
-//
+// Generated from test.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/int64.pb.dart b/protoc_plugin/test/goldens/int64.pb.dart
index eed151e..d7eefab 100644
--- a/protoc_plugin/test/goldens/int64.pb.dart
+++ b/protoc_plugin/test/goldens/int64.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/oneMessage.pb.dart b/protoc_plugin/test/goldens/oneMessage.pb.dart
index 5c0e42a..e38712f 100644
--- a/protoc_plugin/test/goldens/oneMessage.pb.dart
+++ b/protoc_plugin/test/goldens/oneMessage.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/oneMessage.pb.dart.meta b/protoc_plugin/test/goldens/oneMessage.pb.dart.meta
index 5c089c8..44ec15b 100644
--- a/protoc_plugin/test/goldens/oneMessage.pb.dart.meta
+++ b/protoc_plugin/test/goldens/oneMessage.pb.dart.meta
@@ -2,15 +2,15 @@
   path: 4
   path: 0
   sourceFile: test
-  begin: 552
-  end: 563
+  begin: 565
+  end: 576
 }
 annotation: {
   path: 4
   path: 0
   sourceFile: test
-  begin: 635
-  end: 646
+  begin: 648
+  end: 659
 }
 annotation: {
   path: 4
@@ -18,8 +18,8 @@
   path: 2
   path: 0
   sourceFile: test
-  begin: 2205
-  end: 2211
+  begin: 2218
+  end: 2224
 }
 annotation: {
   path: 4
@@ -27,8 +27,8 @@
   path: 2
   path: 0
   sourceFile: test
-  begin: 2253
-  end: 2259
+  begin: 2266
+  end: 2272
 }
 annotation: {
   path: 4
@@ -36,8 +36,8 @@
   path: 2
   path: 0
   sourceFile: test
-  begin: 2339
-  end: 2348
+  begin: 2352
+  end: 2361
 }
 annotation: {
   path: 4
@@ -45,8 +45,8 @@
   path: 2
   path: 0
   sourceFile: test
-  begin: 2391
-  end: 2402
+  begin: 2404
+  end: 2415
 }
 annotation: {
   path: 4
@@ -54,8 +54,8 @@
   path: 2
   path: 1
   sourceFile: test
-  begin: 2462
-  end: 2466
+  begin: 2475
+  end: 2479
 }
 annotation: {
   path: 4
@@ -63,8 +63,8 @@
   path: 2
   path: 1
   sourceFile: test
-  begin: 2508
-  end: 2512
+  begin: 2521
+  end: 2525
 }
 annotation: {
   path: 4
@@ -72,8 +72,8 @@
   path: 2
   path: 1
   sourceFile: test
-  begin: 2594
-  end: 2601
+  begin: 2607
+  end: 2614
 }
 annotation: {
   path: 4
@@ -81,8 +81,8 @@
   path: 2
   path: 1
   sourceFile: test
-  begin: 2644
-  end: 2653
+  begin: 2657
+  end: 2666
 }
 annotation: {
   path: 4
@@ -90,8 +90,8 @@
   path: 2
   path: 2
   sourceFile: test
-  begin: 2716
-  end: 2720
+  begin: 2729
+  end: 2733
 }
 annotation: {
   path: 4
@@ -99,8 +99,8 @@
   path: 2
   path: 2
   sourceFile: test
-  begin: 2767
-  end: 2771
+  begin: 2780
+  end: 2784
 }
 annotation: {
   path: 4
@@ -108,8 +108,8 @@
   path: 2
   path: 2
   sourceFile: test
-  begin: 2851
-  end: 2858
+  begin: 2864
+  end: 2871
 }
 annotation: {
   path: 4
@@ -117,6 +117,6 @@
   path: 2
   path: 2
   sourceFile: test
-  begin: 2901
-  end: 2910
+  begin: 2914
+  end: 2923
 }
diff --git a/protoc_plugin/test/goldens/oneMessage.pbjson.dart b/protoc_plugin/test/goldens/oneMessage.pbjson.dart
index 42ba3f0..4994a4c 100644
--- a/protoc_plugin/test/goldens/oneMessage.pbjson.dart
+++ b/protoc_plugin/test/goldens/oneMessage.pbjson.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/service.pb.dart b/protoc_plugin/test/goldens/service.pb.dart
index 3ee55ef..fda76ba 100644
--- a/protoc_plugin/test/goldens/service.pb.dart
+++ b/protoc_plugin/test/goldens/service.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/service.pbserver.dart b/protoc_plugin/test/goldens/service.pbserver.dart
index f0fbaf5..e87ea47 100644
--- a/protoc_plugin/test/goldens/service.pbserver.dart
+++ b/protoc_plugin/test/goldens/service.pbserver.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/serviceGenerator.pbjson.dart b/protoc_plugin/test/goldens/serviceGenerator.pbjson.dart
index a869024..2acb937 100644
--- a/protoc_plugin/test/goldens/serviceGenerator.pbjson.dart
+++ b/protoc_plugin/test/goldens/serviceGenerator.pbjson.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: testpkg.proto
-//
+// Generated from testpkg.proto.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pb.dart b/protoc_plugin/test/goldens/topLevelEnum.pb.dart
index e1a5224..abea4d0 100644
--- a/protoc_plugin/test/goldens/topLevelEnum.pb.dart
+++ b/protoc_plugin/test/goldens/topLevelEnum.pb.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbenum.dart b/protoc_plugin/test/goldens/topLevelEnum.pbenum.dart
index 223be74..4303c14 100644
--- a/protoc_plugin/test/goldens/topLevelEnum.pbenum.dart
+++ b/protoc_plugin/test/goldens/topLevelEnum.pbenum.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbenum.dart.meta b/protoc_plugin/test/goldens/topLevelEnum.pbenum.dart.meta
index 3ee0be2..4f5fcd0 100644
--- a/protoc_plugin/test/goldens/topLevelEnum.pbenum.dart.meta
+++ b/protoc_plugin/test/goldens/topLevelEnum.pbenum.dart.meta
@@ -2,8 +2,8 @@
   path: 5
   path: 0
   sourceFile: test
-  begin: 471
-  end: 480
+  begin: 484
+  end: 493
 }
 annotation: {
   path: 5
@@ -11,8 +11,8 @@
   path: 2
   path: 0
   sourceFile: test
-  begin: 533
-  end: 539
+  begin: 546
+  end: 552
 }
 annotation: {
   path: 5
@@ -20,8 +20,8 @@
   path: 2
   path: 1
   sourceFile: test
-  begin: 615
-  end: 619
+  begin: 628
+  end: 632
 }
 annotation: {
   path: 5
@@ -29,8 +29,8 @@
   path: 2
   path: 2
   sourceFile: test
-  begin: 693
-  end: 697
+  begin: 706
+  end: 710
 }
 annotation: {
   path: 5
@@ -38,6 +38,6 @@
   path: 2
   path: 3
   sourceFile: test
-  begin: 772
-  end: 780
+  begin: 785
+  end: 793
 }
diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbjson.dart b/protoc_plugin/test/goldens/topLevelEnum.pbjson.dart
index 45eb082..06eef1d 100644
--- a/protoc_plugin/test/goldens/topLevelEnum.pbjson.dart
+++ b/protoc_plugin/test/goldens/topLevelEnum.pbjson.dart
@@ -1,7 +1,7 @@
+// This is a generated file - do not edit.
 //
-//  Generated code. Do not modify.
-//  source: test
-//
+// Generated from test.
+
 // @dart = 3.3
 
 // ignore_for_file: annotate_overrides, camel_case_types, comment_references