Add type support to data-fix replacedBy.

Still missing extension type support.

Change-Id: Ida582e6f5832d2ee0a648f0aecb9e8c50c0ee8e1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/432982
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Morgan :) <[email protected]>
Commit-Queue: Lasse Nielsen <[email protected]>

Author: lrhn

pkg/_fe_analyzer_shared/lib/src/base/errors.dart

@@ -32,7 +32,7 @@ typedef ErrorType = DiagnosticType;
 @AnalyzerPublicApi(message: 'exported by package:analyzer/error/error.dart')
 abstract class DiagnosticCode {
   /// Regular expression for identifying positional arguments in error messages.
-  static final RegExp _positionalArgumentRegExp = new RegExp(r'{(\d+)\}');
+  static final RegExp _positionalArgumentRegExp = new RegExp(r'\{(\d+)\}');
 
   /**
    * The name of the error code.

pkg/analysis_server/lib/src/services/completion/yaml/fix_data_generator.dart

@@ -65,6 +65,7 @@ class FixDataGenerator extends YamlCompletionGenerator {
     'constructor': EmptyProducer(),
     'enum': EmptyProducer(),
     'extension': EmptyProducer(),
+    'extensionType': EmptyProducer(),
     'field': EmptyProducer(),
     'function': EmptyProducer(),
     'getter': EmptyProducer(),
@@ -76,6 +77,7 @@ class FixDataGenerator extends YamlCompletionGenerator {
     'inClass': EmptyProducer(),
     'inEnum': EmptyProducer(),
     'inExtension': EmptyProducer(),
+    'inExtensionType': EmptyProducer(),
     'inMixin': EmptyProducer(),
   });
 

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

@@ -47,19 +47,16 @@ class ElementDescriptor {
     // TODO(brianwilkerson): Check the resolved element, if one exists, for more
     //  accurate results.
     return switch (kind) {
-      ElementKind.classKind =>
-        // TODO(brianwilkerson): Handle this case.
-        false,
+      ElementKind.classKind => _matchesType(node),
       ElementKind.constantKind =>
         // TODO(brianwilkerson): Handle this case.
         false,
       ElementKind.constructorKind => _matchesConstructor(node),
-      ElementKind.enumKind =>
-        // TODO(brianwilkerson): Handle this case.
-        false,
+      ElementKind.enumKind => _matchesType(node),
       ElementKind.extensionKind =>
         // TODO(brianwilkerson): Handle this case.
         false,
+      ElementKind.extensionTypeKind => _matchesType(node),
       ElementKind.fieldKind =>
         // TODO(brianwilkerson): Handle this case.
         false,
@@ -68,15 +65,11 @@ class ElementDescriptor {
         // TODO(brianwilkerson): Handle this case.
         false,
       ElementKind.methodKind => _matchesMethod(node),
-      ElementKind.mixinKind =>
-        // TODO(brianwilkerson): Handle this case.
-        false,
+      ElementKind.mixinKind => _matchesType(node),
       ElementKind.setterKind =>
         // TODO(brianwilkerson): Handle this case.
         false,
-      ElementKind.typedefKind =>
-        // TODO(brianwilkerson): Handle this case.
-        false,
+      ElementKind.typedefKind => _matchesType(node),
       ElementKind.variableKind =>
         // TODO(brianwilkerson): Handle this case.
         false,
@@ -167,6 +160,22 @@ class ElementDescriptor {
     return false;
   }
 
+  bool _matchesType(AstNode node) {
+    if (components.length > 1) {
+      return false;
+    }
+    var name = components[0];
+    if (node is Identifier) {
+      // A plain or prefixed identifier with the correct name.
+      var typeName = _nameFromIdentifier(node);
+      return name == typeName;
+    }
+    if (node is NamedType) {
+      return name == node.name.lexeme;
+    }
+    return false;
+  }
+
   String _nameFromIdentifier(Identifier identifier) {
     if (identifier is SimpleIdentifier) {
       return identifier.name;

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

@@ -4,45 +4,29 @@
 
 /// An indication of the kind of an element.
 enum ElementKind {
-  classKind,
-  constantKind,
-  constructorKind,
-  enumKind,
-  extensionKind,
-  fieldKind,
-  functionKind,
-  getterKind,
-  methodKind,
-  mixinKind,
-  setterKind,
-  typedefKind,
-  variableKind,
-}
+  classKind('class'),
+  constantKind('constant'),
+  constructorKind('constructor'),
+  enumKind('enum'),
+  extensionKind('extension'),
+  extensionTypeKind('extensionType'),
+  fieldKind('field'),
+  functionKind('function'),
+  getterKind('getter'),
+  methodKind('method'),
+  mixinKind('mixin'),
+  setterKind('setter'),
+  typedefKind('typedef'),
+  variableKind('variable');
 
-extension ElementKindUtilities on ElementKind {
-  /// Return a human readable name for the kind.
-  String get displayName {
-    return switch (this) {
-      ElementKind.classKind => 'class',
-      ElementKind.constantKind => 'constant',
-      ElementKind.constructorKind => 'constructor',
-      ElementKind.enumKind => 'enum',
-      ElementKind.extensionKind => 'extension',
-      ElementKind.fieldKind => 'field',
-      ElementKind.functionKind => 'function',
-      ElementKind.getterKind => 'getter',
-      ElementKind.methodKind => 'method',
-      ElementKind.mixinKind => 'mixin',
-      ElementKind.setterKind => 'setter',
-      ElementKind.typedefKind => 'typedef',
-      ElementKind.variableKind => 'variable',
-    };
-  }
+  /// A human readable name for the kind.
+  final String displayName;
+  const ElementKind(this.displayName);
 
-  /// Return the element kind corresponding to the given [name].
+  /// The element kind corresponding to the given [name].
   static ElementKind? fromName(String name) {
-    for (var kind in ElementKind.values) {
-      if (kind.toString() == 'ElementKind.${name}Kind') {
+    for (var kind in values) {
+      if (kind.displayName == name) {
         return kind;
       }
     }

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

@@ -28,7 +28,7 @@ class ElementMatcher {
   final List<String> components;
 
   /// A list of the kinds of elements that are appropriate for some given
-  /// location in the code An empty list represents all kinds rather than no
+  /// location in the code. An empty list represents all kinds rather than no
   /// kinds.
   final List<ElementKind> validKinds;
 
@@ -291,12 +291,21 @@ class _MatcherBuilder {
     //  get a more exact matcher.
     // TODO(brianwilkerson): Use 'new' for the name of the unnamed constructor.
     var constructorName = node.name?.name ?? ''; // ?? 'new';
-    var className = node.type.name.lexeme;
+    var typeName = node.type.name.lexeme;
     _addMatcher(
-      components: [constructorName, className],
+      components: [constructorName, typeName],
       kinds: const [ElementKind.constructorKind],
     );
-    _addMatcher(components: [className], kinds: const [ElementKind.classKind]);
+    _addMatcher(
+      components: [typeName],
+      kinds: const [
+        ElementKind.classKind,
+        ElementKind.enumKind,
+        ElementKind.extensionTypeKind,
+        ElementKind.typedefKind,
+        ElementKind.mixinKind, // Can't *yet* have factory constructors.
+      ],
+    );
   }
 
   /// Build a matcher for the extension.
@@ -369,10 +378,14 @@ class _MatcherBuilder {
         kinds: [
           ElementKind.classKind,
           ElementKind.constructorKind,
+          ElementKind.enumKind,
           ElementKind.extensionKind,
+          ElementKind.extensionTypeKind,
           ElementKind.functionKind,
           ElementKind.getterKind,
           ElementKind.methodKind,
+          ElementKind.mixinKind,
+          ElementKind.typedefKind,
         ],
       );
     }
@@ -391,6 +404,7 @@ class _MatcherBuilder {
       kinds: const [
         ElementKind.classKind,
         ElementKind.enumKind,
+        ElementKind.extensionTypeKind,
         ElementKind.mixinKind,
         ElementKind.typedefKind,
       ],
@@ -413,20 +427,17 @@ class _MatcherBuilder {
     //  get a more exact matcher.
     var prefix = node.prefix;
     if (prefix.element is PrefixElement) {
-      var parent = node.parent;
-      if ((parent is NamedType && parent.parent is! ConstructorName) ||
-          (parent is PropertyAccess && parent.target == node)) {
-        _addMatcher(
-          components: [node.identifier.name],
-          kinds: const [
-            ElementKind.classKind,
-            ElementKind.enumKind,
-            ElementKind.extensionKind,
-            ElementKind.mixinKind,
-            ElementKind.typedefKind,
-          ],
-        );
-      }
+      _addMatcher(
+        components: [node.identifier.name],
+        kinds: const [
+          ElementKind.classKind,
+          ElementKind.enumKind,
+          ElementKind.extensionKind,
+          ElementKind.extensionTypeKind,
+          ElementKind.mixinKind,
+          ElementKind.typedefKind,
+        ],
+      );
       _addMatcher(
         components: [node.identifier.name],
         kinds: const [