Elements. Remove LibraryElement.topLevelElements and units.

Change-Id: Idf7375b646f26d89cdc82620aa3ab4274aac1351
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449368
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -629,7 +629,7 @@ class AnalysisDriver {
 
         packageBundleBuilder.addLibrary(
           uriStr,
-          libraryElement.units.map((e) {
+          libraryElement.fragments.map((e) {
             return e.source.uri.toString();
           }).toList(),
         );

pkg/analyzer/lib/src/dart/analysis/search.dart

@@ -378,7 +378,7 @@ class Search {
     Element element,
   ) async {
     var prefixes = <String>{};
-    for (var unit in library.units) {
+    for (var unit in library.fragments) {
       var index = await _driver.getIndex(unit.source.fullName);
       if (index != null) {
         _IndexRequest request = _IndexRequest(index);
@@ -846,7 +846,7 @@ class Search {
 
     List<SearchResult> results = <SearchResult>[];
     LibraryElementImpl libraryElement = element.libraryFragment.element;
-    for (var unitElement in libraryElement.units) {
+    for (var unitElement in libraryElement.fragments) {
       String unitPath = unitElement.source.fullName;
       var unitResult = await _driver.getResolvedUnit(unitPath);
       if (unitResult is ResolvedUnitResult) {
@@ -868,7 +868,7 @@ class Search {
     }
 
     List<SearchResult> results = <SearchResult>[];
-    for (var unitElement in element.units) {
+    for (var unitElement in element.fragments) {
       String unitPath = unitElement.source.fullName;
       var unitResult = await _driver.getResolvedUnit(unitPath);
       if (unitResult is ResolvedUnitResultImpl) {
@@ -1005,7 +1005,7 @@ class Search {
 
     List<SearchResult> results = <SearchResult>[];
     var libraryElement = element.library;
-    for (var unitElement in libraryElement.units) {
+    for (var unitElement in libraryElement.fragments) {
       String unitPath = unitElement.source.fullName;
       var unitResult = await _driver.getResolvedUnit(unitPath);
       if (unitResult is ResolvedUnitResult) {

pkg/analyzer/lib/src/dart/element/element.dart

@@ -6296,20 +6296,6 @@ class LibraryElementImpl extends ElementImpl
     return _firstFragment.source;
   }
 
-  Iterable<FragmentImpl> get topLevelElements sync* {
-    for (var unit in units) {
-      yield* unit.accessors;
-      yield* unit.classes;
-      yield* unit.enums;
-      yield* unit.extensions;
-      yield* unit.extensionTypes;
-      yield* unit.functions;
-      yield* unit.mixins;
-      yield* unit.topLevelVariables;
-      yield* unit.typeAliases;
-    }
-  }
-
   @override
   @trackedDirectlyExpensive
   List<TopLevelFunctionElementImpl> get topLevelFunctions {
@@ -6347,14 +6333,6 @@ class LibraryElementImpl extends ElementImpl
     _typeAliases = value;
   }
 
-  /// The compilation units this library consists of.
-  ///
-  /// This includes the defining compilation unit and units included using the
-  /// `part` directive.
-  List<LibraryFragmentImpl> get units {
-    return [_firstFragment, ..._partUnits];
-  }
-
   @override
   @trackedIncludedInId
   Uri get uri => _firstFragment.source.uri;
@@ -6641,7 +6619,7 @@ class LibraryElementImpl extends ElementImpl
   @trackedInternal
   void resetScope() {
     _libraryDeclarations = null;
-    for (var fragment in units) {
+    for (var fragment in fragments) {
       fragment._scope = null;
     }
   }
@@ -7009,9 +6987,9 @@ class LibraryFragmentImpl extends FragmentImpl
 
   @override
   LibraryFragment? get nextFragment {
-    var units = library.units;
-    var index = units.indexOf(this);
-    return units.elementAtOrNull(index + 1);
+    var fragments = library.fragments;
+    var index = fragments.indexOf(this);
+    return fragments.elementAtOrNull(index + 1);
   }
 
   @override
@@ -7050,10 +7028,10 @@ class LibraryFragmentImpl extends FragmentImpl
 
   @override
   LibraryFragment? get previousFragment {
-    var units = library.units;
-    var index = units.indexOf(this);
+    var fragments = library.fragments;
+    var index = fragments.indexOf(this);
     if (index >= 1) {
-      return units[index - 1];
+      return fragments[index - 1];
     }
     return null;
   }

pkg/analyzer/lib/src/summary2/export.dart

@@ -90,7 +90,7 @@ class ExportLocation {
   }
 
   LibraryExportImpl exportOf(LibraryElementImpl library) {
-    var fragment = library.units[fragmentIndex];
+    var fragment = library.fragments[fragmentIndex];
     return fragment.libraryExports[exportIndex];
   }
 

pkg/analyzer/lib/src/summary2/informative_data.dart

@@ -44,7 +44,7 @@ class InformativeDataApplier {
     }
     elementFactory.isApplyingInformativeData = true;
 
-    for (var unitElement in libraryElement.units) {
+    for (var unitElement in libraryElement.fragments) {
       var uri = unitElement.source.uri;
       if (unitsInformativeBytes[uri] case var infoBytes?) {
         _applyFromBytes(unitElement, infoBytes);

pkg/analyzer/lib/src/summary2/library_builder.dart

@@ -106,7 +106,7 @@ class LibraryBuilder {
   }
 
   void addExporters() {
-    for (var (fragmentIndex, fragment) in element.units.indexed) {
+    for (var (fragmentIndex, fragment) in element.fragments.indexed) {
       for (var (exportIndex, exportElement)
           in fragment.libraryExports.indexed) {
         var exportedLibrary = exportElement.exportedLibrary;
@@ -220,37 +220,32 @@ class LibraryBuilder {
   }
 
   void buildEnumSyntheticConstructors() {
-    bool hasConstructor(EnumFragmentImpl fragment) {
-      for (var constructor in fragment.element.constructors) {
+    bool hasConstructor(EnumElementImpl enumElement) {
+      for (var constructor in enumElement.constructors) {
         if (constructor.isGenerative || constructor.name == 'new') {
           return true;
         }
       }
       return false;
     }
 
-    for (var enumFragment in element.topLevelElements) {
-      if (enumFragment is! EnumFragmentImpl) continue;
-      if (hasConstructor(enumFragment)) continue;
+    for (var enumElement in element.enums) {
+      if (hasConstructor(enumElement)) continue;
 
-      var fragment = ConstructorFragmentImpl(name: 'new')
+      var constructorFragment = ConstructorFragmentImpl(name: 'new')
         ..isConst = true
-        ..isSynthetic = true;
-      fragment.typeName = enumFragment.name;
+        ..isSynthetic = true
+        ..typeName = enumElement.name;
+      enumElement.firstFragment.addConstructor(constructorFragment);
 
-      var element = ConstructorElementImpl(
-        name: fragment.name,
-        reference: enumFragment.element.reference
+      var constructorElement = ConstructorElementImpl(
+        name: constructorFragment.name,
+        reference: enumElement.reference
             .getChild('@constructor')
             .addChild('new'),
-        firstFragment: fragment,
+        firstFragment: constructorFragment,
       );
-      enumFragment.element.addConstructor(element);
-
-      enumFragment.constructors = [
-        ...enumFragment.constructors,
-        fragment,
-      ].toFixedList();
+      enumElement.addConstructor(constructorElement);
     }
   }
 
@@ -373,24 +368,23 @@ class LibraryBuilder {
   void setDefaultSupertypes() {
     var shouldResetClassHierarchies = false;
     var objectType = element.typeProvider.objectType;
-    for (var interfaceFragment in element.topLevelElements) {
-      switch (interfaceFragment) {
-        case ClassFragmentImpl():
-          var element = interfaceFragment.element;
-          if (!element.isDartCoreObject) {
-            if (element.supertype == null) {
-              shouldResetClassHierarchies = true;
-              element.supertype = objectType;
-            }
-          }
-        case MixinFragmentImpl():
-          var element = interfaceFragment.element;
-          if (element.superclassConstraints.isEmpty) {
-            shouldResetClassHierarchies = true;
-            element.superclassConstraints = [objectType];
-          }
+
+    for (var classElement in element.classes) {
+      if (!classElement.isDartCoreObject) {
+        if (classElement.supertype == null) {
+          shouldResetClassHierarchies = true;
+          classElement.supertype = objectType;
+        }
       }
     }
+
+    for (var mixinElement in element.mixins) {
+      if (mixinElement.superclassConstraints.isEmpty) {
+        shouldResetClassHierarchies = true;
+        mixinElement.superclassConstraints = [objectType];
+      }
+    }
+
     if (shouldResetClassHierarchies) {
       element.session.classHierarchy.removeOfLibraries({uri});
     }

pkg/analyzer/test/src/summary/elements/library_fragment_test.dart

@@ -1509,7 +1509,7 @@ package:test/a.dart
     for (var fragmentUri in fragmentUris) {
       sink.writelnWithIndent(fragmentUri);
       sink.withIndent(() {
-        var fragment = library.units.singleWhere((fragment) {
+        var fragment = library.fragments.singleWhere((fragment) {
           return fragment.source.uri == fragmentUri;
         });