Fix semantics of CompilationUnitElementForLink.types.

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

 // Copyright (c) 2016, 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 library is capable of producing linked summaries from unlinked
  * ones (or prelinked ones).  It functions by building a miniature
  * element model to represent the contents of the summaries, and then
  * scanning the element model to gather linked information and adding
  * it to the summary data structures.
@@ skipping 325 matching lines @@
    * summary.
    */
   final UnlinkedUnit _unlinkedUnit;
 
   /**
    * For each entry in [UnlinkedUnit.references], the element referred
    * to by the reference, or `null` if it hasn't been located yet.
    */
   final List<ReferenceableElementForLink> _references;
 
-  List<ClassElementForLink> _types;
+  List<ClassElementForLink_Class> _types;
   Map<String, ReferenceableElementForLink> _containedNames;
   List<TopLevelVariableElementForLink> _topLevelVariables;
+  List<ClassElementForLink_Enum> _enums;
 
   @override
   final LibraryElementForLink enclosingElement;
 
   CompilationUnitElementForLink(
       this.enclosingElement, UnlinkedUnit unlinkedUnit)
       : _references = new List<ReferenceableElementForLink>(
             unlinkedUnit.references.length),
         _unlinkedUnit = unlinkedUnit;
 
   @override
+  List<ClassElementForLink_Enum> get enums {
+    if (_enums == null) {
+      _enums = <ClassElementForLink_Enum>[];
+      for (UnlinkedEnum unlinkedEnum in _unlinkedUnit.enums) {
+        _enums.add(new ClassElementForLink_Enum(unlinkedEnum));
+      }
+    }
+    return _enums;
+  }
+
+  /**
+   * Indicates whether this compilation element is part of the build unit
+   * currently being linked.
+   */
   bool get isInBuildUnit;
 
   @override
   List<TopLevelVariableElementForLink> get topLevelVariables {
     if (_topLevelVariables == null) {
       _topLevelVariables = <TopLevelVariableElementForLink>[];
       for (UnlinkedVariable unlinkedVariable in _unlinkedUnit.variables) {
         _topLevelVariables
             .add(new TopLevelVariableElementForLink(this, unlinkedVariable));
       }
     }
     return _topLevelVariables;
   }
 
   @override
-  List<ClassElementForLink> get types {
+  List<ClassElementForLink_Class> get types {
     if (_types == null) {
-      _types = <ClassElementForLink>[];
+      _types = <ClassElementForLink_Class>[];
       for (UnlinkedClass unlinkedClass in _unlinkedUnit.classes) {
         _types.add(new ClassElementForLink_Class(this, unlinkedClass));
       }
-      for (UnlinkedEnum unlinkedEnum in _unlinkedUnit.enums) {
-        _types.add(new ClassElementForLink_Enum(unlinkedEnum));
-      }
     }
     return _types;
   }
 
   /**
    * The linked representation of the compilation unit in the summary.
    */
   LinkedUnit get _linkedUnit;
 
   /**
    * Search the unit for a top level element with the given [name].
    * If no name is found, return the singleton instance of
    * [UndefinedElementForLink].
    */
   ReferenceableElementForLink getContainedName(name) {
     if (_containedNames == null) {
       _containedNames = <String, ReferenceableElementForLink>{};
       // TODO(paulberry): what's the correct way to handle name conflicts?
-      for (ClassElementForLink type in types) {
+      for (ClassElementForLink_Class type in types) {
         _containedNames[type.name] = type;
       }
+      for (ClassElementForLink_Enum enm in enums) {
+        _containedNames[enm.name] = enm;
+      }
       for (TopLevelVariableElementForLink variable in topLevelVariables) {
         _containedNames[variable.name] = variable;
       }
       // TODO(paulberry): fill in other top level entities (typedefs
       // and executables).
     }
     return _containedNames.putIfAbsent(
         name, () => UndefinedElementForLink.instance);
   }
 
@@ skipping 1088 matching lines @@
 
   /**
    * Throw away any information produced by a previous call to [link].
    */
   void unlink() {
     for (LibraryElementInBuildUnit library in _librariesInBuildUnit) {
       library.unlink();
     }
   }
 }