Elements. Simplify InformativeDataApplier API.

Change-Id: I870ddc6e2e862e5a4cabb597ada27813383168d5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441401
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

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

@@ -217,10 +217,11 @@ class LibraryReader {
 
     _declareDartCoreDynamicNever();
 
-    InformativeDataApplier(
+    InformativeDataApplier().applyToLibrary(
       _elementFactory,
+      _libraryElement,
       _unitsInformativeBytes,
-    ).applyTo(_libraryElement);
+    );
 
     return _libraryElement;
   }

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

@@ -26,12 +26,44 @@ Uint8List writeUnitInformative(CompilationUnit unit) {
 }
 
 class InformativeDataApplier {
-  final LinkedElementFactory _elementFactory;
-  final Map<Uri, Uint8List> _unitsInformativeBytes2;
+  void applyFromNode(LibraryFragmentImpl fragment, CompilationUnit node) {
+    var unitInfo = _InfoBuilder().build(node);
+    _applyFromInfo(fragment, unitInfo);
 
-  InformativeDataApplier(this._elementFactory, this._unitsInformativeBytes2);
+    // TODO(scheglov): generalize
+    for (var classFragment in fragment.classes) {
+      classFragment.applyMembersConstantOffsets?.call();
+      classFragment.applyMembersConstantOffsets = null;
+    }
+  }
+
+  void applyToLibrary(
+    LinkedElementFactory elementFactory,
+    LibraryElementImpl libraryElement,
+    Map<Uri, Uint8List> unitsInformativeBytes,
+  ) {
+    if (elementFactory.isApplyingInformativeData) {
+      throw StateError('Unexpected recursion.');
+    }
+    elementFactory.isApplyingInformativeData = true;
 
-  void applyFromInfoUnit(LibraryFragmentImpl unitElement, _InfoUnit unitInfo) {
+    for (var unitElement in libraryElement.units) {
+      var uri = unitElement.source.uri;
+      if (unitsInformativeBytes[uri] case var infoBytes?) {
+        _applyFromBytes(unitElement, infoBytes);
+      }
+    }
+
+    elementFactory.isApplyingInformativeData = false;
+  }
+
+  void _applyFromBytes(LibraryFragmentImpl unitElement, Uint8List infoBytes) {
+    var unitReader = SummaryDataReader(infoBytes);
+    var unitInfo = _InfoUnit.read(unitReader);
+    _applyFromInfo(unitElement, unitInfo);
+  }
+
+  void _applyFromInfo(LibraryFragmentImpl unitElement, _InfoUnit unitInfo) {
     var libraryElement = unitElement.library;
     if (identical(libraryElement.definingCompilationUnit, unitElement)) {
       _applyToLibrary(libraryElement, unitInfo);
@@ -131,43 +163,6 @@ class InformativeDataApplier {
     );
   }
 
-  void applyFromUnit(LibraryFragmentImpl unitElement, CompilationUnit unit) {
-    var unitInfo = _InfoBuilder().build(unit);
-    applyFromInfoUnit(unitElement, unitInfo);
-
-    // TODO(scheglov): generalize
-    for (var classFragment in unitElement.classes) {
-      classFragment.applyMembersConstantOffsets?.call();
-      classFragment.applyMembersConstantOffsets = null;
-    }
-  }
-
-  void applyTo(LibraryElementImpl libraryElement) {
-    if (_elementFactory.isApplyingInformativeData) {
-      throw StateError('Unexpected recursion.');
-    }
-    _elementFactory.isApplyingInformativeData = true;
-
-    var unitElements = libraryElement.units;
-    for (var i = 0; i < unitElements.length; i++) {
-      var unitElement = unitElements[i];
-      var unitInfoBytes = _getInfoUnitBytes(unitElement);
-      if (unitInfoBytes != null) {
-        applyToUnit(unitElement, unitInfoBytes);
-      } else {
-        unitElement.lineInfo = LineInfo([0]);
-      }
-    }
-
-    _elementFactory.isApplyingInformativeData = false;
-  }
-
-  void applyToUnit(LibraryFragmentImpl unitElement, Uint8List unitInfoBytes) {
-    var unitReader = SummaryDataReader(unitInfoBytes);
-    var unitInfo = _InfoUnit.read(unitReader);
-    applyFromInfoUnit(unitElement, unitInfo);
-  }
-
   void _applyToAccessors(
     List<PropertyAccessorFragmentImpl> elementList,
     List<_InfoExecutableDeclaration> infoList,
@@ -617,11 +612,6 @@ class InformativeDataApplier {
     }
   }
 
-  Uint8List? _getInfoUnitBytes(LibraryFragmentImpl element) {
-    var uri = element.source.uri;
-    return _unitsInformativeBytes2[uri];
-  }
-
   void _setupApplyConstantOffsetsForTypeAlias(
     TypeAliasFragmentImpl element,
     Uint32List constantOffsets, {

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

@@ -199,12 +199,8 @@ class LibraryBuilder {
       parentChildFragments: _parentChildFragments,
     );
 
-    var informativeDataApplier = InformativeDataApplier(
-      linker.elementFactory,
-      {}, // No bytes from summary, we are building from source.
-    );
     for (var linkingUnit in units) {
-      informativeDataApplier.applyFromUnit(
+      InformativeDataApplier().applyFromNode(
         linkingUnit.element,
         linkingUnit.node,
       );