Elements. LibraryElementImpl extends ElementImpl2, not FragmentImpl.

Change-Id: Ibdadbd13238551b8ec70061bc0c24615831b1973
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/427305
Reviewed-by: Paul Berry <paulberry@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

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

@@ -5619,13 +5619,15 @@ class LabelFragmentImpl extends FragmentImpl implements LabelFragment {
 }
 
 /// A concrete implementation of [LibraryElement].
-class LibraryElementImpl extends FragmentImpl
-    with _HasLibraryMixin
-    implements LibraryElement {
-  /// The analysis context in which this library is defined.
-  @override
+class LibraryElementImpl extends ElementImpl2 implements LibraryElement {
   final AnalysisContext context;
 
+  @override
+  Reference? reference;
+
+  @override
+  String? documentationComment;
+
   @override
   AnalysisSessionImpl session;
 
@@ -5637,6 +5639,8 @@ class LibraryElementImpl extends FragmentImpl
 
   bool hasTypeProviderSystemSet = false;
 
+  List<ElementAnnotationImpl> _annotations = [];
+
   @override
   late TypeProviderImpl typeProvider;
 
@@ -5661,9 +5665,18 @@ class LibraryElementImpl extends FragmentImpl
   /// for this library.
   late final LoadLibraryFunctionProvider loadLibraryProvider;
 
-  @override
+  // TODO(scheglov): replace with `LibraryName` or something.
+  String name;
+
+  // TODO(scheglov): replace with `LibraryName` or something.
+  int nameOffset;
+
+  // TODO(scheglov): replace with `LibraryName` or something.
   int nameLength;
 
+  @override
+  bool isSynthetic = false;
+
   @override
   List<ClassElementImpl2> classes = [];
 
@@ -5713,12 +5726,20 @@ class LibraryElementImpl extends FragmentImpl
   LibraryElementImpl(
     this.context,
     this.session,
-    String name,
-    int offset,
+    this.name,
+    this.nameOffset,
     this.nameLength,
     this.featureSet,
-  ) : linkedData = null,
-      super(name, offset);
+  );
+
+  List<ElementAnnotationImpl> get annotations {
+    linkedData?.read(this);
+    return _annotations;
+  }
+
+  set annotations(List<ElementAnnotationImpl> value) {
+    _annotations = value;
+  }
 
   @override
   LibraryElementImpl get baseElement => this;
@@ -5746,14 +5767,6 @@ class LibraryElementImpl extends FragmentImpl
   @override
   Null get enclosingElement2 => enclosingElement;
 
-  @override
-  Null get enclosingElement3 => null;
-
-  @override
-  LibraryFragmentImpl get enclosingUnit {
-    return definingCompilationUnit;
-  }
-
   @override
   TopLevelFunctionElementImpl? get entryPoint2 {
     linkedData?.read(this);
@@ -5876,9 +5889,6 @@ class LibraryElementImpl extends FragmentImpl
     _languageVersion = languageVersion;
   }
 
-  @override
-  LibraryElementImpl get library => this;
-
   @override
   LibraryElementImpl get library2 => this;
 
@@ -5895,14 +5905,10 @@ class LibraryElementImpl extends FragmentImpl
   String? get lookupName => null;
 
   @override
-  List<ElementAnnotationImpl> get metadata {
-    linkedData?.read(this);
-    return super.metadata;
+  MetadataImpl get metadata2 {
+    return MetadataImpl(annotations);
   }
 
-  @override
-  String get name => super.name!;
-
   @override
   String? get name3 => name;
 
@@ -5937,7 +5943,7 @@ class LibraryElementImpl extends FragmentImpl
     return SinceSdkVersionComputer().compute(this);
   }
 
-  @override
+  // TODO(scheglov): replace with `firstFragment.source`
   Source get source {
     return definingCompilationUnit.source;
   }

pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart

@@ -1020,7 +1020,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
     ++_libraryDirectiveIndex;
     var element = node.element2;
     if (element is LibraryElementImpl && _libraryDirectiveIndex == 1) {
-      _setOrCreateMetadataElements(element, node.metadata);
+      _setElementAnnotations(node.metadata, element.metadata2.annotations);
     }
 
     _withElementWalker(null, () {

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

@@ -229,7 +229,7 @@ class ConstructorElementLinkedData
 }
 
 /// Lazy reader of resolution information.
-abstract class ElementLinkedData<E extends FragmentImpl> {
+abstract class ElementLinkedData<E> {
   final Reference reference;
   final LibraryReader _libraryReader;
   final LibraryFragmentImpl unitElement;
@@ -247,8 +247,8 @@ abstract class ElementLinkedData<E extends FragmentImpl> {
   ) : _libraryReader = libraryReader,
       _offset = offset;
 
-  void read(FragmentImpl element) {
-    _clearLinkedDataOnRead(element as E);
+  void read(E element) {
+    _clearLinkedDataOnRead(element);
     if (_offset == -1) {
       return;
     }
@@ -508,7 +508,7 @@ class LibraryElementLinkedData extends ElementLinkedData<LibraryElementImpl> {
   }
 
   @override
-  void read(FragmentImpl element) {
+  void read(LibraryElementImpl element) {
     if (!_isLocked) {
       super.read(element);
     }
@@ -526,7 +526,7 @@ class LibraryElementLinkedData extends ElementLinkedData<LibraryElementImpl> {
 
   @override
   void _read(element, reader) {
-    element.metadata = reader._readAnnotationList(unitElement: unitElement);
+    element.annotations = reader._readAnnotationList(unitElement: unitElement);
 
     element.entryPoint2 = reader.readElement2() as TopLevelFunctionElementImpl?;
 
@@ -622,7 +622,6 @@ class LibraryReader {
       0,
       featureSet,
     );
-    _reference.element = _libraryElement;
     _reference.element2 = _libraryElement;
     _libraryElement.reference = _reference;
 

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

@@ -75,7 +75,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
       libraryElement.documentationComment = getCommentNodeRawText(
         libraryDirective.documentationComment,
       );
-      libraryElement.metadata = _buildAnnotations(libraryDirective.metadata);
+      libraryElement.annotations = _buildAnnotations(libraryDirective.metadata);
       return;
     }
 
@@ -105,7 +105,7 @@ class ElementBuilder extends ThrowingAstVisitor<void> {
           break;
       }
       if (firstDirectiveMetadata != null) {
-        libraryElement.metadata = firstDirectiveMetadata;
+        libraryElement.annotations = firstDirectiveMetadata;
       }
     }
   }

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

@@ -597,7 +597,7 @@ class InformativeDataApplier {
     var applyOffsets = ApplyConstantOffsets(info.libraryConstantOffsets, (
       applier,
     ) {
-      applier.applyToMetadata(element);
+      applier.applyToMetadataList(element.annotations);
     });
 
     var linkedData = element.linkedData;

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

@@ -757,7 +757,7 @@ class LibraryBuilder {
     );
     libraryElement.isSynthetic = !libraryFile.exists;
     libraryElement.languageVersion = libraryUnitNode.languageVersion;
-    _bindReference(libraryReference, libraryElement);
+    libraryElement.reference = libraryReference;
     libraryReference.element2 = libraryElement;
 
     var unitContainerRef = libraryReference.getChild('@fragment');

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

@@ -63,9 +63,9 @@ class LinkedElementFactory {
   @visibleForTesting
   List<Uri> get uriListWithLibraryElements {
     return rootReference.children
-        .map((reference) => reference.element)
+        .map((reference) => reference.element2)
         .whereType<LibraryElementImpl>()
-        .map((e) => e.source.uri)
+        .map((e) => e.uri)
         .toList();
   }
 
@@ -158,7 +158,7 @@ class LinkedElementFactory {
     // During linking we create libraries when typeProvider is not ready.
     // Update these libraries now, when typeProvider is ready.
     for (var reference in rootReference.children) {
-      var libraryElement = reference.element as LibraryElementImpl?;
+      var libraryElement = reference.element2 as LibraryElementImpl?;
       if (libraryElement != null && !libraryElement.hasTypeProviderSystemSet) {
         setLibraryTypeSystem(libraryElement);
       }
@@ -182,7 +182,8 @@ class LinkedElementFactory {
 
     if (reference.isLibrary) {
       var uri = uriCache.parse(reference.name);
-      return createLibraryElementForReading(uri);
+      createLibraryElementForReading(uri);
+      return null;
     }
 
     var parentRef = reference.parentNotContainer;
@@ -216,7 +217,10 @@ class LinkedElementFactory {
 
   LibraryElementImpl? libraryOfUri(Uri uri) {
     var reference = rootReference.getChild('$uri');
-    return elementOfReference(reference) as LibraryElementImpl?;
+    if (reference.element2 case LibraryElementImpl element) {
+      return element;
+    }
+    return createLibraryElementForReading(uri);
   }
 
   LibraryElementImpl libraryOfUri2(Uri uri) {
@@ -270,7 +274,7 @@ class LinkedElementFactory {
   void replaceAnalysisSession(AnalysisSessionImpl newSession) {
     analysisSession = newSession;
     for (var libraryReference in rootReference.children) {
-      var libraryElement = libraryReference.element;
+      var libraryElement = libraryReference.element2;
       if (libraryElement is LibraryElementImpl) {
         libraryElement.session = newSession;
       }

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

@@ -201,8 +201,6 @@ extension ElementOrNullExtension on FragmentImpl? {
       return self.element;
     } else if (self is LabelFragmentImpl) {
       return self.element2;
-    } else if (self is LibraryElementImpl) {
-      return self;
     } else if (self is LocalVariableFragmentImpl) {
       return self.element;
     } else if (self is NeverFragmentImpl) {

pkg/analyzer/test/src/summary/element_text.dart

@@ -213,20 +213,7 @@ abstract class _AbstractElementWriter {
     node.accept(_createAstPrinter());
   }
 
-  void _writeReference(FragmentImpl e) {
-    if (!configuration.withReferences) {
-      return;
-    }
-
-    if (e.reference case var reference?) {
-      _sink.writeIndentedLine(() {
-        _sink.write('reference: ');
-        _elementPrinter.writeReference(reference);
-      });
-    }
-  }
-
-  void _writeReference2(ElementImpl2 e) {
+  void _writeReference(ElementImpl2 e) {
     if (!configuration.withReferences) {
       return;
     }
@@ -254,7 +241,7 @@ class _Element2Writer extends _AbstractElementWriter {
 
     _sink.writelnWithIndent('library');
     _sink.withIndent(() {
-      _writeReference(e as FragmentImpl);
+      _writeReference(e);
 
       var name = e.name;
       if (name.isNotEmpty) {
@@ -1129,7 +1116,7 @@ class _Element2Writer extends _AbstractElementWriter {
     });
 
     _sink.withIndent(() {
-      _writeReference2(e);
+      _writeReference(e);
       _writeFragmentReference('firstFragment', e.firstFragment);
       _writeDocumentation(e.documentationComment);
       // _writeMetadata(e.metadata);
@@ -1412,7 +1399,7 @@ class _Element2Writer extends _AbstractElementWriter {
     });
 
     _sink.withIndent(() {
-      _writeReference2(e);
+      _writeReference(e);
       _writeFragmentReference('firstFragment', e.firstFragment);
       // _writeElementReference(e.enclosingElement2, label: 'enclosingElement2');
       if (e.hasEnclosingTypeParameterReference) {
@@ -1702,7 +1689,7 @@ class _Element2Writer extends _AbstractElementWriter {
     });
 
     _sink.withIndent(() {
-      _writeReference2(e);
+      _writeReference(e);
       _writeFragmentReference('firstFragment', e.firstFragment);
       _writeDocumentation(e.documentationComment);
       _writeMetadata(e.metadata2);
@@ -1800,7 +1787,7 @@ class _Element2Writer extends _AbstractElementWriter {
     // }
 
     _sink.withIndent(() {
-      _writeReference2(e);
+      _writeReference(e);
       _writeFragmentReference('firstFragment', e.firstFragment);
       _writeDocumentation(e.documentationComment);
       _writeMetadata(e.metadata2);