Rename parameters and _parameters in element.dart to formalParameters

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

Author: fshcheglov

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

@@ -165,9 +165,9 @@ extension on ExecutableElement {
   ///
   /// Returns `null` if there is no such parameter.
   FormalParameterElement? parameterNamed(String name) {
-    for (var parameter in formalParameters) {
-      if (parameter.name == name) {
-        return parameter;
+    for (var formalParameter in formalParameters) {
+      if (formalParameter.name == name) {
+        return formalParameter;
       }
     }
     return null;

pkg/analyzer/lib/src/dart/constant/potentially_constant.dart

@@ -435,9 +435,9 @@ class _ConstantTypeChecker {
     }
 
     var formalParameters = node.parameters.parameters;
-    for (var parameter in formalParameters) {
-      if (parameter is SimpleFormalParameter) {
-        if (!check(parameter.type)) {
+    for (var formalParameter in formalParameters) {
+      if (formalParameter is SimpleFormalParameter) {
+        if (!check(formalParameter.type)) {
           return false;
         }
       }

pkg/analyzer/lib/src/dart/element/element.dart

@@ -569,7 +569,7 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
             );
           }
 
-          constructorFragment.parameters =
+          constructorFragment.formalParameters =
               formalParameterFragments.toFixedList();
 
           var isNamed = superConstructor.name != 'new';
@@ -1040,8 +1040,8 @@ class ConstructorFragmentImpl extends ExecutableFragmentImpl
       return false;
     }
     // no required parameters
-    for (var parameter in parameters) {
-      if (parameter.isRequired) {
+    for (var formalParameters in formalParameters) {
+      if (formalParameters.isRequired) {
         return false;
       }
     }
@@ -2369,14 +2369,14 @@ abstract class ExecutableFragmentImpl extends FragmentImpl
     implements ExecutableFragment {
   /// A list containing all of the parameters defined by this executable
   /// element.
-  List<FormalParameterFragmentImpl> _parameters = const [];
+  List<FormalParameterFragmentImpl> _formalParameters = const [];
 
   /// Initialize a newly created executable element to have the given [name] and
   /// [offset].
   ExecutableFragmentImpl({required super.firstTokenOffset});
 
   @override
-  List<Fragment> get children => [...typeParameters, ...parameters];
+  List<Fragment> get children => [...typeParameters, ...formalParameters];
 
   @Deprecated('Use children instead')
   @override
@@ -2394,7 +2394,17 @@ abstract class ExecutableFragmentImpl extends FragmentImpl
   }
 
   @override
-  List<FormalParameterFragmentImpl> get formalParameters => parameters;
+  List<FormalParameterFragmentImpl> get formalParameters {
+    _ensureReadResolution();
+    return _formalParameters;
+  }
+
+  set formalParameters(List<FormalParameterFragmentImpl> formalParameters) {
+    for (var formalParameter in formalParameters) {
+      formalParameter.enclosingFragment = this;
+    }
+    _formalParameters = formalParameters;
+  }
 
   /// Whether the type of this fragment references a type parameter of the
   /// enclosing element. This includes not only explicitly specified type
@@ -2496,21 +2506,6 @@ abstract class ExecutableFragmentImpl extends FragmentImpl
 
   @override
   int get offset => nameOffset ?? firstTokenOffset!;
-
-  /// The formal parameters defined by this executable fragment.
-  List<FormalParameterFragmentImpl> get parameters {
-    _ensureReadResolution();
-    return _parameters;
-  }
-
-  /// Set the parameters defined by this executable element to the given
-  /// [parameters].
-  set parameters(List<FormalParameterFragmentImpl> parameters) {
-    for (var parameter in parameters) {
-      parameter.enclosingFragment = this;
-    }
-    _parameters = parameters;
-  }
 }
 
 class ExtensionElementImpl extends InstanceElementImpl
@@ -3146,7 +3141,7 @@ class FormalParameterElementImpl extends PromotableElementImpl
   @override
   // TODO(augmentations): Implement the merge of formal parameters.
   List<FormalParameterElementImpl> get formalParameters =>
-      wrappedElement.parameters.map((fragment) => fragment.element).toList();
+      wrappedElement.formalParameters.map((fragment) => fragment.element).toList();
 
   @override
   List<FormalParameterFragmentImpl> get fragments {
@@ -3356,7 +3351,7 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
   /// A list containing all of the parameters defined by this parameter element.
   /// There will only be parameters if this parameter is a function typed
   /// parameter.
-  List<FormalParameterFragmentImpl> _parameters = const [];
+  List<FormalParameterFragmentImpl> _formalParameters = const [];
 
   /// A list containing all of the type parameters defined for this parameter
   /// element. There will only be parameters if this parameter is a function
@@ -3428,6 +3423,23 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
 
   set element(FormalParameterElementImpl element) => _element = element;
 
+  /// The parameters defined by this parameter.
+  ///
+  /// A parameter will only define other parameters if it is a function typed
+  /// parameter.
+  List<FormalParameterFragmentImpl> get formalParameters {
+    return _formalParameters;
+  }
+
+  /// Set the parameters defined by this executable element to the given
+  /// [value].
+  set formalParameters(List<FormalParameterFragmentImpl> value) {
+    for (var formalParameter in value) {
+      formalParameter.enclosingFragment = this;
+    }
+    _formalParameters = value;
+  }
+
   /// Return true if this parameter is explicitly marked as being covariant.
   bool get isExplicitlyCovariant {
     return hasModifier(Modifier.COVARIANT);
@@ -3511,23 +3523,6 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
   // TODO(augmentations): Support chaining between the fragments.
   FormalParameterFragmentImpl? get nextFragment => null;
 
-  /// The parameters defined by this parameter.
-  ///
-  /// A parameter will only define other parameters if it is a function typed
-  /// parameter.
-  List<FormalParameterFragmentImpl> get parameters {
-    return _parameters;
-  }
-
-  /// Set the parameters defined by this executable element to the given
-  /// [parameters].
-  set parameters(List<FormalParameterFragmentImpl> parameters) {
-    for (var parameter in parameters) {
-      parameter.enclosingFragment = this;
-    }
-    _parameters = parameters;
-  }
-
   @override
   // TODO(augmentations): Support chaining between the fragments.
   FormalParameterFragmentImpl? get previousFragment => null;
@@ -3796,7 +3791,7 @@ abstract class FunctionTypedElementImpl extends ElementImpl
 /// Clients may not extend, implement or mix-in this class.
 abstract class FunctionTypedFragmentImpl implements FragmentImpl {
   /// The parameters defined by this executable element.
-  List<FormalParameterFragmentImpl> get parameters;
+  List<FormalParameterFragmentImpl> get formalParameters;
 
   /// The type parameters declared by this element directly.
   ///
@@ -3913,7 +3908,7 @@ class GenericFunctionTypeFragmentImpl extends FragmentImpl
   TypeImpl? _returnType;
 
   /// The elements representing the parameters of the function.
-  List<FormalParameterFragmentImpl> _parameters = const [];
+  List<FormalParameterFragmentImpl> _formalParameters = const [];
 
   /// Is `true` if the type has the question mark, so is nullable.
   bool isNullable = false;
@@ -3929,7 +3924,7 @@ class GenericFunctionTypeFragmentImpl extends FragmentImpl
   GenericFunctionTypeFragmentImpl({required super.firstTokenOffset});
 
   @override
-  List<Fragment> get children => [...typeParameters, ...parameters];
+  List<Fragment> get children => [...typeParameters, ...formalParameters];
 
   @Deprecated('Use children instead')
   @override
@@ -3939,7 +3934,18 @@ class GenericFunctionTypeFragmentImpl extends FragmentImpl
   GenericFunctionTypeElementImpl get element => _element2;
 
   @override
-  List<FormalParameterFragmentImpl> get formalParameters => parameters;
+  List<FormalParameterFragmentImpl> get formalParameters {
+    return _formalParameters;
+  }
+
+  /// Set the parameters defined by this function type element to the given
+  /// [formalParameters].
+  set formalParameters(List<FormalParameterFragmentImpl> formalParameters) {
+    for (var formalParameter in formalParameters) {
+      formalParameter.enclosingFragment = this;
+    }
+    _formalParameters = formalParameters;
+  }
 
   @override
   String? get name => null;
@@ -3957,20 +3963,6 @@ class GenericFunctionTypeFragmentImpl extends FragmentImpl
   @override
   int get offset => firstTokenOffset!;
 
-  @override
-  List<FormalParameterFragmentImpl> get parameters {
-    return _parameters;
-  }
-
-  /// Set the parameters defined by this function type element to the given
-  /// [parameters].
-  set parameters(List<FormalParameterFragmentImpl> parameters) {
-    for (var parameter in parameters) {
-      parameter.enclosingFragment = this;
-    }
-    _parameters = parameters;
-  }
-
   @override
   GenericFunctionTypeFragmentImpl? get previousFragment => null;
 
@@ -3992,7 +3984,7 @@ class GenericFunctionTypeFragmentImpl extends FragmentImpl
 
     return _type = FunctionTypeImpl(
       typeParameters: typeParameters.map((f) => f.asElement2).toList(),
-      parameters: parameters.map((f) => f.asElement2).toList(),
+      parameters: formalParameters.map((f) => f.asElement2).toList(),
       returnType: returnType,
       nullabilitySuffix:
           isNullable ? NullabilitySuffix.question : NullabilitySuffix.none,
@@ -9186,7 +9178,7 @@ class SuperFormalParameterFragmentImpl extends FormalParameterFragmentImpl
 
   /// Return the index of this super-formal parameter among other super-formals.
   int indexIn(ConstructorFragmentImpl enclosingElement) {
-    return enclosingElement.parameters
+    return enclosingElement.formalParameters
         .whereType<SuperFormalParameterFragmentImpl>()
         .toList()
         .indexOf(this);
@@ -10114,10 +10106,10 @@ class TypeParameterFragmentImpl extends FragmentImpl
         }
       }
 
-      for (var parameter in type.formalParameters) {
+      for (var formalParameter in type.formalParameters) {
         result = result.meet(
           shared.Variance.contravariant.combine(
-            computeVarianceInType(parameter.type),
+            computeVarianceInType(formalParameter.type),
           ),
         );
       }

pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart

@@ -979,7 +979,7 @@ class InheritanceManager3 {
       );
       resultFragment.enclosingFragment = class_.firstFragment;
       resultFragment.isSynthetic = true;
-      resultFragment.parameters =
+      resultFragment.formalParameters =
           transformedParameters.map((e) => e.firstFragment).toList();
       resultFragment.typeParameters =
           executable.typeParameters
@@ -1012,7 +1012,7 @@ class InheritanceManager3 {
       );
       resultFragment.enclosingFragment = class_.firstFragment;
       resultFragment.isSynthetic = true;
-      resultFragment.parameters =
+      resultFragment.formalParameters =
           transformedParameters.map((e) => e.firstFragment).toList();
 
       var result = SetterElementImpl(setterReference, resultFragment);
@@ -1085,7 +1085,7 @@ class InheritanceManager3 {
       resultFragment.typeParameters =
           resultType.typeParameters.map((e) => e.firstFragment).toList();
       // TODO(scheglov): check if can type cast instead
-      resultFragment.parameters =
+      resultFragment.formalParameters =
           resultType.parameters
               .map((e) => e.firstFragment as FormalParameterFragmentImpl)
               .toList();
@@ -1143,7 +1143,7 @@ class InheritanceManager3 {
       }
       resultFragment.enclosingFragment = targetClass.firstFragment;
       // TODO(scheglov): check if can type cast instead
-      resultFragment.parameters =
+      resultFragment.formalParameters =
           resultType.parameters
               .map((e) => e.firstFragment as FormalParameterFragmentImpl)
               .toList();

pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart

@@ -36,20 +36,20 @@ import 'package:analyzer/src/utilities/extensions/string.dart';
 class ElementHolder {
   final FragmentImpl _element;
   final List<TypeParameterFragmentImpl> _typeParameters = [];
-  final List<FormalParameterFragmentImpl> _parameters = [];
+  final List<FormalParameterFragmentImpl> _formalParameters = [];
 
   ElementHolder(this._element);
 
-  List<FormalParameterFragmentImpl> get parameters {
-    return _parameters.toFixedList();
+  List<FormalParameterFragmentImpl> get formalParameters {
+    return _formalParameters.toFixedList();
   }
 
   List<TypeParameterFragmentImpl> get typeParameters {
     return _typeParameters.toFixedList();
   }
 
   void addParameter(FormalParameterFragmentImpl element) {
-    _parameters.add(element);
+    _formalParameters.add(element);
   }
 
   void addTypeParameter(TypeParameterFragmentImpl element) {
@@ -754,7 +754,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
 
             expression.parameters?.accept(this);
             if (_elementWalker == null) {
-              fragment.parameters = holder.parameters;
+              fragment.formalParameters = holder.formalParameters;
             }
 
             node.returnType?.accept(this);
@@ -809,7 +809,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
         fragment.typeParameters = holder.typeParameters;
 
         node.parameters!.accept(this);
-        fragment.parameters = holder.parameters;
+        fragment.formalParameters = holder.formalParameters;
 
         _defineFormalParameters(fragment.element.formalParameters);
         node.body.accept(this);
@@ -879,7 +879,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
 
             node.parameters.accept(this);
             if (_elementWalker == null) {
-              fragment.parameters = holder.parameters;
+              fragment.formalParameters = holder.formalParameters;
             }
 
             node.returnType?.accept(this);
@@ -888,7 +888,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
                 typeParameters:
                     fragment.typeParameters.map((f) => f.element).toList(),
                 parameters:
-                    fragment.parameters.map((f) => f.asElement2).toList(),
+                    fragment.formalParameters.map((f) => f.asElement2).toList(),
                 returnType: node.returnType?.type ?? _dynamicType,
                 nullabilitySuffix: _getNullability(node.question != null),
               );
@@ -921,7 +921,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
           fragment.typeParameters = holder.typeParameters;
 
           node.parameters.accept(this);
-          fragment.parameters = holder.parameters;
+          fragment.formalParameters = holder.formalParameters;
 
           node.returnType?.accept(this);
           fragment.returnType = node.returnType?.type ?? _dynamicType;
@@ -931,7 +931,7 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
 
     var type = FunctionTypeImpl(
       typeParameters: fragment.typeParameters.map((f) => f.asElement2).toList(),
-      parameters: fragment.parameters.map((f) => f.asElement2).toList(),
+      parameters: fragment.formalParameters.map((f) => f.asElement2).toList(),
       returnType: fragment.returnType,
       nullabilitySuffix: _getNullability(node.question != null),
     );