Elements. Migrate RedeclareVerifier.

Change-Id: I7e8b6d4b22b1e657a1517932cc27265690f7b0cd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395142
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/analyzer_use_new_elements.txt

@@ -116,7 +116,6 @@ lib/src/error/literal_element_verifier.dart
 lib/src/error/must_call_super_verifier.dart
 lib/src/error/nullable_dereference_verifier.dart
 lib/src/error/override_verifier.dart
-lib/src/error/redeclare_verifier.dart
 lib/src/error/required_parameters_verifier.dart
 lib/src/error/super_formal_parameters_verifier.dart
 lib/src/error/type_arguments_verifier.dart

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

@@ -497,11 +497,12 @@ class LibraryAnalyzer {
       errorReporter,
     ));
 
-    unit.accept(RedeclareVerifier(
-      _inheritance,
-      _libraryElement,
-      errorReporter,
-    ));
+    unit.accept(
+      RedeclareVerifier(
+        _inheritance,
+        errorReporter,
+      ),
+    );
 
     TodoFinder(errorReporter).findIn(unit);
     LanguageVersionOverrideVerifier(errorReporter).verify(unit);

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

@@ -4,7 +4,7 @@
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-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/element/inheritance_manager3.dart';
 import 'package:analyzer/src/error/codes.dart';
@@ -16,22 +16,17 @@ class RedeclareVerifier extends RecursiveAstVisitor<void> {
   /// The inheritance manager used to find redeclared members.
   final InheritanceManager3 _inheritance;
 
-  /// The URI of the library being verified.
-  final Uri _libraryUri;
-
   /// The error reporter used to report errors.
   final ErrorReporter _errorReporter;
 
   /// The current extension type.
-  InterfaceElement? _currentExtensionType;
+  InterfaceElement2? _currentExtensionType;
 
-  RedeclareVerifier(
-      this._inheritance, LibraryElement library, this._errorReporter)
-      : _libraryUri = library.source.uri;
+  RedeclareVerifier(this._inheritance, this._errorReporter);
 
   @override
   void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
-    _currentExtensionType = node.declaredElement;
+    _currentExtensionType = node.declaredFragment!.element;
     super.visitExtensionTypeDeclaration(node);
     _currentExtensionType = null;
   }
@@ -41,49 +36,48 @@ class RedeclareVerifier extends RecursiveAstVisitor<void> {
     // Only check if we're in an extension type declaration.
     if (_currentExtensionType == null) return;
 
-    var element = node.declaredElement!;
+    var element = node.declaredFragment!.element;
 
     // Static members can't redeclare.
     if (element.isStatic) return;
 
-    if (element.hasRedeclare && !_redeclaresMember(element)) {
-      if (element is MethodElement) {
-        _errorReporter.atToken(
-          node.name,
-          WarningCode.REDECLARE_ON_NON_REDECLARING_MEMBER,
-          arguments: [
-            'method',
-          ],
-        );
-      } else if (element is PropertyAccessorElement) {
-        if (element.isGetter) {
+    if (element.metadata2.hasRedeclare && !_redeclaresMember(element)) {
+      switch (element) {
+        case MethodElement2():
+          _errorReporter.atToken(
+            node.name,
+            WarningCode.REDECLARE_ON_NON_REDECLARING_MEMBER,
+            arguments: [
+              'method',
+            ],
+          );
+        case GetterElement():
           _errorReporter.atToken(
             node.name,
             WarningCode.REDECLARE_ON_NON_REDECLARING_MEMBER,
             arguments: [
               'getter',
             ],
           );
-        } else {
+        case SetterElement():
           _errorReporter.atToken(
             node.name,
             WarningCode.REDECLARE_ON_NON_REDECLARING_MEMBER,
             arguments: [
               'setter',
             ],
           );
-        }
       }
     }
   }
 
   /// Return `true` if the [member] redeclares a member from a superinterface.
-  bool _redeclaresMember(ExecutableElement member) {
+  bool _redeclaresMember(ExecutableElement2 member) {
     var currentType = _currentExtensionType;
     if (currentType != null) {
-      var interface = _inheritance.getInterface(currentType);
-      var redeclared = interface.redeclared;
-      var name = Name(_libraryUri, member.name);
+      var interface = _inheritance.getInterface2(currentType);
+      var redeclared = interface.redeclared2;
+      var name = Name.forElement(member);
       return redeclared.containsKey(name);
     }
 

pkg/analyzer/test/src/diagnostics/redeclare_on_non_redeclaring_member_test.dart

@@ -100,6 +100,24 @@ extension type E(C c) implements C {
 ''');
   }
 
+  test_method_redeclared_private() async {
+    await assertErrorsInCode(r'''
+import 'package:meta/meta.dart';
+
+class A {
+  void _foo() {}
+}
+
+extension type E(A it) implements A {
+  @redeclare
+  void _foo() {}
+}
+''', [
+      error(WarningCode.UNUSED_ELEMENT, 51, 4),
+      error(WarningCode.UNUSED_ELEMENT, 122, 4),
+    ]);
+  }
+
   test_method_static() async {
     await assertErrorsInCode(r'''
 import 'package:meta/meta.dart';