Modify summary codegen so that builder getters return builders.

pkg/analyzer/lib/src/summary/format.dart

Index: pkg/analyzer/lib/src/summary/format.dart
diff --git a/pkg/analyzer/lib/src/summary/format.dart b/pkg/analyzer/lib/src/summary/format.dart
index d872088af195ed33a5350cf064c051965fcc994c..8b06f9d30562e704bddfecb619f7911f6cf2c6dc 100644
--- a/pkg/analyzer/lib/src/summary/format.dart
+++ b/pkg/analyzer/lib/src/summary/format.dart
@@ -438,7 +438,7 @@ class LinkedLibraryBuilder extends Object with _LinkedLibraryMixin implements Li
   int _numPrelinkedDependencies;
 
   @override
-  List<LinkedUnit> get units => _units ?? const <LinkedUnit>[];
+  List<LinkedUnitBuilder> get units => _units ?? const <LinkedUnit>[];

[scheglov, 2016/01/20 17:13:06]

Should we also replace type arguments of the default lists?

[Paul Berry, 2016/01/20 17:31:01]

Hmm, good question.  Since this is a const list, it probably doesn't matter for
now.

But maybe it would be even better for this line to read:

    List<LinkedUnitBuilder> get units => _units ??= <LinkedUnitBuilder>[];

This would have the advantage of allowing code like the following:

    LinkedLibraryBuilder llb = new LinkedLibraryBuilder();
    llb.units.add(new LinkedUnitBuilder(...));

I'll do some experiments and get back to you.

 
   /**
    * The linked summary of all the compilation units constituting the
@@ -452,7 +452,7 @@ class LinkedLibraryBuilder extends Object with _LinkedLibraryMixin implements Li
   }
 
   @override
-  List<LinkedDependency> get dependencies => _dependencies ?? const <LinkedDependency>[];
+  List<LinkedDependencyBuilder> get dependencies => _dependencies ?? const <LinkedDependency>[];
 
   /**
    * The libraries that this library depends on (either via an explicit import
@@ -487,7 +487,7 @@ class LinkedLibraryBuilder extends Object with _LinkedLibraryMixin implements Li
   }
 
   @override
-  List<LinkedExportName> get exportNames => _exportNames ?? const <LinkedExportName>[];
+  List<LinkedExportNameBuilder> get exportNames => _exportNames ?? const <LinkedExportName>[];
 
   /**
    * Information about entities in the export namespace of the library that are
@@ -894,7 +894,7 @@ class LinkedUnitBuilder extends Object with _LinkedUnitMixin implements LinkedUn
   List<TypeRefBuilder> _types;
 
   @override
-  List<LinkedReference> get references => _references ?? const <LinkedReference>[];
+  List<LinkedReferenceBuilder> get references => _references ?? const <LinkedReference>[];
 
   /**
    * Information about the resolution of references within the compilation
@@ -910,7 +910,7 @@ class LinkedUnitBuilder extends Object with _LinkedUnitMixin implements LinkedUn
   }
 
   @override
-  List<TypeRef> get types => _types ?? const <TypeRef>[];
+  List<TypeRefBuilder> get types => _types ?? const <TypeRef>[];
 
   /**
    * List associating slot ids found inside the unlinked summary for the
@@ -1025,7 +1025,7 @@ class SdkBundleBuilder extends Object with _SdkBundleMixin implements SdkBundle
   }
 
   @override
-  List<LinkedLibrary> get linkedLibraries => _linkedLibraries ?? const <LinkedLibrary>[];
+  List<LinkedLibraryBuilder> get linkedLibraries => _linkedLibraries ?? const <LinkedLibrary>[];
 
   /**
    * Linked libraries.
@@ -1047,7 +1047,7 @@ class SdkBundleBuilder extends Object with _SdkBundleMixin implements SdkBundle
   }
 
   @override
-  List<UnlinkedUnit> get unlinkedUnits => _unlinkedUnits ?? const <UnlinkedUnit>[];
+  List<UnlinkedUnitBuilder> get unlinkedUnits => _unlinkedUnits ?? const <UnlinkedUnit>[];
 
   /**
    * Unlinked information for the compilation units constituting the SDK.
@@ -1255,7 +1255,7 @@ class TypeRefBuilder extends Object with _TypeRefMixin implements TypeRef {
   }
 
   @override
-  List<TypeRef> get typeArguments => _typeArguments ?? const <TypeRef>[];
+  List<TypeRefBuilder> get typeArguments => _typeArguments ?? const <TypeRef>[];
 
   /**
    * If this is an instantiation of a generic type, the type arguments used to
@@ -1441,7 +1441,7 @@ class UnlinkedClassBuilder extends Object with _UnlinkedClassMixin implements Un
   }
 
   @override
-  UnlinkedDocumentationComment get documentationComment => _documentationComment;
+  UnlinkedDocumentationCommentBuilder get documentationComment => _documentationComment;
 
   /**
    * Documentation comment for the class, or `null` if there is no
@@ -1453,7 +1453,7 @@ class UnlinkedClassBuilder extends Object with _UnlinkedClassMixin implements Un
   }
 
   @override
-  List<UnlinkedTypeParam> get typeParameters => _typeParameters ?? const <UnlinkedTypeParam>[];
+  List<UnlinkedTypeParamBuilder> get typeParameters => _typeParameters ?? const <UnlinkedTypeParam>[];
 
   /**
    * Type parameters of the class, if any.
@@ -1464,7 +1464,7 @@ class UnlinkedClassBuilder extends Object with _UnlinkedClassMixin implements Un
   }
 
   @override
-  TypeRef get supertype => _supertype;
+  TypeRefBuilder get supertype => _supertype;
 
   /**
    * Supertype of the class, or `null` if either (a) the class doesn't
@@ -1477,7 +1477,7 @@ class UnlinkedClassBuilder extends Object with _UnlinkedClassMixin implements Un
   }
 
   @override
-  List<TypeRef> get mixins => _mixins ?? const <TypeRef>[];
+  List<TypeRefBuilder> get mixins => _mixins ?? const <TypeRef>[];
 
   /**
    * Mixins appearing in a `with` clause, if any.
@@ -1488,7 +1488,7 @@ class UnlinkedClassBuilder extends Object with _UnlinkedClassMixin implements Un
   }
 
   @override
-  List<TypeRef> get interfaces => _interfaces ?? const <TypeRef>[];
+  List<TypeRefBuilder> get interfaces => _interfaces ?? const <TypeRef>[];
 
   /**
    * Interfaces appearing in an `implements` clause, if any.
@@ -1499,7 +1499,7 @@ class UnlinkedClassBuilder extends Object with _UnlinkedClassMixin implements Un
   }
 
   @override
-  List<UnlinkedVariable> get fields => _fields ?? const <UnlinkedVariable>[];
+  List<UnlinkedVariableBuilder> get fields => _fields ?? const <UnlinkedVariable>[];
 
   /**
    * Field declarations contained in the class.
@@ -1510,7 +1510,7 @@ class UnlinkedClassBuilder extends Object with _UnlinkedClassMixin implements Un
   }
 
   @override
-  List<UnlinkedExecutable> get executables => _executables ?? const <UnlinkedExecutable>[];
+  List<UnlinkedExecutableBuilder> get executables => _executables ?? const <UnlinkedExecutable>[];
 
   /**
    * Executable objects (methods, getters, and setters) contained in the class.
@@ -1995,7 +1995,7 @@ class UnlinkedConstBuilder extends Object with _UnlinkedConstMixin implements Un
   }
 
   @override
-  List<TypeRef> get references => _references ?? const <TypeRef>[];
+  List<TypeRefBuilder> get references => _references ?? const <TypeRef>[];
 
   /**
    * Sequence of language constructs consumed by the operations
@@ -2333,7 +2333,7 @@ class UnlinkedEnumBuilder extends Object with _UnlinkedEnumMixin implements Unli
   }
 
   @override
-  UnlinkedDocumentationComment get documentationComment => _documentationComment;
+  UnlinkedDocumentationCommentBuilder get documentationComment => _documentationComment;
 
   /**
    * Documentation comment for the enum, or `null` if there is no documentation
@@ -2345,7 +2345,7 @@ class UnlinkedEnumBuilder extends Object with _UnlinkedEnumMixin implements Unli
   }
 
   @override
-  List<UnlinkedEnumValue> get values => _values ?? const <UnlinkedEnumValue>[];
+  List<UnlinkedEnumValueBuilder> get values => _values ?? const <UnlinkedEnumValue>[];
 
   /**
    * Values listed in the enum declaration, in declaration order.
@@ -2502,7 +2502,7 @@ class UnlinkedEnumValueBuilder extends Object with _UnlinkedEnumValueMixin imple
   }
 
   @override
-  UnlinkedDocumentationComment get documentationComment => _documentationComment;
+  UnlinkedDocumentationCommentBuilder get documentationComment => _documentationComment;
 
   /**
    * Documentation comment for the enum value, or `null` if there is no
@@ -2655,7 +2655,7 @@ class UnlinkedExecutableBuilder extends Object with _UnlinkedExecutableMixin imp
   }
 
   @override
-  UnlinkedDocumentationComment get documentationComment => _documentationComment;
+  UnlinkedDocumentationCommentBuilder get documentationComment => _documentationComment;
 
   /**
    * Documentation comment for the executable, or `null` if there is no
@@ -2667,7 +2667,7 @@ class UnlinkedExecutableBuilder extends Object with _UnlinkedExecutableMixin imp
   }
 
   @override
-  List<UnlinkedTypeParam> get typeParameters => _typeParameters ?? const <UnlinkedTypeParam>[];
+  List<UnlinkedTypeParamBuilder> get typeParameters => _typeParameters ?? const <UnlinkedTypeParam>[];
 
   /**
    * Type parameters of the executable, if any.  Empty if support for generic
@@ -2679,7 +2679,7 @@ class UnlinkedExecutableBuilder extends Object with _UnlinkedExecutableMixin imp
   }
 
   @override
-  TypeRef get returnType => _returnType;
+  TypeRefBuilder get returnType => _returnType;
 
   /**
    * Declared return type of the executable.  Absent if the return type is
@@ -2692,7 +2692,7 @@ class UnlinkedExecutableBuilder extends Object with _UnlinkedExecutableMixin imp
   }
 
   @override
-  List<UnlinkedParam> get parameters => _parameters ?? const <UnlinkedParam>[];
+  List<UnlinkedParamBuilder> get parameters => _parameters ?? const <UnlinkedParam>[];
 
   /**
    * Parameters of the executable, if any.  Note that getters have no
@@ -3232,7 +3232,7 @@ class UnlinkedExportPublicBuilder extends Object with _UnlinkedExportPublicMixin
   }
 
   @override
-  List<UnlinkedCombinator> get combinators => _combinators ?? const <UnlinkedCombinator>[];
+  List<UnlinkedCombinatorBuilder> get combinators => _combinators ?? const <UnlinkedCombinator>[];
 
   /**
    * Combinators contained in this import declaration.
@@ -3372,7 +3372,7 @@ class UnlinkedImportBuilder extends Object with _UnlinkedImportMixin implements
   }
 
   @override
-  List<UnlinkedCombinator> get combinators => _combinators ?? const <UnlinkedCombinator>[];
+  List<UnlinkedCombinatorBuilder> get combinators => _combinators ?? const <UnlinkedCombinator>[];
 
   /**
    * Combinators contained in this import declaration.
@@ -3679,7 +3679,7 @@ class UnlinkedParamBuilder extends Object with _UnlinkedParamMixin implements Un
   }
 
   @override
-  TypeRef get type => _type;
+  TypeRefBuilder get type => _type;
 
   /**
    * If [isFunctionTyped] is `true`, the declared return type.  If
@@ -3694,7 +3694,7 @@ class UnlinkedParamBuilder extends Object with _UnlinkedParamMixin implements Un
   }
 
   @override
-  List<UnlinkedParam> get parameters => _parameters ?? const <UnlinkedParam>[];
+  List<UnlinkedParamBuilder> get parameters => _parameters ?? const <UnlinkedParam>[];
 
   /**
    * If [isFunctionTyped] is `true`, the parameters of the function type.
@@ -4194,7 +4194,7 @@ class UnlinkedPublicNamespaceBuilder extends Object with _UnlinkedPublicNamespac
   List<String> _parts;
 
   @override
-  List<UnlinkedPublicName> get names => _names ?? const <UnlinkedPublicName>[];
+  List<UnlinkedPublicNameBuilder> get names => _names ?? const <UnlinkedPublicName>[];
 
   /**
    * Public names defined in the compilation unit.
@@ -4208,7 +4208,7 @@ class UnlinkedPublicNamespaceBuilder extends Object with _UnlinkedPublicNamespac
   }
 
   @override
-  List<UnlinkedExportPublic> get exports => _exports ?? const <UnlinkedExportPublic>[];
+  List<UnlinkedExportPublicBuilder> get exports => _exports ?? const <UnlinkedExportPublic>[];
 
   /**
    * Export declarations in the compilation unit.
@@ -4490,7 +4490,7 @@ class UnlinkedTypedefBuilder extends Object with _UnlinkedTypedefMixin implement
   }
 
   @override
-  UnlinkedDocumentationComment get documentationComment => _documentationComment;
+  UnlinkedDocumentationCommentBuilder get documentationComment => _documentationComment;
 
   /**
    * Documentation comment for the typedef, or `null` if there is no
@@ -4502,7 +4502,7 @@ class UnlinkedTypedefBuilder extends Object with _UnlinkedTypedefMixin implement
   }
 
   @override
-  List<UnlinkedTypeParam> get typeParameters => _typeParameters ?? const <UnlinkedTypeParam>[];
+  List<UnlinkedTypeParamBuilder> get typeParameters => _typeParameters ?? const <UnlinkedTypeParam>[];
 
   /**
    * Type parameters of the typedef, if any.
@@ -4513,7 +4513,7 @@ class UnlinkedTypedefBuilder extends Object with _UnlinkedTypedefMixin implement
   }
 
   @override
-  TypeRef get returnType => _returnType;
+  TypeRefBuilder get returnType => _returnType;
 
   /**
    * Return type of the typedef.  Absent if the return type is `void`.
@@ -4524,7 +4524,7 @@ class UnlinkedTypedefBuilder extends Object with _UnlinkedTypedefMixin implement
   }
 
   @override
-  List<UnlinkedParam> get parameters => _parameters ?? const <UnlinkedParam>[];
+  List<UnlinkedParamBuilder> get parameters => _parameters ?? const <UnlinkedParam>[];
 
   /**
    * Parameters of the executable, if any.
@@ -4723,7 +4723,7 @@ class UnlinkedTypeParamBuilder extends Object with _UnlinkedTypeParamMixin imple
   }
 
   @override
-  TypeRef get bound => _bound;
+  TypeRefBuilder get bound => _bound;
 
   /**
    * Bound of the type parameter, if a bound is explicitly declared.  Otherwise
@@ -4884,7 +4884,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  UnlinkedDocumentationComment get libraryDocumentationComment => _libraryDocumentationComment;
+  UnlinkedDocumentationCommentBuilder get libraryDocumentationComment => _libraryDocumentationComment;
 
   /**
    * Documentation comment for the library, or `null` if there is no
@@ -4896,7 +4896,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  UnlinkedPublicNamespace get publicNamespace => _publicNamespace;
+  UnlinkedPublicNamespaceBuilder get publicNamespace => _publicNamespace;
 
   /**
    * Unlinked public namespace of this compilation unit.
@@ -4907,7 +4907,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedReference> get references => _references ?? const <UnlinkedReference>[];
+  List<UnlinkedReferenceBuilder> get references => _references ?? const <UnlinkedReference>[];
 
   /**
    * Top level and prefixed names referred to by this compilation unit.  The
@@ -4920,7 +4920,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedClass> get classes => _classes ?? const <UnlinkedClass>[];
+  List<UnlinkedClassBuilder> get classes => _classes ?? const <UnlinkedClass>[];
 
   /**
    * Classes declared in the compilation unit.
@@ -4931,7 +4931,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedEnum> get enums => _enums ?? const <UnlinkedEnum>[];
+  List<UnlinkedEnumBuilder> get enums => _enums ?? const <UnlinkedEnum>[];
 
   /**
    * Enums declared in the compilation unit.
@@ -4942,7 +4942,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedExecutable> get executables => _executables ?? const <UnlinkedExecutable>[];
+  List<UnlinkedExecutableBuilder> get executables => _executables ?? const <UnlinkedExecutable>[];
 
   /**
    * Top level executable objects (functions, getters, and setters) declared in
@@ -4954,7 +4954,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedExportNonPublic> get exports => _exports ?? const <UnlinkedExportNonPublic>[];
+  List<UnlinkedExportNonPublicBuilder> get exports => _exports ?? const <UnlinkedExportNonPublic>[];
 
   /**
    * Export declarations in the compilation unit.
@@ -4965,7 +4965,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedImport> get imports => _imports ?? const <UnlinkedImport>[];
+  List<UnlinkedImportBuilder> get imports => _imports ?? const <UnlinkedImport>[];
 
   /**
    * Import declarations in the compilation unit.
@@ -4976,7 +4976,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedPart> get parts => _parts ?? const <UnlinkedPart>[];
+  List<UnlinkedPartBuilder> get parts => _parts ?? const <UnlinkedPart>[];
 
   /**
    * Part declarations in the compilation unit.
@@ -4987,7 +4987,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedTypedef> get typedefs => _typedefs ?? const <UnlinkedTypedef>[];
+  List<UnlinkedTypedefBuilder> get typedefs => _typedefs ?? const <UnlinkedTypedef>[];
 
   /**
    * Typedefs declared in the compilation unit.
@@ -4998,7 +4998,7 @@ class UnlinkedUnitBuilder extends Object with _UnlinkedUnitMixin implements Unli
   }
 
   @override
-  List<UnlinkedVariable> get variables => _variables ?? const <UnlinkedVariable>[];
+  List<UnlinkedVariableBuilder> get variables => _variables ?? const <UnlinkedVariable>[];
 
   /**
    * Top level variables declared in the compilation unit.
@@ -5382,7 +5382,7 @@ class UnlinkedVariableBuilder extends Object with _UnlinkedVariableMixin impleme
   }
 
   @override
-  UnlinkedDocumentationComment get documentationComment => _documentationComment;
+  UnlinkedDocumentationCommentBuilder get documentationComment => _documentationComment;
 
   /**
    * Documentation comment for the variable, or `null` if there is no
@@ -5394,7 +5394,7 @@ class UnlinkedVariableBuilder extends Object with _UnlinkedVariableMixin impleme
   }
 
   @override
-  TypeRef get type => _type;
+  TypeRefBuilder get type => _type;
 
   /**
    * Declared type of the variable.  Note that when strong mode is enabled, the
@@ -5406,7 +5406,7 @@ class UnlinkedVariableBuilder extends Object with _UnlinkedVariableMixin impleme
   }
 
   @override
-  UnlinkedConst get constExpr => _constExpr;
+  UnlinkedConstBuilder get constExpr => _constExpr;
 
   /**
    * If [isConst] is true, and the variable has an initializer, the constant