[element model] migrate annotate_redeclares

Bug: https://github.com/dart-lang/linter/issues/5099
Change-Id: I7ca6a306d973080a486660a0ace8e1a5b9f50d8d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392760
Auto-Submit: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: pq

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

@@ -745,6 +745,7 @@ class InheritanceManager3 {
       noSuchMethodForwarders: noSuchMethodForwarders,
       overridden: namedCandidates,
       redeclared: const {},
+      redeclared2: const {},
       superImplemented: superImplemented,
       conflicts: conflicts.toFixedList(),
     );
@@ -918,13 +919,30 @@ class InheritanceManager3 {
       }
     }
 
+    var uniqueRedeclared2 = <Name, List<ExecutableElement2>>{};
+    for (var entry in redeclared.entries) {
+      var name = entry.key;
+      var fragments =
+          entry.value.map((fragment) => fragment.asExecutableElement2);
+      if (fragments.length == 1) {
+        uniqueRedeclared2[name] = fragments.toFixedList();
+      } else {
+        var uniqueElements = <ExecutableElement2>{};
+        for (var fragment in fragments) {
+          uniqueElements.add(fragment);
+        }
+        uniqueRedeclared2[name] = uniqueElements.toFixedList();
+      }
+    }
+
     return Interface._(
       map: implemented,
       declared: declared,
       implemented: implemented,
       noSuchMethodForwarders: const {},
       overridden: const {},
       redeclared: uniqueRedeclared,
+      redeclared2: uniqueRedeclared2,
       superImplemented: const [],
       conflicts: conflicts.toFixedList(),
     );
@@ -983,6 +1001,7 @@ class InheritanceManager3 {
       noSuchMethodForwarders: {},
       overridden: interfaceCandidates,
       redeclared: const {},
+      redeclared2: const {},
       superImplemented: [superInterface],
       conflicts: <Conflict>[
         ...superConflicts,
@@ -1201,6 +1220,7 @@ class Interface {
     noSuchMethodForwarders: <Name>{},
     overridden: const {},
     redeclared: const {},
+    redeclared2: const {},
     superImplemented: const [{}],
     conflicts: const [],
   );
@@ -1225,6 +1245,10 @@ class Interface {
   /// declaration in this extension type redeclares.
   final Map<Name, List<ExecutableElement>> redeclared;
 
+  /// The map of names to the signatures from superinterfaces that a member
+  /// declaration in this extension type redeclares.
+  final Map<Name, List<ExecutableElement2>> redeclared2;
+
   /// Each item of this list maps names to their concrete implementations.
   /// The first item of the list is the nominal superclass, next the nominal
   /// superclass plus the first mixin, etc. So, for the class like
@@ -1247,6 +1271,7 @@ class Interface {
     required this.noSuchMethodForwarders,
     required this.overridden,
     required this.redeclared,
+    required this.redeclared2,
     required this.superImplemented,
     required this.conflicts,
   });
@@ -1412,3 +1437,11 @@ class _ParameterDesc {
         other.name == name;
   }
 }
+
+extension on ExecutableElement {
+  ExecutableElement2 get asExecutableElement2 => switch (this) {
+        ExecutableFragment(:var element) => element,
+        ExecutableMember member => member,
+        _ => throw UnsupportedError('Unsupported type: $runtimeType'),
+      };
+}

pkg/linter/analyzer_use_new_elements.txt

@@ -11,6 +11,7 @@ lib/src/rules/always_require_non_null_named_parameters.dart
 lib/src/rules/always_specify_types.dart
 lib/src/rules/always_use_package_imports.dart
 lib/src/rules/annotate_overrides.dart
+lib/src/rules/annotate_redeclares.dart
 lib/src/rules/avoid_annotating_with_dynamic.dart
 lib/src/rules/avoid_as.dart
 lib/src/rules/avoid_bool_literals_in_conditional_expressions.dart
@@ -24,7 +25,9 @@ lib/src/rules/avoid_equals_and_hash_code_on_mutable_classes.dart
 lib/src/rules/avoid_escaping_inner_quotes.dart
 lib/src/rules/avoid_final_parameters.dart
 lib/src/rules/avoid_function_literals_in_foreach_calls.dart
+lib/src/rules/avoid_futureor_void.dart
 lib/src/rules/avoid_implementing_value_types.dart
+lib/src/rules/avoid_init_to_null.dart
 lib/src/rules/avoid_js_rounded_ints.dart
 lib/src/rules/avoid_multiple_declarations_per_line.dart
 lib/src/rules/avoid_null_checks_in_equality_operators.dart

pkg/linter/lib/src/rules/annotate_redeclares.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 '../analyzer.dart';
 
@@ -46,11 +46,11 @@ class _Visitor extends SimpleAstVisitor<void> {
     // Shouldn't happen.
     if (parent is! ExtensionTypeDeclaration) return;
 
-    var element = node.declaredElement;
-    if (element == null || element.hasRedeclare) return;
+    var element = node.declaredFragment?.element;
+    if (element == null || element.metadata2.hasRedeclare) return;
 
-    var parentElement = parent.declaredElement;
-    var extensionType = parentElement?.augmented.firstFragment;
+    var parentElement = parent.declaredFragment?.element;
+    var extensionType = parentElement?.firstFragment.element;
     if (extensionType == null) return;
 
     if (_redeclaresMember(element, extensionType)) {
@@ -60,10 +60,12 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   /// Return `true` if the [member] redeclares a member from a superinterface.
   bool _redeclaresMember(
-      ExecutableElement member, InterfaceElement extensionType) {
+      ExecutableElement2 member, InterfaceElement2 extensionType) {
     // TODO(pq): unify with similar logic in `redeclare_verifier` and move to inheritanceManager
-    var uri = member.library.source.uri;
-    var interface = context.inheritanceManager.getInterface(extensionType);
-    return interface.redeclared.containsKey(Name(uri, member.name));
+    var interface = context.inheritanceManager.getInterface2(extensionType);
+    var memberName = member.name3;
+    return memberName != null &&
+        interface.redeclared2
+            .containsKey(Name.forLibrary(member.library2, memberName));
   }
 }

pkg/linter/test/rules/annotate_redeclares_test.dart

@@ -40,7 +40,6 @@ extension type E(A a) implements A {
     ]);
   }
 
-  @FailingTest(reason: 'No check that `m` is an augmentation?')
   test_augmentationMethodWithAnnotation() async {
     newFile('$testPackageLibPath/a.dart', r'''
 part 'test.dart';