Elements. Migrate ImportsVerifier.

Change-Id: I5dcab58f5b21436a43fdd169568334639626b6d3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/407120
Reviewed-by: Brian Wilkerson <[email protected]>

Author: scheglov

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

@@ -134,6 +134,16 @@ class ImportsTracking {
     return trackerOf(import).importToUsedElements[import] ?? {};
   }
 
+  /// The elements that are used from [import].
+  Set<Element2> elementsOf2(LibraryImportElementImpl import) {
+    return trackerOf(import)
+            .importToUsedElements[import]
+            ?.map((e) => e.asElement2)
+            .nonNulls
+            .toSet() ??
+        {};
+  }
+
   void notifyExtensionUsed(ExtensionElement element) {
     for (var tracking in map.values) {
       tracking.notifyExtensionUsed(element);
@@ -177,17 +187,22 @@ class ImportsTrackingOfPrefix {
     _buildElementToImportsMap();
   }
 
+  Map<LibraryImportElementImpl, Set<Element2>> get importToUsedElements2 {
+    return importToUsedElements.mapValue(
+        (elements) => elements.map((e) => e.asElement2).nonNulls.toSet());
+  }
+
   /// The elements that are used from [import].
   Set<Element> elementsOf(LibraryImportElementImpl import) {
     return importToUsedElements[import] ?? {};
   }
 
   /// The subset of [elementsOf], excludes elements that are from deprecated
   /// exports inside the imported library.
-  Set<Element> elementsOf2(LibraryImportElementImpl import) {
+  Set<Element2> elementsOf2(LibraryImportElementImpl import) {
     var result = importToAccessedElements2[import];
     if (result != null) {
-      return result;
+      return result.map((e) => e.asElement2).nonNulls.toSet();
     }
 
     var accessedElements = elementsOf(import);
@@ -216,7 +231,8 @@ class ImportsTrackingOfPrefix {
     }
 
     result ??= accessedElements;
-    return importToAccessedElements2[import] = result;
+    importToAccessedElements2[import] = result;
+    return result.map((e) => e.asElement2).nonNulls.toSet();
   }
 
   void lookupResult(Element? element) {

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

@@ -2,9 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
-
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/analysis/file_analysis.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
@@ -80,7 +78,7 @@ class ImportsVerifier {
           ),
         );
       } else if (directive is ExportDirective) {
-        var libraryElement = directive.element?.exportedLibrary;
+        var libraryElement = directive.libraryExport?.exportedLibrary2;
         if (libraryElement == null) {
           continue;
         }
@@ -262,7 +260,8 @@ class ImportsVerifier {
             continue;
           }
 
-          var isUsed = tracking.importToUsedElements.containsKey(importElement);
+          var isUsed =
+              tracking.importToUsedElements2.containsKey(importElement);
           if (!isUsed) {
             _unusedImports.add(importDirective);
             errorReporter.atNode(
@@ -309,14 +308,14 @@ class ImportsVerifier {
       for (var combinator in importDirective.combinators) {
         if (combinator is ShowCombinatorImpl) {
           for (var identifier in combinator.shownNames) {
-            var element = identifier.staticElement;
+            var element = identifier.element;
             if (element != null) {
-              var importElements = importsTracking.elementsOf(importElement);
+              var importElements = importsTracking.elementsOf2(importElement);
 
               var isUsed = importElements.contains(element);
-              if (element is PropertyInducingElement) {
-                isUsed = importElements.contains(element.getter) ||
-                    importElements.contains(element.setter);
+              if (element is PropertyInducingElement2) {
+                isUsed = importElements.contains(element.getter2) ||
+                    importElements.contains(element.setter2);
               }
 
               if (!isUsed) {
@@ -338,10 +337,10 @@ class ImportsVerifier {
   void _addDuplicateShownHiddenNames(NamespaceDirective directive) {
     for (var combinator in directive.combinators) {
       // Use a Set to find duplicates in faster than O(n^2) time.
-      var identifiers = <Element>{};
+      var identifiers = <Element2>{};
       if (combinator is HideCombinator) {
         for (var name in combinator.hiddenNames) {
-          var element = name.staticElement;
+          var element = name.element;
           if (element != null) {
             if (!identifiers.add(element)) {
               // [name] is a duplicate.
@@ -353,7 +352,7 @@ class ImportsVerifier {
         }
       } else if (combinator is ShowCombinator) {
         for (var name in combinator.shownNames) {
-          var element = name.staticElement;
+          var element = name.element;
           if (element != null) {
             if (!identifiers.add(element)) {
               // [name] is a duplicate.
@@ -400,16 +399,16 @@ class ImportsVerifier {
   }
 }
 
-/// [NamespaceDirective] with non-null imported or exported [LibraryElement].
+/// [NamespaceDirective] with non-null imported or exported [LibraryElement2].
 class _NamespaceDirective {
   final NamespaceDirective node;
-  final LibraryElement library;
+  final LibraryElement2 library;
 
   _NamespaceDirective({
     required this.node,
     required this.library,
   });
 
   /// Returns the absolute URI of the library.
-  String get libraryUriStr => '${library.source.uri}';
+  String get libraryUriStr => '${library.uri}';
 }