Elements. Migrate getExportedElement()

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

Author: scheglov

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

@@ -227,7 +227,7 @@ class ImportLibrary extends MultiCorrectionProducer {
       if (libraryElement == null) {
         continue;
       }
-      var element = getExportedElement2(libraryElement, name);
+      var element = getExportedElement(libraryElement, name);
       if (element == null) {
         continue;
       }

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

@@ -6,24 +6,14 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/resolver/scope.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
-/// Returns the [Element] exported from the given [LibraryElement].
-Element? getExportedElement(LibraryElement? library, String name) {
+/// Returns the [Element2] exported from the given [LibraryElement2].
+Element2? getExportedElement(LibraryElement2? library, String name) {
   if (library == null) {
     return null;
   }
-  return _getExportNamespaceForLibrary(library)[name];
-}
-
-/// Returns the [Element] exported from the given [LibraryElement].
-Element2? getExportedElement2(LibraryElement2? library, String name) {
-  if (library == null) {
-    return null;
-  }
-  return _getExportNamespaceForLibrary(
-    library as LibraryElement,
-  )[name].asElement2;
+  var namespace = NamespaceBuilder().createExportNamespaceForLibrary(library);
+  return namespace.definedNames2[name];
 }
 
 /// Return the [LibraryImportElement] that is referenced by [prefixNode], or
@@ -48,12 +38,6 @@ LibraryImport? getImportElement2(SimpleIdentifier prefixNode) {
   return _getImportElementInfo2(prefixNode);
 }
 
-/// Returns the export namespace of the given [LibraryElement].
-Map<String, Element> _getExportNamespaceForLibrary(LibraryElement library) {
-  var namespace = NamespaceBuilder().createExportNamespaceForLibrary(library);
-  return namespace.definedNames;
-}
-
 /// Return the [LibraryImportElement] that declared [prefix] and imports [element].
 ///
 /// [libraryElement] - the [LibraryElement] where reference is.

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

@@ -11,6 +11,7 @@ import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// The scope defined by a block.
 class BlockScope {
@@ -179,8 +180,8 @@ class NamespaceBuilder {
 
   /// Create a namespace representing the export namespace of the given
   /// [library].
-  Namespace createExportNamespaceForLibrary(LibraryElement library) {
-    Map<String, Element> exportedNames = _getExportMapping(library);
+  Namespace createExportNamespaceForLibrary(LibraryElement2 library) {
+    Map<String, Element> exportedNames = _getExportMapping(library.asElement);
     return Namespace(exportedNames);
   }
 

pkg/analyzer/lib/src/error/dead_code_verifier.dart

@@ -15,6 +15,7 @@ import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
 import 'package:analyzer/src/dart/resolver/scope.dart';
 import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 typedef _CatchClausesVerifierReporter = void Function(
   CatchClause first,
@@ -132,7 +133,7 @@ class DeadCodeVerifier extends RecursiveAstVisitor<void> {
   /// [library].
   void _checkCombinator(LibraryElement library, Combinator combinator) {
     Namespace namespace =
-        NamespaceBuilder().createExportNamespaceForLibrary(library);
+        NamespaceBuilder().createExportNamespaceForLibrary(library.asElement2);
     NodeList<SimpleIdentifier> names;
     ErrorCode warningCode;
     if (combinator is HideCombinator) {

pkg/analyzer/lib/src/generated/element_resolver.dart

@@ -14,6 +14,7 @@ import 'package:analyzer/src/dart/resolver/scope.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/super_context.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// An object used by instances of [ResolverVisitor] to resolve references
 /// within the AST structure to the elements being referenced. The requirements
@@ -468,7 +469,7 @@ class ElementResolver {
       return;
     }
     Namespace namespace =
-        NamespaceBuilder().createExportNamespaceForLibrary(library);
+        NamespaceBuilder().createExportNamespaceForLibrary(library.asElement2);
     for (Combinator combinator in combinators) {
       NodeList<SimpleIdentifier> names;
       if (combinator is HideCombinator) {