Allow application of external mixins to generated dart protos.

lib/message_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 MessageGenerator extends ProtobufContainer {
   /// Returns the mixin for this message, or null if none.
   ///
   /// First searches [declaredMixins], then internal mixins declared by
@@ skipping 293 matching lines @@
   }
 
   void generateFieldsAccessorsMutators(IndentingWriter out) {
     for (ProtobufField field in _fieldList) {
       out.println();
 
       var fieldTypeString = field.getDartType(package);
       var defaultExpr = field.getDefaultExpr();
       var names = field.memberNames;
 
+      _emitOverrideIf(field.overridesGetter, out);
       out.println('${fieldTypeString} get ${names.fieldName}'
           ' => \$_get('
           '${field.index}, ${field.number}, $defaultExpr);');
-      if (!field.isRepeated) {
+      if (field.isRepeated) {
+        if (field.overridesSetter) {
+          throw 'Field ${field.fqname} cannot override a setter for '
+              '${names.fieldName} because it is repeated.';
+        }
+        if (field.overridesHasMethod) {
+          throw 'Field ${field.fqname} cannot override '
+              '${names.hasMethodName}() because it is repeated.';
+        }
+        if (field.overridesClearMethod) {
+          throw 'Field ${field.fqname} cannot override '
+              '${names.clearMethodName}() because it is repeated.';
+        }
+      } else {
         var fastSetter = field.baseType.setter;
+        _emitOverrideIf(field.overridesSetter, out);
         if (fastSetter != null) {
           out.println('void set ${names.fieldName}'
               '($fieldTypeString v) { '
               '$fastSetter(${field.index}, ${field.number}, v);'
               ' }');
         } else {
           out.println('void set ${names.fieldName}'
               '($fieldTypeString v) { '
               'setField(${field.number}, v);'
               ' }');
         }
+        _emitOverrideIf(field.overridesHasMethod, out);
         out.println('bool ${names.hasMethodName}() =>'
             ' \$_has(${field.index}, ${field.number});');
+        _emitOverrideIf(field.overridesClearMethod, out);
         out.println('void ${names.clearMethodName}() =>'
             ' clearField(${field.number});');
       }
     }
   }
 
+  void _emitOverrideIf(bool condition, IndentingWriter out) {
+    if (condition) {
+      out.println('@override');
+    }
+  }
+
   void generateEnums(IndentingWriter out) {
     for (EnumGenerator e in _enumGenerators) {
       e.generate(out);
     }
 
     for (MessageGenerator m in _messageGenerators) {
       m.generateEnums(out);
     }
   }
 
@@ skipping 33 matching lines @@
 
     for (var m in _messageGenerators) {
       m.generateConstants(out);
     }
 
     for (var e in _enumGenerators) {
       e.generateConstants(out);
     }
   }
 }