Modify summary codegen so that builder getters return builders.

pkg/analyzer/tool/summary/generate.dart

 // Copyright (c) 2015, 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.
 
 /**
  * This file contains code to generate serialization/deserialization logic for
  * summaries based on an "IDL" description of the summary format (written in
  * stylized Dart).
  *
  * For each class in the "IDL" input, two corresponding classes are generated:
@@ skipping 102 matching lines @@
     if (type.isList) {
       return 'List<${type.typeName}>';
     } else {
       return type.typeName;
     }
   }
 
   /**
    * Generate a Dart expression representing the default value for a field
    * having the given [type], or `null` if there is no default value.
+   *
+   * If [builder] is `true`, the returned type should be appropriate for use in
+   * a builder class.
    */
-  String defaultValue(idlModel.FieldType type) {
+  String defaultValue(idlModel.FieldType type, bool builder) {
     if (type.isList) {
-      return 'const <${type.typeName}>[]';
+      if (builder) {
+        idlModel.FieldType elementType =
+            new idlModel.FieldType(type.typeName, false);
+        return '<${encodedType(elementType)}>[]';
+      } else {
+        return 'const <${type.typeName}>[]';
+      }
     } else if (_idl.enums.containsKey(type.typeName)) {
       return '${type.typeName}.${_idl.enums[type.typeName].values[0]}';
     } else if (type.typeName == 'int') {
       return '0';
     } else if (type.typeName == 'String') {
       return "''";
     } else if (type.typeName == 'bool') {
       return 'false';
     } else {
       return null;
@@ skipping 170 matching lines @@
         String fieldName = field.name;
         idlModel.FieldType type = field.type;
         String typeStr = encodedType(type);
         out('$typeStr _$fieldName;');
       }
       // Generate getters and setters.
       for (idlModel.FieldDeclaration field in cls.fields) {
         String fieldName = field.name;
         idlModel.FieldType fieldType = field.type;
         String typeStr = encodedType(fieldType);
-        String def = defaultValue(fieldType);
-        String defSuffix = def == null ? '' : ' ?? $def';
+        String def = defaultValue(fieldType, true);
+        String defSuffix = def == null ? '' : ' ??= $def';
         out();
         out('@override');
-        out('${dartType(fieldType)} get $fieldName => _$fieldName$defSuffix;');
+        out('$typeStr get $fieldName => _$fieldName$defSuffix;');
         out();
         outDoc(field.documentation);
         constructorParams.add('$typeStr $fieldName');
         out('void set $fieldName($typeStr _value) {');
         indent(() {
           String stateFieldName = '_' + fieldName;
           out('assert(!_finished);');
           // Validate that int(s) are non-negative.
           if (fieldType.typeName == 'int') {
             if (!fieldType.isList) {
@@ skipping 51 matching lines @@
             condition = ' || $valueName.isEmpty';
             if (_idl.classes.containsKey(fieldType.typeName)) {
               String itemCode = 'b.finish(fbBuilder)';
               String listCode = '$valueName.map((b) => $itemCode).toList()';
               writeCode = '$offsetName = fbBuilder.writeList($listCode);';
             } else if (_idl.enums.containsKey(fieldType.typeName)) {
               String itemCode = 'b.index';
               String listCode = '$valueName.map((b) => $itemCode).toList()';
               writeCode = '$offsetName = fbBuilder.writeListUint32($listCode);';
             } else if (fieldType.typeName == 'int') {
-              writeCode = '$offsetName = fbBuilder.writeListUint32($valueName);';
+              writeCode =
+                  '$offsetName = fbBuilder.writeListUint32($valueName);';
             } else if (fieldType.typeName == 'double') {
-              writeCode = '$offsetName = fbBuilder.writeListFloat64($valueName);';
+              writeCode =
+                  '$offsetName = fbBuilder.writeListFloat64($valueName);';
             } else {
               assert(fieldType.typeName == 'String');
               String itemCode = 'fbBuilder.writeString(b)';
               String listCode = '$valueName.map((b) => $itemCode).toList()';
               writeCode = '$offsetName = fbBuilder.writeList($listCode);';
             }
           } else if (fieldType.typeName == 'String') {
             writeCode = '$offsetName = fbBuilder.writeString($valueName);';
           } else if (_idl.classes.containsKey(fieldType.typeName)) {
             writeCode = '$offsetName = $valueName.finish(fbBuilder);';
@@ skipping 20 matching lines @@
           if (fieldType.isList ||
               fieldType.typeName == 'String' ||
               _idl.classes.containsKey(fieldType.typeName)) {
             String offsetName = 'offset_' + field.name;
             condition = '$offsetName != null';
             writeCode = 'fbBuilder.addOffset($index, $offsetName);';
           } else if (fieldType.typeName == 'bool') {
             condition = '$valueName == true';
             writeCode = 'fbBuilder.addBool($index, true);';
           } else if (fieldType.typeName == 'int') {
-            condition += ' && $valueName != ${defaultValue(fieldType)}';
+            condition += ' && $valueName != ${defaultValue(fieldType, true)}';
             writeCode = 'fbBuilder.addUint32($index, $valueName);';
           } else if (_idl.enums.containsKey(fieldType.typeName)) {
-            condition += ' && $valueName != ${defaultValue(fieldType)}';
+            condition += ' && $valueName != ${defaultValue(fieldType, true)}';
             writeCode = 'fbBuilder.addUint32($index, $valueName.index);';
           }
           if (writeCode == null) {
             throw new UnimplementedError('Writing type ${fieldType.typeName}');
           }
           out('if ($condition) {');
           indent(() {
             out(writeCode);
           });
           out('}');
@@ skipping 54 matching lines @@
         String fieldName = field.name;
         out('$returnType _$fieldName;');
       }
       // Write getters.
       cls.fields.asMap().forEach((index, field) {
         String fieldName = field.name;
         idlModel.FieldType type = field.type;
         String typeName = type.typeName;
         // Prepare "readCode" + "def"
         String readCode;
-        String def = defaultValue(type);
+        String def = defaultValue(type, false);
         if (type.isList) {
           if (typeName == 'int') {
             String itemCode = 'const fb.Uint32Reader()';
             readCode = 'const fb.ListReader<int>($itemCode)';
           } else if (typeName == 'double') {
             readCode = 'const fb.Float64ListReader()';
           } else if (typeName == 'String') {
             String itemCode = 'const fb.StringReader()';
             readCode = 'const fb.ListReader<String>($itemCode)';
           } else if (_idl.classes.containsKey(typeName)) {
@@ skipping 105 matching lines @@
       return token.lexeme.split('\n').map((String line) {
         if (line.startsWith(indent)) {
           line = line.substring(indent.length);
         }
         return line;
       }).join('\n');
     }
     return null;
   }
 }