Elements. Migrate RenameMethodParameter.

Change-Id: I2ce533dd2f9f6301ca089ddcc93d38e6de37690e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389621
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -423,6 +423,7 @@ lib/src/services/correction/dart/remove_unused_local_variable.dart
 lib/src/services/correction/dart/remove_unused_parameter.dart
 lib/src/services/correction/dart/remove_var.dart
 lib/src/services/correction/dart/remove_var_keyword.dart
+lib/src/services/correction/dart/rename_method_parameter.dart
 lib/src/services/correction/dart/rename_to_camel_case.dart
 lib/src/services/correction/dart/replace_boolean_with_bool.dart
 lib/src/services/correction/dart/replace_cascade_with_dot.dart

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

@@ -4,10 +4,11 @@
 
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
-import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
+import 'package:analyzer/src/dart/element/inheritance_manager3.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';
@@ -38,26 +39,33 @@ class RenameMethodParameter extends ResolvedCorrectionProducer {
 
     var method = parameter.thisOrAncestorOfType<MethodDeclaration>();
     if (method == null) return;
+
     var methodParameters = method.parameters;
     if (methodParameters == null) return;
 
-    var classDeclaration = method.parent as Declaration;
-    var classElement = classDeclaration.declaredElement;
-    if (classElement is! InterfaceElement) return;
+    Fragment? declaredFragment;
+    if (method.parent case FragmentDeclaration declaration) {
+      declaredFragment = declaration.declaredFragment;
+    }
+
+    var classElement = declaredFragment?.element;
+    if (classElement is! InterfaceElement2) return;
 
-    var parentMethod = classElement.lookUpInheritedMethod(
-        method.name.lexeme, classElement.library);
+    var parentMethod = inheritanceManager.getInherited4(
+      classElement,
+      Name.forLibrary(libraryElement2, method.name.lexeme),
+    );
     if (parentMethod == null) return;
 
     var parameters = methodParameters.parameters;
-    var parentParameters = parentMethod.parameters;
+    var parentParameters = parentMethod.formalParameters;
     var oldName = paramIdentifier.lexeme;
 
     var i = parameters.indexOf(parameter);
     if (0 <= i && i < parentParameters.length) {
       var newName = parentParameters[i].name;
 
-      var collector = _Collector(newName, parameter.declaredElement!);
+      var collector = _Collector(newName, parameter.declaredFragment!.element);
       method.accept(collector);
 
       if (!collector.error) {
@@ -77,30 +85,30 @@ class RenameMethodParameter extends ResolvedCorrectionProducer {
 class _Collector extends RecursiveAstVisitor<void> {
   bool error = false;
   final String newName;
-  final ParameterElement target;
+  final FormalParameterElement target;
 
   final oldTokens = <Token>[];
 
   _Collector(this.newName, this.target);
 
   @override
   void visitSimpleFormalParameter(SimpleFormalParameter node) {
-    _addNameToken(node.name, node.declaredElement);
+    _addNameToken(node.name, node.declaredFragment?.element);
     super.visitSimpleFormalParameter(node);
   }
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
-    _addNameToken(node.token, node.staticElement);
+    _addNameToken(node.token, node.element);
   }
 
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
-    _addNameToken(node.name, node.declaredElement);
+    _addNameToken(node.name, node.declaredFragment?.element);
     super.visitVariableDeclaration(node);
   }
 
-  void _addNameToken(Token? nameToken, Element? element) {
+  void _addNameToken(Token? nameToken, Element2? element) {
     if (error) return;
 
     if (nameToken != null) {

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -2731,7 +2731,7 @@ class ChildEntity {
 ///      | 'abstract'? ('base' | 'interface' | 'final')?
 ///      | 'abstract'? 'base'? 'mixin'
 abstract final class ClassDeclaration
-    implements NamedCompilationUnitMember, _FragmentDeclaration {
+    implements NamedCompilationUnitMember, FragmentDeclaration {
   /// The `abstract` keyword, or `null` if the keyword was absent.
   Token? get abstractKeyword;
 
@@ -2967,7 +2967,7 @@ sealed class ClassMemberImpl extends DeclarationImpl implements ClassMember {
 ///
 ///    mixinApplication ::=
 ///        [NamedType] [WithClause] [ImplementsClause]? ';'
-abstract final class ClassTypeAlias implements TypeAlias, _FragmentDeclaration {
+abstract final class ClassTypeAlias implements TypeAlias, FragmentDeclaration {
   /// The token for the `abstract` keyword, or `null` if this isn't defining an
   /// abstract class.
   Token? get abstractKeyword;
@@ -4128,7 +4128,7 @@ final class ConstantPatternImpl extends DartPatternImpl
 ///    initializerList ::=
 ///        ':' [ConstructorInitializer] (',' [ConstructorInitializer])*
 abstract final class ConstructorDeclaration
-    implements ClassMember, _FragmentDeclaration {
+    implements ClassMember, FragmentDeclaration {
   /// The `augment` keyword, or `null` if the keyword was absent.
   Token? get augmentKeyword;
 
@@ -5604,7 +5604,7 @@ final class EnumConstantArgumentsImpl extends AstNodeImpl
 }
 
 /// The declaration of an enum constant.
-abstract final class EnumConstantDeclaration implements _FragmentDeclaration {
+abstract final class EnumConstantDeclaration implements FragmentDeclaration {
   /// The explicit arguments (there are always implicit `index` and `name`
   /// leading arguments) to the invoked constructor, or `null` if this constant
   /// doesn't provide any explicit arguments.
@@ -5707,7 +5707,7 @@ final class EnumConstantDeclarationImpl extends DeclarationImpl
 ///        [WithClause]? [ImplementsClause]? '{' [SimpleIdentifier]
 ///        (',' [SimpleIdentifier])* (';' [ClassMember]+)? '}'
 abstract final class EnumDeclaration
-    implements NamedCompilationUnitMember, _FragmentDeclaration {
+    implements NamedCompilationUnitMember, FragmentDeclaration {
   /// The `augment` keyword, or `null` if the keyword was absent.
   @experimental
   Token? get augmentKeyword;
@@ -6427,7 +6427,7 @@ final class ExtendsClauseImpl extends AstNodeImpl implements ExtendsClause {
 ///        'on' [TypeAnnotation] [ShowClause]? [HideClause]?
 ///        '{' [ClassMember]* '}'
 abstract final class ExtensionDeclaration
-    implements CompilationUnitMember, _FragmentDeclaration {
+    implements CompilationUnitMember, FragmentDeclaration {
   /// The `augment` keyword, or `null` if the keyword was absent.
   @experimental
   Token? get augmentKeyword;
@@ -6774,7 +6774,7 @@ final class ExtensionOverrideImpl extends ExpressionImpl
 ///        '}'
 @experimental
 abstract final class ExtensionTypeDeclaration
-    implements NamedCompilationUnitMember, _FragmentDeclaration {
+    implements NamedCompilationUnitMember, FragmentDeclaration {
   /// The `augment` keyword, or `null` if the keyword was absent.
   @experimental
   Token? get augmentKeyword;
@@ -8157,6 +8157,16 @@ final class ForStatementImpl extends StatementImpl
   }
 }
 
+/// A declaration of a fragment of an element.
+@experimental
+abstract final class FragmentDeclaration implements Declaration {
+  /// The fragment declared by this declaration.
+  ///
+  /// Returns `null` if the AST structure hasn't been resolved.
+  @experimental
+  Fragment? get declaredFragment;
+}
+
 /// A node representing the body of a function or method.
 ///
 ///    functionBody ::=
@@ -8274,7 +8284,7 @@ sealed class FunctionBodyImpl extends AstNodeImpl implements FunctionBody {
 //  that are only sometimes applicable. Consider changing the class hierarchy so
 //  that these two kinds of variables can be distinguished.
 abstract final class FunctionDeclaration
-    implements NamedCompilationUnitMember, _FragmentDeclaration {
+    implements NamedCompilationUnitMember, FragmentDeclaration {
   /// The `augment` keyword, or `null` if there is no `augment` keyword.
   @experimental
   Token? get augmentKeyword;
@@ -8821,7 +8831,7 @@ final class FunctionReferenceImpl extends CommentReferableExpressionImpl
 ///    functionPrefix ::=
 ///        [TypeAnnotation]? [SimpleIdentifier]
 abstract final class FunctionTypeAlias
-    implements TypeAlias, _FragmentDeclaration {
+    implements TypeAlias, FragmentDeclaration {
   @override
   TypeAliasElement? get declaredElement;
 
@@ -9183,7 +9193,7 @@ final class GenericFunctionTypeImpl extends TypeAnnotationImpl
 ///        'typedef' [SimpleIdentifier] [TypeParameterList]? =
 ///        [FunctionType] ';'
 abstract final class GenericTypeAlias
-    implements TypeAlias, _FragmentDeclaration {
+    implements TypeAlias, FragmentDeclaration {
   /// The equal sign separating the name being defined from the function type.
   Token get equals;
 
@@ -11891,7 +11901,7 @@ final class MapPatternImpl extends DartPatternImpl implements MapPattern {
 /// children of a class declaration. When the experiment is enabled, these nodes
 /// can also be children of an extension declaration.
 abstract final class MethodDeclaration
-    implements ClassMember, _FragmentDeclaration {
+    implements ClassMember, FragmentDeclaration {
   /// The token for the `augment` keyword.
   Token? get augmentKeyword;
 
@@ -12288,7 +12298,7 @@ abstract final class MethodReferenceExpression implements Expression {
 ///        'base'? 'mixin' name [TypeParameterList]?
 ///        [OnClause]? [ImplementsClause]? '{' [ClassMember]* '}'
 abstract final class MixinDeclaration
-    implements NamedCompilationUnitMember, _FragmentDeclaration {
+    implements NamedCompilationUnitMember, FragmentDeclaration {
   /// The `augment` keyword, or `null` if the keyword was absent.
   Token? get augmentKeyword;
 
@@ -18157,8 +18167,7 @@ final class TypeLiteralImpl extends CommentReferableExpressionImpl
 ///
 ///    typeParameter ::=
 ///        name ('extends' [TypeAnnotation])?
-abstract final class TypeParameter
-    implements Declaration, _FragmentDeclaration {
+abstract final class TypeParameter implements Declaration, FragmentDeclaration {
   /// The upper bound for legal arguments, or `null` if there's no explicit
   /// upper bound.
   TypeAnnotation? get bound;
@@ -18409,7 +18418,7 @@ class UriValidationCode {
 //  that are only sometimes applicable. Consider changing the class hierarchy so
 //  that these two kinds of variables can be distinguished.
 abstract final class VariableDeclaration
-    implements Declaration, _FragmentDeclaration {
+    implements Declaration, FragmentDeclaration {
   /// The element declared by this declaration.
   ///
   /// Returns `null` if the AST structure hasn't been resolved or if this node
@@ -19216,15 +19225,6 @@ base mixin _AnnotatedNodeMixin on AstNodeImpl implements AnnotatedNode {
   }
 }
 
-/// A declaration of a fragment of an element.
-abstract final class _FragmentDeclaration implements Declaration {
-  /// The fragment declared by this declaration.
-  ///
-  /// Returns `null` if the AST structure hasn't been resolved.
-  @experimental
-  Fragment? get declaredFragment;
-}
-
 /// An indication of the resolved kind of a [SetOrMapLiteral].
 enum _SetOrMapKind {
   /// Indicates that the literal represents a map.