DAS. For foo.name and foo.name() include ElementMatcher(s) for supertypes too.

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

Author: scheglov

pkg/analysis_server/lib/src/services/correction/fix/data_driven/element_matcher.dart

@@ -346,6 +346,28 @@ class _MatcherBuilder {
     //   return _buildFromElement(element);
     // }
     var methodName = node.methodName;
+
+    var targetType = node.realTarget?.staticType;
+    if (targetType is InterfaceType) {
+      // We can invoke both methods and constructors of the target type.
+      _addMatcher(
+        components: [methodName.name, targetType.element.name!],
+        kinds: const [ElementKind.constructorKind, ElementKind.methodKind],
+      );
+      // We can invoke methods of supertypes of the target type.
+      var superElements =
+          targetType.allSupertypes
+              .map((superType) => superType.element)
+              .toList();
+      for (var element in superElements) {
+        _addMatcher(
+          components: [methodName.name, element.name!],
+          kinds: const [ElementKind.methodKind],
+        );
+      }
+      return;
+    }
+
     var targetName = _nameOfTarget(node.realTarget);
     if (targetName != null) {
       // If there is a target, and we know the type of the target, then we know
@@ -455,17 +477,23 @@ class _MatcherBuilder {
     // name of the type defining the member.
     var targetType = node.prefix.staticType;
     if (targetType is InterfaceType) {
-      _addMatcher(
-        components: [node.identifier.name, targetType.element.name!],
-        kinds: const [
-          ElementKind.constantKind,
-          ElementKind.fieldKind,
-          ElementKind.functionKind, // tear-off
-          ElementKind.getterKind,
-          ElementKind.methodKind, // tear-off
-          ElementKind.setterKind,
-        ],
-      );
+      var elements = [
+        targetType.element,
+        ...targetType.allSupertypes.map((t) => t.element),
+      ];
+      for (var element in elements) {
+        _addMatcher(
+          components: [node.identifier.name, element.name!],
+          kinds: const [
+            ElementKind.constantKind,
+            ElementKind.fieldKind,
+            ElementKind.functionKind, // tear-off
+            ElementKind.getterKind,
+            ElementKind.methodKind, // tear-off
+            ElementKind.setterKind,
+          ],
+        );
+      }
     }
     // It looks like we're accessing a member, but we don't know what kind of
     // member, so we include all of the member kinds.

pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart

@@ -6,6 +6,7 @@ import 'package:analysis_server/src/services/correction/fix/data_driven/element_
 import 'package:analysis_server/src/services/correction/fix/data_driven/element_kind.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/element_matcher.dart';
 import 'package:analyzer/utilities/package_config_file_builder.dart';
+import 'package:collection/collection.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -19,6 +20,47 @@ void main() {
 }
 
 abstract class AbstractElementMatcherTest extends DataDrivenFixProcessorTest {
+  /// Assert that there is exactly one [ElementMatcher] for the node described
+  /// by [search] that satisfies `expectedXyz` requirements.
+  void _assertHasMatcher(
+    String search, {
+    List<String>? expectedComponents,
+    List<ElementKind>? expectedKinds,
+    List<String>? expectedUris,
+  }) {
+    var node = findNode.any(search);
+    var matchers = ElementMatcher.matchersForNode(node, node.beginToken);
+    var matchedMatchers = <ElementMatcher>[];
+    for (var matcher in matchers) {
+      if (expectedUris != null) {
+        if (!const UnorderedIterableEquality<Uri>().equals(
+          matcher.importedUris,
+          expectedUris.map((uri) => Uri.parse(uri)),
+        )) {
+          continue;
+        }
+      }
+      if (expectedComponents != null) {
+        if (!const ListEquality<String>().equals(
+          matcher.components,
+          expectedComponents,
+        )) {
+          continue;
+        }
+      }
+      if (expectedKinds != null) {
+        if (!const ListEquality<ElementKind>().equals(
+          matcher.validKinds,
+          expectedKinds,
+        )) {
+          continue;
+        }
+      }
+      matchedMatchers.add(matcher);
+    }
+    expect(matchedMatchers, hasLength(1));
+  }
+
   void _assertMatcher(
     String search, {
     List<String>? expectedComponents,
@@ -145,7 +187,7 @@ void f(String s) {
   s.length;
 }
 ''');
-    _assertMatcher(
+    _assertHasMatcher(
       'length',
       expectedComponents: ['length', 'String'],
       expectedKinds: accessorKinds,
@@ -158,7 +200,7 @@ void f(String s) {
   s.foo;
 }
 ''');
-    _assertMatcher(
+    _assertHasMatcher(
       'foo',
       expectedComponents: ['foo', 'String'],
       expectedKinds: accessorKinds,
@@ -245,7 +287,7 @@ void f(String s) {
   s.substring(2);
 }
 ''');
-    _assertMatcher(
+    _assertHasMatcher(
       'substring',
       expectedComponents: ['substring', 'String'],
       expectedKinds: methodKinds,
@@ -258,7 +300,7 @@ void f(String s) {
   s.foo(2);
 }
 ''');
-    _assertMatcher(
+    _assertHasMatcher(
       'foo',
       expectedComponents: ['foo', 'String'],
       expectedKinds: methodKinds,
@@ -297,7 +339,7 @@ class C {
   set s(String s) {}
 }
 ''');
-    _assertMatcher(
+    _assertHasMatcher(
       's =',
       expectedComponents: ['s', 'C'],
       expectedKinds: accessorKinds,
@@ -310,7 +352,7 @@ void f(String s) {
   s.foo = '';
 }
 ''');
-    _assertMatcher(
+    _assertHasMatcher(
       'foo',
       expectedComponents: ['foo', 'String'],
       expectedKinds: accessorKinds,

pkg/analysis_server/test/src/services/correction/fix/data_driven/rename_test.dart

@@ -1168,6 +1168,33 @@ void f(C c) {
 ''');
   }
 
+  Future<void> test_instance_reference_direct_deprecated_viaSubclass() async {
+    setPackageContent('''
+class A {
+  @deprecated
+  int get old => 0;
+  int get replacement => 1;
+}
+
+class B extends A {}
+''');
+    setPackageData(_rename(['old', 'A'], 'replacement'));
+    await resolveTestCode('''
+import '$importUri';
+
+void f(B b) {
+  b.old;
+}
+''');
+    await assertHasFix('''
+import '$importUri';
+
+void f(B b) {
+  b.replacement;
+}
+''');
+  }
+
   Future<void> test_instance_reference_direct_removed() async {
     setPackageContent('''
 class C {
@@ -1394,6 +1421,33 @@ void f(C c) {
 ''');
   }
 
+  Future<void> test_instance_reference_direct_deprecated_viaSubclass() async {
+    setPackageContent('''
+class A {
+  @deprecated
+  void old() {}
+  void replacement() {}
+}
+
+class B extends A {}
+''');
+    setPackageData(_rename(['old', 'A'], 'replacement'));
+    await resolveTestCode('''
+import '$importUri';
+
+void f(B b) {
+  b.old();
+}
+''');
+    await assertHasFix('''
+import '$importUri';
+
+void f(B b) {
+  b.replacement();
+}
+''');
+  }
+
   Future<void> test_instance_reference_removed() async {
     setPackageContent('''
 class C {