Elements. Update ElementDirective implementations to stop being fragments.

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

Author: scheglov

pkg/analysis_server/lib/src/services/correction/dart/merge_combinators.dart

@@ -95,7 +95,7 @@ class _MergeCombinators extends ResolvedCorrectionProducer {
     Map<String, Element> namespace;
     Namespace? originalNamespace;
     switch (directive) {
-      case ExportDirective(:LibraryExportElementImpl libraryExport):
+      case ExportDirective(:LibraryExportImpl libraryExport):
         element = libraryExport.exportedLibrary2;
         if (element is! LibraryElementImpl) {
           return;
@@ -154,7 +154,7 @@ class _MergeCombinators extends ResolvedCorrectionProducer {
     });
   }
 
-  Namespace _currentNamespace(LibraryExportElementImpl libraryExport) {
+  Namespace _currentNamespace(LibraryExportImpl libraryExport) {
     return namespaceBuilder.createExportNamespaceForDirective2(libraryExport);
   }
 

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

@@ -110,7 +110,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 457;
+  static const int DATA_VERSION = 458;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

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

@@ -788,7 +788,7 @@ class LibraryAnalyzer {
         );
       } else if (directive is LibraryDirectiveImpl) {
         if (fileKind == _library) {
-          directive.element = _libraryElement;
+          directive.element2 = _libraryElement;
         }
       } else if (directive is PartDirectiveImpl) {
         var index = partIndex++;
@@ -799,9 +799,6 @@ class LibraryAnalyzer {
           partElement: fileElement.parts[index],
           errorReporter: containerErrorReporter,
         );
-      } else if (directive is PartOfDirectiveImpl) {
-        // TODO(scheglov): this should be LibraryFragment.
-        directive.element = _libraryElement;
       }
     }
 
@@ -921,11 +918,11 @@ class LibraryAnalyzer {
 
   void _resolveLibraryExportDirective({
     required ExportDirectiveImpl directive,
-    required LibraryExportElementImpl element,
+    required LibraryExportImpl element,
     required LibraryExportState state,
     required ErrorReporter errorReporter,
   }) {
-    directive.element = element;
+    directive.libraryExport = element;
     _resolveUriConfigurations(
       configurationNodes: directive.configurations,
       configurationUris: state.uris.configurations,
@@ -976,11 +973,11 @@ class LibraryAnalyzer {
 
   void _resolveLibraryImportDirective({
     required ImportDirectiveImpl directive,
-    required LibraryImportElementImpl element,
+    required LibraryImportImpl element,
     required LibraryImportState state,
     required ErrorReporter errorReporter,
   }) {
-    directive.element = element;
+    directive.libraryImport = element;
     directive.prefix?.element = element.prefix2?.element;
     _resolveUriConfigurations(
       configurationNodes: directive.configurations,
@@ -997,10 +994,10 @@ class LibraryAnalyzer {
     required FileAnalysis enclosingFile,
     required PartDirectiveImpl? directive,
     required PartIncludeState partState,
-    required PartElementImpl partElement,
+    required PartIncludeImpl partElement,
     required ErrorReporter errorReporter,
   }) {
-    directive?.element = partElement;
+    directive?.partInclude = partElement;
 
     void reportOnDirectiveUri(
       DiagnosticCode diagnosticCode, {

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

@@ -466,11 +466,8 @@ class Search {
     LibraryImport import,
     SearchedFiles searchedFiles,
   ) async {
-    var legacyElement = import as LibraryImportElementImpl;
-    var legacyResults = await _searchReferences_Import(
-      legacyElement,
-      searchedFiles,
-    );
+    import as LibraryImportImpl;
+    var legacyResults = await _searchReferences_Import(import, searchedFiles);
 
     return legacyResults.map((match) {
       return LibraryFragmentSearchMatch(
@@ -836,16 +833,16 @@ class Search {
   }
 
   Future<List<SearchResult>> _searchReferences_Import(
-    LibraryImportElementImpl element,
+    LibraryImportImpl element,
     SearchedFiles searchedFiles,
   ) async {
-    String path = element.source.fullName;
+    String path = element.libraryFragment.source.fullName;
     if (!searchedFiles.add(path, this)) {
       return const <SearchResult>[];
     }
 
     List<SearchResult> results = <SearchResult>[];
-    LibraryElementImpl libraryElement = element.library;
+    LibraryElementImpl libraryElement = element.libraryFragment.element;
     for (var unitElement in libraryElement.units) {
       String unitPath = unitElement.source.fullName;
       var unitResult = await _driver.getResolvedUnit(unitPath);
@@ -874,8 +871,7 @@ class Search {
       if (unitResult is ResolvedUnitResultImpl) {
         var unit = unitResult.unit;
         for (var directive in unit.directives) {
-          if (directive is PartOfDirectiveImpl &&
-              directive.element == element) {
+          if (directive is PartOfDirectiveImpl) {
             var targetEntity = directive.libraryName ?? directive.uri;
             results.add(
               SearchResult._(

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -5522,8 +5522,6 @@ final class DefaultFormalParameterImpl extends FormalParameterImpl
 sealed class Directive implements AnnotatedNode {}
 
 sealed class DirectiveImpl extends AnnotatedNodeImpl implements Directive {
-  FragmentImpl? element;
-
   /// Initializes a newly create directive.
   ///
   /// Either or both of the [comment] and [metadata] can be `null` if the
@@ -6522,6 +6520,9 @@ final class ExportDirectiveImpl extends NamespaceDirectiveImpl
   @override
   final Token exportKeyword;
 
+  @override
+  LibraryExportImpl? libraryExport;
+
   /// Initializes a newly created export directive.
   ///
   /// Either or both of the [comment] and [metadata] can be `null` if the
@@ -6541,12 +6542,6 @@ final class ExportDirectiveImpl extends NamespaceDirectiveImpl
   @override
   Token get firstTokenAfterCommentAndMetadata => exportKeyword;
 
-  @experimental
-  @override
-  LibraryExportElementImpl? get libraryExport {
-    return element as LibraryExportElementImpl?;
-  }
-
   @override
   ChildEntities get _childEntities =>
       super._childEntities
@@ -10817,6 +10812,9 @@ final class ImportDirectiveImpl extends NamespaceDirectiveImpl
 
   SimpleIdentifierImpl? _prefix;
 
+  @override
+  LibraryImportImpl? libraryImport;
+
   /// Initializes a newly created import directive.
   ///
   /// Either or both of the [comment] and [metadata] can be `null` if the
@@ -10846,12 +10844,6 @@ final class ImportDirectiveImpl extends NamespaceDirectiveImpl
   @override
   Token get firstTokenAfterCommentAndMetadata => importKeyword;
 
-  @experimental
-  @override
-  LibraryImportElementImpl? get libraryImport {
-    return element as LibraryImportElementImpl?;
-  }
-
   @override
   SimpleIdentifierImpl? get prefix => _prefix;
 
@@ -12078,6 +12070,9 @@ final class LibraryDirectiveImpl extends DirectiveImpl
   @override
   final Token semicolon;
 
+  @override
+  LibraryElementImpl? element2;
+
   /// Initializes a newly created library directive.
   ///
   /// Either or both of the [comment] and [metadata] can be `null` if the
@@ -12092,10 +12087,6 @@ final class LibraryDirectiveImpl extends DirectiveImpl
     _becomeParentOf(_name);
   }
 
-  @experimental
-  @override
-  LibraryElementImpl? get element2 => element as LibraryElementImpl?;
-
   @override
   Token get endToken => semicolon;
 
@@ -14963,6 +14954,9 @@ final class PartDirectiveImpl extends UriBasedDirectiveImpl
   @override
   final Token semicolon;
 
+  @override
+  PartIncludeImpl? partInclude;
+
   /// Initializes a newly created part directive.
   ///
   /// Either or both of the [comment] and [metadata] can be `null` if the
@@ -14984,10 +14978,6 @@ final class PartDirectiveImpl extends UriBasedDirectiveImpl
   @override
   Token get firstTokenAfterCommentAndMetadata => partKeyword;
 
-  @experimental
-  @override
-  PartElementImpl? get partInclude => element as PartElementImpl?;
-
   @override
   ChildEntities get _childEntities =>
       super._childEntities

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

@@ -135,11 +135,6 @@ class ElementDisplayStringBuilder {
     }
   }
 
-  void writeExportElement(LibraryExportElementImpl element) {
-    _write('export ');
-    _writeDirectiveUri(element.uri);
-  }
-
   void writeExtensionElement(ExtensionFragmentImpl element) {
     if (element.isAugmentation) {
       _write('augment ');
@@ -210,11 +205,6 @@ class ElementDisplayStringBuilder {
     _writeFormalParameters(element.parameters, forElement: true);
   }
 
-  void writeImportElement(LibraryImportElementImpl element) {
-    _write('import ');
-    _writeDirectiveUri(element.uri);
-  }
-
   void writeInterfaceType(InterfaceType type) {
     if (_maybeWriteTypeAlias(type)) {
       return;
@@ -234,6 +224,16 @@ class ElementDisplayStringBuilder {
     _write('${element.source.uri}');
   }
 
+  void writeLibraryExport(LibraryExportImpl element) {
+    _write('export ');
+    _writeDirectiveUri(element.uri);
+  }
+
+  void writeLibraryImport(LibraryImportImpl element) {
+    _write('import ');
+    _writeDirectiveUri(element.uri);
+  }
+
   void writeMixinElement(MixinFragmentImpl element) {
     if (element.isAugmentation) {
       _write('augment ');
@@ -253,7 +253,7 @@ class ElementDisplayStringBuilder {
     _writeNullability(type.nullabilitySuffix);
   }
 
-  void writePartElement(PartElementImpl element) {
+  void writePartInclude(PartIncludeImpl element) {
     _write('part ');
     _writeDirectiveUri(element.uri);
   }
@@ -649,7 +649,7 @@ class ElementDisplayStringBuilder {
 
 enum _WriteFormalParameterKind { requiredPositional, optionalPositional, named }
 
-extension on LibraryImportElementImpl {
+extension on LibraryImportImpl {
   String get libraryName {
     if (uri case DirectiveUriWithRelativeUriString uri) {
       return uri.relativeUriString;