Migrate data-driven fix support

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

Author: bwilkerson

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -52,9 +52,6 @@ lib/src/services/correction/dart/add_extension_override.dart
 lib/src/services/correction/dart/create_extension_member.dart
 lib/src/services/correction/dart/import_library.dart
 lib/src/services/correction/dart/use_different_division_operator.dart
-lib/src/services/correction/fix/data_driven/element_matcher.dart
-lib/src/services/correction/fix/data_driven/rename_parameter.dart
-lib/src/services/correction/fix/data_driven/replaced_by.dart
 lib/src/services/correction/namespace.dart
 lib/src/services/correction/util.dart
 lib/src/services/flutter/class_description.dart
@@ -110,4 +107,3 @@ test/services/refactoring/legacy/rename_library_test.dart
 test/services/search/element_visitors_test.dart
 test/services/search/hierarchy_test.dart
 test/services/search/search_engine_test.dart
-tool/code_completion/try_hypothesis.dart

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

@@ -5,13 +5,15 @@
 import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/element_kind.dart';
 import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/dart/element/element.dart'
+import 'package:analyzer/dart/element/element2.dart'
     show
-        CompilationUnitElement,
-        ExtensionElement,
-        InterfaceElement,
-        PrefixElement,
-        PropertyAccessorElement;
+        LibraryElement2,
+        LibraryFragment,
+        ExtensionElement2,
+        GetterElement,
+        InterfaceElement2,
+        PrefixElement2,
+        SetterElement;
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 
@@ -47,7 +49,7 @@ class ElementMatcher {
   }) : assert(components.isNotEmpty),
        validKinds = kinds;
 
-  /// Return `true` if this matcher matches the given [element].
+  /// Returns `true` if this matcher matches the given [element].
   bool matches(ElementDescriptor element) {
     //
     // Check that the components in the element's name match the node.
@@ -90,11 +92,12 @@ class ElementMatcher {
           while (parent != null && parent.parent is! CompilationUnit) {
             parent = parent.parent;
           }
-          var element = (parent as CompilationUnitMember).declaredElement;
-          if (element is! InterfaceElement) {
+          var element =
+              (parent as CompilationUnitMember).declaredFragment?.element;
+          if (element is! InterfaceElement2) {
             return false;
           }
-          var types = element.allSupertypes.map((e) => e.element.name);
+          var types = element.allSupertypes.map((e) => e.element3.name3);
           for (var t in types) {
             if (elementComponents.contains(t)) {
               return true;
@@ -134,9 +137,11 @@ class ElementMatcher {
     return false;
   }
 
-  /// Return a list of element matchers that will match the element that is, or
-  /// should be, associated with the given [node]. The list will be empty if
-  /// there are no appropriate matchers for the [node].
+  /// Returns a list of element matchers that will match the element that is, or
+  /// should be, associated with the given [node].
+  ///
+  /// The list will be empty if there are no appropriate matchers for the
+  /// [node].
   static List<ElementMatcher> matchersForNode(AstNode? node, Token? nameToken) {
     if (node == null) {
       return const [];
@@ -150,26 +155,30 @@ class ElementMatcher {
     return builder.matchers.toList();
   }
 
-  /// Return the URIs of the imports in the library containing the [node], or
-  /// `null` if the imports can't be determined.
+  /// Returns the URIs of the imports in the library containing the [node].
+  ///
+  /// Returns `null` if the imports can't be determined.
   static List<Uri>? _importElementsForNode(AstNode node) {
     var root = node.root;
     if (root is! CompilationUnit) {
       return null;
     }
     var importedUris = <Uri>[];
-    var library = root.declaredElement?.library;
-    if (library == null) {
+    LibraryFragment? part = root.declaredFragment;
+    if (part == null) {
       return null;
     }
-    for (var importElement in library.definingCompilationUnit.libraryImports) {
-      // TODO(brianwilkerson): Filter based on combinators to help avoid making
-      //  invalid suggestions.
-      var uri = importElement.importedLibrary?.source.uri;
-      if (uri != null) {
-        // The [uri] is `null` if the literal string is not a valid URI.
-        importedUris.add(uri);
+    while (part != null) {
+      for (var libraryImport in part.libraryImports2) {
+        // TODO(brianwilkerson): Filter based on combinators to help avoid making
+        //  invalid suggestions.
+        var uri = libraryImport.importedLibrary2?.firstFragment.source.uri;
+        if (uri != null) {
+          // The [uri] is `null` if the literal string is not a valid URI.
+          importedUris.add(uri);
+        }
       }
+      part = part.enclosingFragment;
     }
     return importedUris;
   }
@@ -261,7 +270,7 @@ class _MatcherBuilder {
         );
       }
     } else if (parent is SuperConstructorInvocation) {
-      var superclassName = parent.staticElement?.enclosingElement3.name;
+      var superclassName = parent.element?.enclosingElement2.name3;
       if (superclassName != null) {
         _addMatcher(
           components: [parent.constructorName?.name ?? '', superclassName],
@@ -273,8 +282,8 @@ class _MatcherBuilder {
 
   /// Build a matcher for the operator being invoked.
   void _buildFromBinaryExpression(BinaryExpression node) {
-    // TODO(brianwilkerson): Implement this method in order to support changes to
-    //  operators.
+    // TODO(brianwilkerson): Implement this method in order to support changes
+    //  to operators.
   }
 
   /// Build a matcher for the constructor being referenced.
@@ -404,7 +413,7 @@ class _MatcherBuilder {
     // TODO(brianwilkerson): Use the static element, if there is one, in order to
     //  get a more exact matcher.
     var prefix = node.prefix;
-    if (prefix.staticElement is PrefixElement) {
+    if (prefix.element is PrefixElement2) {
       var parent = node.parent;
       if ((parent is NamedType && parent.parent is! ConstructorName) ||
           (parent is PropertyAccess && parent.target == node)) {
@@ -437,7 +446,7 @@ class _MatcherBuilder {
     var targetType = node.prefix.staticType;
     if (targetType is InterfaceType) {
       _addMatcher(
-        components: [node.identifier.name, targetType.element.name],
+        components: [node.identifier.name, targetType.element3.name3!],
         kinds: const [
           ElementKind.constantKind,
           ElementKind.fieldKind,
@@ -450,10 +459,10 @@ class _MatcherBuilder {
     }
     // 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.
-    var container = node.prefix.staticElement;
-    if (container is InterfaceElement) {
+    var container = node.prefix.element;
+    if (container is InterfaceElement2) {
       _addMatcher(
-        components: [node.identifier.name, container.name],
+        components: [node.identifier.name, container.name3!],
         kinds: const [
           ElementKind.constantKind,
           ElementKind.fieldKind,
@@ -463,7 +472,7 @@ class _MatcherBuilder {
           ElementKind.setterKind,
         ],
       );
-    } else if (container is ExtensionElement) {
+    } else if (container is ExtensionElement2) {
       _addMatcher(
         components: [node.identifier.name, container.displayName],
         kinds: const [
@@ -534,14 +543,14 @@ class _MatcherBuilder {
       if (node.staticType is InvalidType) {
         _addMatcher(components: [node.name], kinds: [], node: node);
       } else {
-        var staticElement = node.staticElement;
+        var element = node.element;
         // Add enclosing element to the matcher for non top level property
         // accessors when possible.
-        if (staticElement is PropertyAccessorElement) {
-          var enclosingElement = staticElement.enclosingElement3;
-          if (enclosingElement is! CompilationUnitElement) {
+        if (element is GetterElement || element is SetterElement) {
+          var enclosingElement = element?.enclosingElement2;
+          if (enclosingElement is! LibraryElement2) {
             _addMatcher(
-              components: [node.name, enclosingElement.displayName],
+              components: [node.name, (enclosingElement?.displayName)!],
               kinds: [],
             );
             return;
@@ -567,22 +576,22 @@ class _MatcherBuilder {
     }
   }
 
-  /// Return the components associated with the [identifier] when there is no
+  /// Returns the components associated with the [identifier] when there is no
   /// contextual information.
   static List<String> _componentsFromIdentifier(SimpleIdentifier identifier) {
-    var element = identifier.staticElement;
+    var element = identifier.element;
     if (element == null) {
       var parent = identifier.parent;
       if (parent is AssignmentExpression && identifier == parent.leftHandSide) {
-        element = parent.writeElement;
+        element = parent.writeElement2;
       }
     }
     if (element != null) {
-      var enclosingElement = element.enclosingElement3;
-      if (enclosingElement is InterfaceElement) {
-        return [identifier.name, enclosingElement.name];
-      } else if (enclosingElement is ExtensionElement) {
-        var name = enclosingElement.name;
+      var enclosingElement = element.enclosingElement2;
+      if (enclosingElement is InterfaceElement2) {
+        return [identifier.name, enclosingElement.name3!];
+      } else if (enclosingElement is ExtensionElement2) {
+        var name = enclosingElement.name3;
         if (name != null) {
           return [identifier.name, name];
         }
@@ -591,18 +600,18 @@ class _MatcherBuilder {
     return [identifier.name];
   }
 
-  /// Return `true` if the [node] is a prefix
+  /// Returns `true` if the [node] is a prefix.
   static bool _isPrefix(AstNode? node) {
-    return node is SimpleIdentifier && node.staticElement is PrefixElement;
+    return node is SimpleIdentifier && node.element is PrefixElement2;
   }
 
-  /// Return the name of the class associated with the given [target].
+  /// Returns the name of the class associated with the given [target].
   static String? _nameOfTarget(Expression? target) {
     if (target is SimpleIdentifier) {
       var type = target.staticType;
       if (type != null) {
         if (type is InterfaceType) {
-          return type.element.name;
+          return type.element3.name3;
         } else if (type is DynamicType) {
           // The name is likely to be undefined.
           return target.name;
@@ -613,7 +622,7 @@ class _MatcherBuilder {
     } else if (target != null) {
       var type = target.staticType;
       if (type is InterfaceType) {
-        return type.element.name;
+        return type.element3.name3;
       }
       return null;
     }

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

@@ -5,7 +5,7 @@
 import 'package:analysis_server/src/services/correction/dart/data_driven.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/change.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -33,7 +33,9 @@ class RenameParameter extends Change<_Data> {
       var declaration = data.methodDeclaration;
       var parameter = declaration.parameterNamed(oldName);
       if (parameter != null) {
-        var overriddenMethod = declaration.overriddenElement();
+        var overriddenMethod = declaration.overriddenElement(
+          fix.inheritanceManager,
+        );
         var overriddenParameter = overriddenMethod?.parameterNamed(oldName);
         if (overriddenParameter == null) {
           // If the overridden parameter has already been removed, then just
@@ -46,7 +48,7 @@ class RenameParameter extends Change<_Data> {
           // If the overridden parameter still exists, then mark the overriding
           // parameter as deprecated (if it isn't already and the overridden
           // parameter is) and add a declaration of the new parameter.
-          var parameterElement = parameter.declaredElement;
+          var parameterElement = parameter.declaredFragment?.element;
           if (parameterElement != null) {
             builder.addInsertion(parameter.offset, (builder) {
               builder.writeParameter(
@@ -56,8 +58,8 @@ class RenameParameter extends Change<_Data> {
                 type: parameterElement.type,
               );
               builder.write(', ');
-              if (overriddenParameter.hasDeprecated &&
-                  !parameterElement.hasDeprecated) {
+              if (overriddenParameter.metadata2.hasDeprecated &&
+                  !parameterElement.metadata2.hasDeprecated) {
                 builder.write('@deprecated ');
               }
             });
@@ -129,27 +131,34 @@ class _OverrideData extends _Data {
 }
 
 extension on MethodDeclaration {
-  /// Return the element that this method overrides, or `null` if this method
-  /// doesn't override any inherited member.
-  ExecutableElement? overriddenElement() {
-    var element = declaredElement;
+  /// Returns the element that this method overrides.
+  ///
+  /// Returns `null` if this method doesn't override any inherited member.
+  ExecutableElement2? overriddenElement(
+    InheritanceManager3 inheritanceManager,
+  ) {
+    var element = declaredFragment?.element;
     if (element != null) {
-      var enclosingElement = element.enclosingElement3;
-      if (enclosingElement is InterfaceElement) {
-        var name = Name(enclosingElement.library.source.uri, element.name);
-        return InheritanceManager3().getInherited2(enclosingElement, name);
+      var enclosingElement = element.enclosingElement2;
+      if (enclosingElement is InterfaceElement2) {
+        var name = Name(
+          enclosingElement.library2.firstFragment.source.uri,
+          element.name3!,
+        );
+        return inheritanceManager.getInherited4(enclosingElement, name);
       }
     }
     return null;
   }
 
-  /// Return the parameter of this method whose name matches the given [name],
-  /// or `null` if there is no such parameter.
+  /// Returns the parameter of this method whose name matches the given [name].
+  ///
+  /// Returns `null` if there is no such parameter.
   FormalParameter? parameterNamed(String name) {
     var parameters = this.parameters;
     if (parameters != null) {
       for (var parameter in parameters.parameters) {
-        if (parameter.declaredElement?.name == name) {
+        if (parameter.declaredFragment?.name2 == name) {
           return parameter;
         }
       }
@@ -158,12 +167,14 @@ extension on MethodDeclaration {
   }
 }
 
-extension on ExecutableElement {
-  /// Return the parameter of this executable element whose name matches the
-  /// given [name], or `null` if there is no such parameter.
-  ParameterElement? parameterNamed(String name) {
-    for (var parameter in parameters) {
-      if (parameter.name == name) {
+extension on ExecutableElement2 {
+  /// Returns the parameter of this executable element whose name matches the
+  /// given [name]
+  ///
+  /// Returns `null` if there is no such parameter.
+  FormalParameterElement? parameterNamed(String name) {
+    for (var parameter in formalParameters) {
+      if (parameter.name3 == name) {
         return parameter;
       }
     }