use super params in generated grpc service classes (#988)

- update the GRPC service generator to emit constructors that use super parameters

Author: devoncarew

protoc_plugin/CHANGELOG.md

@@ -5,6 +5,8 @@
 ([#952])
 * Add fromDart() and toDart() methods to convert between core Duration and proto
   Duration ([#986])
+* Update the GRPC service generator to emit constructors that use super
+  parameters.
 
 [#975]: https://github.com/google/protobuf.dart/issues/975
 [#952]: https://github.com/google/protobuf.dart/issues/952

protoc_plugin/Makefile

@@ -26,7 +26,7 @@ TEST_PROTO_LIST = \
 	dart_name \
 	deprecations \
 	doc_comments \
-        default_value_escape \
+	default_value_escape \
 	entity \
 	enum_extension \
 	enum_name \

protoc_plugin/lib/src/grpc_generator.dart

@@ -108,34 +108,28 @@ class GrpcServiceGenerator {
   void _generateClient(IndentingWriter out) {
     if (_descriptor.options.deprecated) {
       out.println(
-          '@$coreImportPrefix.Deprecated(\'This service is deprecated\')');
+          "@$coreImportPrefix.Deprecated('This service is deprecated')");
     }
-    out.println(
-        '@$protobufImportPrefix.GrpcServiceName(\'$_fullServiceName\')');
+    out.println("@$protobufImportPrefix.GrpcServiceName('$_fullServiceName')");
     out.addBlock('class $_clientClassname extends $_client {', '}', () {
       for (final method in _methods) {
         method.generateClientMethodDescriptor(out);
       }
       out.println();
-      out.println('$_clientClassname($_clientChannel channel,');
-      out.println('    {$_callOptions? options,');
       out.println(
-          '    $coreImportPrefix.Iterable<$_interceptor>? interceptors})');
-      out.println('    : super(channel, options: options,');
-      out.println('      interceptors: interceptors);');
+          '$_clientClassname(super.channel, {super.options, super.interceptors});');
       for (final method in _methods) {
         method.generateClientStub(out);
       }
     });
   }
 
   void _generateService(IndentingWriter out) {
-    out.println(
-        '@$protobufImportPrefix.GrpcServiceName(\'$_fullServiceName\')');
+    out.println("@$protobufImportPrefix.GrpcServiceName('$_fullServiceName')");
     out.addBlock('abstract class $_serviceClassname extends $_service {', '}',
         () {
       out.println(
-          '$coreImportPrefix.String get \$name => \'$_fullServiceName\';');
+          "$coreImportPrefix.String get \$name => '$_fullServiceName';");
       out.println();
       out.addBlock('$_serviceClassname() {', '}', () {
         for (final method in _methods) {
@@ -153,9 +147,7 @@ class GrpcServiceGenerator {
   }
 
   static final String _callOptions = '$grpcImportPrefix.CallOptions';
-  static final String _interceptor = '$grpcImportPrefix.ClientInterceptor';
   static final String _client = '$grpcImportPrefix.Client';
-  static final String _clientChannel = '$grpcImportPrefix.ClientChannel';
   static final String _service = '$grpcImportPrefix.Service';
 }
 

protoc_plugin/test/golden_file.dart

@@ -16,7 +16,7 @@ void expectMatchesGoldenFile(String actual, String goldenFilePath) {
     expect(actual, equals(goldenFile.readAsStringSync()),
         reason: 'goldenFilePath: "$goldenFilePath"');
   } else {
-    // This enables writing the updated file when the run in otherwise hermetic
+    // This enables writing the updated file when run in otherwise hermetic
     // settings.
     final workspaceDirectory =
         Platform.environment['BUILD_WORKSPACE_DIRECTORY'];

protoc_plugin/test/goldens/grpc_service.pbgrpc

@@ -46,11 +46,7 @@ class TestClient extends $grpc.Client {
       ($0.Input value) => value.writeToBuffer(),
       ($core.List<$core.int> value) => $0.Output.fromBuffer(value));
 
-  TestClient($grpc.ClientChannel channel,
-      {$grpc.CallOptions? options,
-      $core.Iterable<$grpc.ClientInterceptor>? interceptors})
-      : super(channel, options: options,
-        interceptors: interceptors);
+  TestClient(super.channel, {super.options, super.interceptors});
 
   $grpc.ResponseFuture<$0.Output> unary($0.Input request, {$grpc.CallOptions? options}) {
     return $createUnaryCall(_$unary, request, options: options);