Fix all strong mode warnings in protoc-plugin

lib/file_generator.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of protoc;
 
 class FileGenerator extends ProtobufContainer {
-
   /// Returns the the mixin to use by default in this file,
   /// or null for no mixin by default.
   static PbMixin _getDefaultMixin(FileDescriptorProto desc) {
     if (!desc.hasOptions()) return null;
     if (!desc.options.hasExtension(Dart_options.defaultMixin)) {
       return null;
     }
     var name = desc.options.getExtension(Dart_options.defaultMixin);
     PbMixin mixin = findMixin(name);
     if (mixin == null) {
-      throw("unknown mixin class: ${name}");
+      throw ("unknown mixin class: ${name}");
     }
     return mixin;
   }
 
   final FileDescriptorProto _fileDescriptor;
 
   final List<EnumGenerator> enumGenerators = <EnumGenerator>[];
   final List<MessageGenerator> messageGenerators = <MessageGenerator>[];
   final List<ExtensionGenerator> extensionGenerators = <ExtensionGenerator>[];
   final List<ClientApiGenerator> clientApiGenerators = <ClientApiGenerator>[];
   final List<ServiceGenerator> serviceGenerators = <ServiceGenerator>[];
 
   /// True if cross-references have been resolved.
   bool _linked = false;
 
   FileGenerator(this._fileDescriptor) {
     var defaultMixin = _getDefaultMixin(_fileDescriptor);
 
     // Load and register all enum and message types.
     for (EnumDescriptorProto enumType in _fileDescriptor.enumType) {
       enumGenerators.add(new EnumGenerator(enumType, this));
     }
     for (DescriptorProto messageType in _fileDescriptor.messageType) {
-      messageGenerators.add(
-          new MessageGenerator(messageType, this, defaultMixin));
+      messageGenerators
+          .add(new MessageGenerator(messageType, this, defaultMixin));
     }
     for (FieldDescriptorProto extension in _fileDescriptor.extension) {
       extensionGenerators.add(new ExtensionGenerator(extension, this));
     }
     for (ServiceDescriptorProto service in _fileDescriptor.service) {
       var serviceGen = new ServiceGenerator(service, this);
       serviceGenerators.add(serviceGen);
       clientApiGenerators.add(new ClientApiGenerator(serviceGen));
     }
   }
@@ skipping 47 matching lines @@
     return libraryName;
   }
 
   CodeGeneratorResponse_File generateResponse(OutputConfiguration config) {
     IndentingWriter out = new IndentingWriter();
 
     generate(out, config);
 
     Uri filePath = new Uri.file(_fileDescriptor.name);
     return new CodeGeneratorResponse_File()
-        ..name = config.outputPathFor(filePath).path
-        ..content = out.toString();
+      ..name = config.outputPathFor(filePath).path
+      ..content = out.toString();
   }
 
   /// Generates the Dart code for this .proto file.
   void generate(IndentingWriter out,
       [OutputConfiguration config = const DefaultOutputConfiguration()]) {
     if (!_linked) throw new StateError("not linked");
 
     Uri filePath = new Uri.file(_fileDescriptor.name);
     if (filePath.isAbsolute) {
-        // protoc should never generate a file descriptor with an absolute path.
-        throw("FAILURE: File with an absolute path is not supported");
+      // protoc should never generate a file descriptor with an absolute path.
+      throw ("FAILURE: File with an absolute path is not supported");

[Søren Gjesse, 2016/03/29 09:04:13]

Remove the () here.

[skybrian, 2016/04/01 02:00:15]

Done.

     }
 
     generateHeader(out, filePath, config);
 
     // Generate code.
     for (EnumGenerator e in enumGenerators) {
       e.generate(out);
     }
     for (MessageGenerator m in messageGenerators) {
       m.generate(out);
@@ skipping 33 matching lines @@
       m.generateConstants(out);
     }
     for (ServiceGenerator s in serviceGenerators) {
       s.generateConstants(out);
     }
   }
 
   /// Prints header and imports.
   void generateHeader(IndentingWriter out, Uri filePath,
       [OutputConfiguration config = const DefaultOutputConfiguration()]) {
-
     String libraryName = _generateLibraryName(filePath);
-    out.println(
-        '///\n'
+    out.println('///\n'
         '//  Generated code. Do not modify.\n'
         '///\n'
         'library $libraryName;\n');
 
     // We only add the dart:async import if there are services in the
     // FileDescriptorProto.
     if (_fileDescriptor.service.isNotEmpty) {
       out.println("import 'dart:async';\n");
     }
 
     if (_needsFixnumImport) {
       out.println("import 'package:fixnum/fixnum.dart';");
     }
     out.println("import 'package:protobuf/protobuf.dart';");
 
     var mixinImports = findMixinsToImport();
     var importNames = mixinImports.keys.toList();
     importNames.sort();
     for (var imp in importNames) {
       var symbols = mixinImports[imp];
       out.println("import '${imp}' show ${symbols.join(', ')};");
     }
 
     for (var imported in _findProtosToImport()) {
       String filename = imported._fileDescriptor.name;
       Uri importPath = new Uri.file(filename);
       if (importPath.isAbsolute) {
         // protoc should never generate an import with an absolute path.
-        throw("FAILURE: Import with absolute path is not supported");
+        throw ("FAILURE: Import with absolute path is not supported");

[Søren Gjesse, 2016/03/29 09:04:13]

Remove the () here.

[skybrian, 2016/04/01 02:00:15]

Done.

       }
       // Create a path from the current file to the imported proto.
       Uri resolvedImport = config.resolveImport(importPath, filePath);
       out.print("import '$resolvedImport'");
       if (package != imported.package && imported.package.isNotEmpty) {
         out.print(' as ${imported.packageImportPrefix}');
       }
       out.println(';');
     }
     out.println();
@@ skipping 25 matching lines @@
     return imports;
   }
 
   /// Returns a map from import names to the Dart symbols to be imported.
   Map<String, List<String>> findMixinsToImport() {
     var mixins = new Set<PbMixin>();
     for (MessageGenerator m in messageGenerators) {
       m.addMixinsTo(mixins);
     }
 
-    var imports = {};
+    var imports = <String, List<String>>{};
     for (var m in mixins) {
-        var imp = m.importFrom;
-        List<String> symbols = imports[imp];
-        if (symbols == null) {
-          symbols = [];
-          imports[imp] = symbols;
-        }
-        symbols.add(m.name);
+      var imp = m.importFrom;
+      List<String> symbols = imports[imp];
+      if (symbols == null) {
+        symbols = [];
+        imports[imp] = symbols;
+      }
+      symbols.add(m.name);
     }
 
     for (var imp in imports.keys) {
       imports[imp].sort();
     }
 
     return imports;
   }
 }