Elements. Use constructors with named formal parameters in NamedTypeBuilder and FunctionTypeBuilder.

Change-Id: I9be02c1d45d86d8ce1b0ea134d892a5d0bc30b7a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429463
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -66,7 +66,7 @@ class ReplacementVisitor
       return null;
     }
 
-    return FunctionTypeBuilder.v2(
+    return FunctionTypeBuilder(
       typeParameters: newTypeParameters ?? type.typeParameters,
       formalParameters: newFormalParameters ?? type.formalParameters,
       returnType: newReturnType ?? type.returnType,
@@ -103,10 +103,10 @@ class ReplacementVisitor
       return null;
     }
 
-    return NamedTypeBuilder.v2(
+    return NamedTypeBuilder(
       linker: type.linker,
       typeSystem: type.typeSystem,
-      element: type.element3,
+      element3: type.element3,
       arguments: newTypeArguments ?? type.arguments,
       nullabilitySuffix: newNullability ?? type.nullabilitySuffix,
     );

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

@@ -497,10 +497,10 @@ abstract class _TypeSubstitutor
     if (useCounter == before) return type;
 
     return FunctionTypeBuilder(
-      typeParameters,
-      formalParameters,
-      returnType,
-      type.nullabilitySuffix,
+      typeParameters: typeParameters,
+      formalParameters: formalParameters,
+      returnType: returnType,
+      nullabilitySuffix: type.nullabilitySuffix,
     );
   }
 
@@ -541,11 +541,11 @@ abstract class _TypeSubstitutor
     }
 
     return NamedTypeBuilder(
-      type.linker,
-      type.typeSystem,
-      type.element3,
-      arguments,
-      type.nullabilitySuffix,
+      linker: type.linker,
+      typeSystem: type.typeSystem,
+      element3: type.element3,
+      arguments: arguments,
+      nullabilitySuffix: type.nullabilitySuffix,
     );
   }
 

pkg/analyzer/lib/src/summary2/function_type_builder.dart

@@ -36,11 +36,11 @@ class FunctionTypeBuilder extends TypeBuilder {
   /// and set for the [node].
   FunctionTypeImpl? _type;
 
-  FunctionTypeBuilder(
-    this.typeParameters,
-    this.formalParameters,
-    this.returnType,
-    this.nullabilitySuffix, {
+  FunctionTypeBuilder({
+    required this.typeParameters,
+    required this.formalParameters,
+    required this.returnType,
+    required this.nullabilitySuffix,
     this.node,
   });
 
@@ -49,26 +49,10 @@ class FunctionTypeBuilder extends TypeBuilder {
     NullabilitySuffix nullabilitySuffix,
   ) {
     return FunctionTypeBuilder(
-      _getTypeParameters(node.typeParameters),
-      getParameters(node.parameters),
-      _getNodeType(node.returnType),
-      nullabilitySuffix,
-      node: node,
-    );
-  }
-
-  factory FunctionTypeBuilder.v2({
-    required List<TypeParameterElementImpl2> typeParameters,
-    required List<FormalParameterElementImpl> formalParameters,
-    required TypeImpl returnType,
-    required NullabilitySuffix nullabilitySuffix,
-    GenericFunctionTypeImpl? node,
-  }) {
-    return FunctionTypeBuilder(
-      typeParameters,
-      formalParameters,
-      returnType,
-      nullabilitySuffix,
+      typeParameters: _getTypeParameters(node.typeParameters),
+      formalParameters: getParameters(node.parameters),
+      returnType: _getNodeType(node.returnType),
+      nullabilitySuffix: nullabilitySuffix,
       node: node,
     );
   }
@@ -144,10 +128,10 @@ class FunctionTypeBuilder extends TypeBuilder {
     }
 
     return FunctionTypeBuilder(
-      typeParameters,
-      formalParameters,
-      returnType,
-      nullabilitySuffix,
+      typeParameters: typeParameters,
+      formalParameters: formalParameters,
+      returnType: returnType,
+      nullabilitySuffix: nullabilitySuffix,
       node: node,
     );
   }
@@ -197,10 +181,10 @@ class FunctionTypeBuilder extends TypeBuilder {
       }
 
       return FunctionTypeBuilder(
-        _getTypeParameters(node.typeParameters),
-        getParameters(node.parameters),
-        _getNodeType(node.returnType),
-        nullabilitySuffix,
+        typeParameters: _getTypeParameters(node.typeParameters),
+        formalParameters: getParameters(node.parameters),
+        returnType: _getNodeType(node.returnType),
+        nullabilitySuffix: nullabilitySuffix,
       );
     } else {
       throw UnimplementedError('(${node.runtimeType}) $node');

pkg/analyzer/lib/src/summary2/named_type_builder.dart

@@ -45,22 +45,22 @@ class NamedTypeBuilder extends TypeBuilder {
   /// and set for the [node].
   TypeImpl? _type;
 
-  NamedTypeBuilder(
-    this.linker,
-    this.typeSystem,
-    this.element3,
-    this.arguments,
-    this.nullabilitySuffix, {
+  NamedTypeBuilder({
+    required this.linker,
+    required this.typeSystem,
+    required this.element3,
+    required this.arguments,
+    required this.nullabilitySuffix,
     this.node,
   });
 
-  factory NamedTypeBuilder.of(
-    Linker linker,
-    TypeSystemImpl typeSystem,
-    NamedTypeImpl node,
-    Element element,
-    NullabilitySuffix nullabilitySuffix,
-  ) {
+  factory NamedTypeBuilder.of({
+    required Linker linker,
+    required TypeSystemImpl typeSystem,
+    required NamedTypeImpl node,
+    required Element element,
+    required NullabilitySuffix nullabilitySuffix,
+  }) {
     List<TypeImpl> arguments;
     var argumentList = node.typeArguments;
     if (argumentList != null) {
@@ -70,29 +70,11 @@ class NamedTypeBuilder extends TypeBuilder {
     }
 
     return NamedTypeBuilder(
-      linker,
-      typeSystem,
-      element,
-      arguments,
-      nullabilitySuffix,
-      node: node,
-    );
-  }
-
-  factory NamedTypeBuilder.v2({
-    required Linker linker,
-    required TypeSystemImpl typeSystem,
-    required Element element,
-    required List<TypeImpl> arguments,
-    required NullabilitySuffix nullabilitySuffix,
-    NamedTypeImpl? node,
-  }) {
-    return NamedTypeBuilder(
-      linker,
-      typeSystem,
-      element,
-      arguments,
-      nullabilitySuffix,
+      linker: linker,
+      typeSystem: typeSystem,
+      element3: element,
+      arguments: arguments,
+      nullabilitySuffix: nullabilitySuffix,
       node: node,
     );
   }
@@ -171,11 +153,11 @@ class NamedTypeBuilder extends TypeBuilder {
     }
 
     return NamedTypeBuilder(
-      linker,
-      typeSystem,
-      element3,
-      arguments,
-      nullabilitySuffix,
+      linker: linker,
+      typeSystem: typeSystem,
+      element3: element3,
+      arguments: arguments,
+      nullabilitySuffix: nullabilitySuffix,
       node: node,
     );
   }

pkg/analyzer/lib/src/summary2/reference_resolver.dart

@@ -471,11 +471,11 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {
       );
     } else {
       var builder = NamedTypeBuilder.of(
-        linker,
-        typeSystem,
-        node,
-        element,
-        nullabilitySuffix,
+        linker: linker,
+        typeSystem: typeSystem,
+        node: node,
+        element: element,
+        nullabilitySuffix: nullabilitySuffix,
       );
       node.type = builder;
       nodesToBuildType.addTypeBuilder(builder);