Elements. Migrate ChangeTo.

Change-Id: I025734d07bf531d8c097ba508b55f6ca6ce8bdef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389762
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -250,6 +250,7 @@ lib/src/services/correction/dart/add_trailing_comma.dart
 lib/src/services/correction/dart/add_type_annotation.dart
 lib/src/services/correction/dart/assign_to_local_variable.dart
 lib/src/services/correction/dart/change_argument_name.dart
+lib/src/services/correction/dart/change_to.dart
 lib/src/services/correction/dart/change_to_nearest_precise_value.dart
 lib/src/services/correction/dart/change_to_static_access.dart
 lib/src/services/correction/dart/change_type_annotation.dart
@@ -1514,4 +1515,4 @@ tool/spec/codegen_protocol_constants.dart
 tool/spec/from_html.dart
 tool/spec/generate_all.dart
 tool/spec/implied_types.dart
-tool/spec/to_html.dart
+tool/spec/to_html.dart

pkg/analysis_server/lib/src/services/correction/dart/change_to.dart

@@ -10,13 +10,13 @@ import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 /// A predicate is a one-argument function that returns a boolean value.
-typedef _ElementPredicate = bool Function(Element argument);
+typedef _ElementPredicate = bool Function(Element2 argument);
 
 class ChangeTo extends ResolvedCorrectionProducer {
   /// The kind of elements that should be proposed.
@@ -82,10 +82,10 @@ class ChangeTo extends ResolvedCorrectionProducer {
     };
   }
 
-  Iterable<ParameterElement> _formalParameterSuggestions(
-      FunctionTypedElement element,
+  Iterable<FormalParameterElement> _formalParameterSuggestions(
+      FunctionTypedElement2 element,
       Iterable<FormalParameter> formalParameters) {
-    return element.parameters.where((superParam) =>
+    return element.formalParameters.where((superParam) =>
         superParam.isNamed &&
         !formalParameters
             .any((param) => superParam.name == param.name?.lexeme));
@@ -95,7 +95,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
     var node = this.node;
     if (node is Annotation) {
       var name = node.name;
-      if (name.staticElement == null) {
+      if (name.element == null) {
         if (node.arguments != null) {
           await _proposeClassOrMixin(builder, name);
         }
@@ -112,7 +112,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       nameToken = node.name2;
     } else if (node is PrefixedIdentifier &&
         node.parent is NamedType &&
-        node.prefix.staticElement is PrefixElement) {
+        node.prefix.element is PrefixElement2) {
       prefixName = node.prefix.name;
       nameToken = node.identifier.token;
     } else if (node is SimpleIdentifier) {
@@ -122,18 +122,16 @@ class ChangeTo extends ResolvedCorrectionProducer {
     if (nameToken != null) {
       // Prepare for selecting the closest element.
       var finder = _ClosestElementFinder(
-          nameToken.lexeme, (Element element) => element is InterfaceElement);
+          nameToken.lexeme, (element) => element is InterfaceElement2);
       // Check elements of this library.
       if (prefixName == null) {
-        for (var unit in unitResult.libraryElement.units) {
-          finder._updateList(unit.classes);
-        }
+        finder._updateList(unitResult.libraryElement2.classes);
       }
       // Check elements from imports.
       for (var importElement
-          in unitResult.libraryElement.definingCompilationUnit.libraryImports) {
-        if (importElement.prefix?.element.name == prefixName) {
-          var namespace = getImportNamespace(importElement);
+          in unitResult.libraryElement2.firstFragment.libraryImports2) {
+        if (importElement.prefix2?.element.name == prefixName) {
+          var namespace = getImportNamespace2(importElement);
           finder._updateList(namespace.values);
         }
       }
@@ -144,22 +142,21 @@ class ChangeTo extends ResolvedCorrectionProducer {
 
   Future<void> _proposeClassOrMixinMember(ChangeBuilder builder, Token node,
       Expression? target, _ElementPredicate predicate) async {
-    var targetIdentifierElement =
-        target is Identifier ? target.staticElement : null;
+    var targetIdentifierElement = target is Identifier ? target.element : null;
     var finder = _ClosestElementFinder(node.lexeme, predicate);
     // unqualified invocation
     if (target == null) {
       var clazz = this.node.thisOrAncestorOfType<ClassDeclaration>();
       if (clazz != null) {
-        var interfaceElement = clazz.declaredElement!;
+        var interfaceElement = clazz.declaredFragment!.element;
         _updateFinderWithClassMembers(finder, interfaceElement);
       }
     } else if (target is ExtensionOverride) {
-      _updateFinderWithExtensionMembers(finder, target.element);
-    } else if (targetIdentifierElement is ExtensionElement) {
+      _updateFinderWithExtensionMembers(finder, target.element2);
+    } else if (targetIdentifierElement is ExtensionElement2) {
       _updateFinderWithExtensionMembers(finder, targetIdentifierElement);
     } else {
-      var interfaceElement = getTargetInterfaceElement(target);
+      var interfaceElement = getTargetInterfaceElement2(target);
       if (interfaceElement != null) {
         _updateFinderWithClassMembers(finder, interfaceElement);
       }
@@ -194,9 +191,8 @@ class ChangeTo extends ResolvedCorrectionProducer {
     }
 
     var type = node.type?.type;
-    await _proposeClassOrMixinMember(builder, node.name, null,
-        (Element element) {
-      return element is FieldElement &&
+    await _proposeClassOrMixinMember(builder, node.name, null, (element) {
+      return element is FieldElement2 &&
           !exclusions.contains(element.name) &&
           !element.isSynthetic &&
           !element.isExternal &&
@@ -215,26 +211,25 @@ class ChangeTo extends ResolvedCorrectionProducer {
         var invocation = node.parent;
         if (invocation is MethodInvocation && invocation.methodName == node) {
           var target = invocation.target;
-          if (target is SimpleIdentifier &&
-              target.staticElement is PrefixElement) {
+          if (target is SimpleIdentifier && target.element is PrefixElement2) {
             prefixName = target.name;
           }
         }
       }
       // Prepare for selecting the closest element.
       var finder = _ClosestElementFinder(
-          node.name, (Element element) => element is FunctionElement);
+          node.name, (element) => element is TopLevelFunctionElement);
       // Check to this library units.
       if (prefixName == null) {
-        for (var unit in unitResult.libraryElement.units) {
-          finder._updateList(unit.functions);
+        for (var function in unitResult.libraryElement2.functions) {
+          finder._update(function);
         }
       }
       // Check unprefixed imports.
       for (var importElement
-          in unitResult.libraryElement.definingCompilationUnit.libraryImports) {
-        if (importElement.prefix?.element.name == prefixName) {
-          var namespace = getImportNamespace(importElement);
+          in unitResult.libraryElement2.firstFragment.libraryImports2) {
+        if (importElement.prefix2?.element.name == prefixName) {
+          var namespace = getImportNamespace2(importElement);
           finder._updateList(namespace.values);
         }
       }
@@ -257,14 +252,14 @@ class ChangeTo extends ResolvedCorrectionProducer {
       // find getter or setter
       var wantGetter = node.inGetterContext();
       var wantSetter = node.inSetterContext();
-      await _proposeClassOrMixinMember(builder, node.token, target,
-          (Element element) {
-        if (element is PropertyAccessorElement) {
-          return wantGetter && element.isGetter ||
-              wantSetter && element.isSetter;
-        } else if (element is FieldElement) {
-          return wantGetter && element.getter != null ||
-              wantSetter && element.setter != null;
+      await _proposeClassOrMixinMember(builder, node.token, target, (element) {
+        if (element is GetterElement) {
+          return wantGetter;
+        } else if (element is SetterElement) {
+          return wantSetter;
+        } else if (element is FieldElement2) {
+          return wantGetter && element.getter2 != null ||
+              wantSetter && element.setter2 != null;
         }
         return false;
       });
@@ -276,7 +271,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
     var parent = node.parent;
     if (parent is MethodInvocation && node is SimpleIdentifier) {
       await _proposeClassOrMixinMember(builder, node.token, parent.realTarget,
-          (Element element) => element is MethodElement && !element.isOperator);
+          (element) => element is MethodElement2 && !element.isOperator);
     }
   }
 
@@ -291,27 +286,26 @@ class ChangeTo extends ResolvedCorrectionProducer {
     var formalParameters = constructorDeclaration.parameters.parameters
         .whereType<DefaultFormalParameter>();
 
-    var finder =
-        _ClosestElementFinder(superParameter.name.lexeme, (Element e) => true);
+    var finder = _ClosestElementFinder(superParameter.name.lexeme, (e) => true);
 
     var superInvocation = constructorDeclaration.initializers.lastOrNull;
 
     if (superInvocation is SuperConstructorInvocation) {
-      var staticElement = superInvocation.staticElement;
-      if (staticElement == null) return;
+      var element = superInvocation.element;
+      if (element == null) return;
 
-      var list = _formalParameterSuggestions(staticElement, formalParameters);
+      var list = _formalParameterSuggestions(element, formalParameters);
       finder._updateList(list);
     } else {
       var targetClassNode =
           superParameter.thisOrAncestorOfType<ClassDeclaration>();
       if (targetClassNode == null) return;
 
-      var targetClassElement = targetClassNode.declaredElement!;
+      var targetClassElement = targetClassNode.declaredFragment!.element;
       var superType = targetClassElement.supertype;
       if (superType == null) return;
 
-      for (var constructor in superType.constructors) {
+      for (var constructor in superType.constructors2) {
         if (constructor.name.isEmpty) {
           var list = _formalParameterSuggestions(constructor, formalParameters);
           finder._updateList(list);
@@ -335,20 +329,20 @@ class ChangeTo extends ResolvedCorrectionProducer {
   }
 
   void _updateFinderWithClassMembers(
-      _ClosestElementFinder finder, InterfaceElement clazz) {
-    var members = getMembers(clazz);
+      _ClosestElementFinder finder, InterfaceElement2 clazz) {
+    var members = getMembers2(clazz);
     finder._updateList(members);
   }
 
   void _updateFinderWithExtensionMembers(
-      _ClosestElementFinder finder, ExtensionElement? element) {
+      _ClosestElementFinder finder, ExtensionElement2? element) {
     if (element != null) {
-      finder._updateList(getExtensionMembers(element));
+      finder._updateList(getExtensionMembers2(element));
     }
   }
 }
 
-/// Helper for finding [Element] with name closest to the given.
+/// Helper for finding [Element2] with name closest to the given.
 class _ClosestElementFinder {
   /// The maximum Levenshtein distance between the existing name and a possible
   /// replacement before the replacement is deemed to not be worth offering.
@@ -363,11 +357,11 @@ class _ClosestElementFinder {
 
   int _distance = _maxDistance;
 
-  Element? _element;
+  Element2? _element;
 
   _ClosestElementFinder(this._targetName, this._predicate);
 
-  void _update(Element element) {
+  void _update(Element2 element) {
     if (_predicate(element)) {
       var name = element.name;
       if (name != null) {
@@ -380,7 +374,7 @@ class _ClosestElementFinder {
     }
   }
 
-  void _updateList(Iterable<Element> elements) {
+  void _updateList(Iterable<Element2> elements) {
     for (var element in elements) {
       _update(element);
     }

pkg/analysis_server/lib/src/services/search/element_visitors.dart

@@ -3,7 +3,9 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/visitor.dart';
+import 'package:analyzer/dart/element/visitor2.dart';
 
 /// Return the [Element] that is either [root], or one of its direct or
 /// indirect children, and has the given [nameOffset].
@@ -26,6 +28,12 @@ void visitChildren(Element element, BoolElementProcessor processor) {
   element.visitChildren(_ElementVisitorAdapter(processor));
 }
 
+/// Uses [processor] to visit all of the children of [element].
+/// If [processor] returns `true`, then children of a child are visited too.
+void visitChildren2(Element2 element, BoolElementProcessor2 processor) {
+  element.visitChildren2(_ElementVisitorAdapter2(processor));
+}
+
 /// Uses [processor] to visit all of the top-level elements of [library].
 void visitLibraryTopLevelElements(
     LibraryElement library, VoidElementProcessor processor) {
@@ -36,6 +44,10 @@ void visitLibraryTopLevelElements(
 /// If `true` is returned, children of [element] will be visited.
 typedef BoolElementProcessor = bool Function(Element element);
 
+/// An [Element2] processor function type.
+/// If `true` is returned, children of [element] will be visited.
+typedef BoolElementProcessor2 = bool Function(Element2 element);
+
 /// An [Element] processor function type.
 typedef VoidElementProcessor = void Function(Element element);
 
@@ -71,6 +83,21 @@ class _ElementVisitorAdapter extends GeneralizingElementVisitor<void> {
   }
 }
 
+/// A [GeneralizingElementVisitor] adapter for [BoolElementProcessor2].
+class _ElementVisitorAdapter2 extends GeneralizingElementVisitor2<void> {
+  final BoolElementProcessor2 processor;
+
+  _ElementVisitorAdapter2(this.processor);
+
+  @override
+  void visitElement(Element2 element) {
+    var visitChildren = processor(element);
+    if (visitChildren == true) {
+      element.visitChildren2(this);
+    }
+  }
+}
+
 /// A [GeneralizingElementVisitor] for visiting top-level elements.
 class _TopLevelElementsVisitor extends GeneralizingElementVisitor<void> {
   final VoidElementProcessor processor;