[cfe] Cleanup SourceFactoryBuilder

This removes unnecessary code from SourceFactoryBuilder previous inherited from SourceFunctionBuilderImpl.

Redirecting factory specific is moved fully inside SourceFactoryBuilder and most method are made private.

This is in preparation for creating factory builders using fragments.

Change-Id: I273b3c360fb51a7c1533f14d267c7f6aae949d19
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406001
Reviewed-by: Chloe Stefantsova <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/kernel/body_builder_context.dart

@@ -756,11 +756,6 @@ mixin _FunctionBodyBuilderContextMixin<T extends SourceFunctionBuilder>
   @override
   TypeBuilder get returnType => _member.returnType;
 
-  @override
-  void setBody(Statement body) {
-    _member.body = body;
-  }
-
   @override
   List<FormalParameterBuilder>? get formals => _member.formals;
 
@@ -877,6 +872,11 @@ class ConstructorBodyBuilderContext extends BodyBuilderContext
       : super(_member.libraryBuilder, _member.declarationBuilder,
             isDeclarationInstanceMember: _member.isDeclarationInstanceMember);
 
+  @override
+  void setBody(Statement body) {
+    _member.body = body;
+  }
+
   @override
   bool isConstructorCyclic(String name) {
     return _declarationContext.isConstructorCyclic(_member.name, name);
@@ -907,6 +907,11 @@ class ExtensionTypeConstructorBodyBuilderContext extends BodyBuilderContext
       : super(_member.libraryBuilder, _member.declarationBuilder,
             isDeclarationInstanceMember: _member.isDeclarationInstanceMember);
 
+  @override
+  void setBody(Statement body) {
+    _member.body = body;
+  }
+
   @override
   bool isConstructorCyclic(String name) {
     return _declarationContext.isConstructorCyclic(_member.name, name);
@@ -930,6 +935,11 @@ class FactoryBodyBuilderContext extends BodyBuilderContext
       : super(_member.libraryBuilder, _member.declarationBuilder,
             isDeclarationInstanceMember: _member.isDeclarationInstanceMember);
 
+  @override
+  void setBody(Statement body) {
+    _member.setBody(body);
+  }
+
   @override
   void setAsyncModifier(AsyncMarker asyncModifier) {
     _member.asyncModifier = asyncModifier;
@@ -955,6 +965,12 @@ class RedirectingFactoryBodyBuilderContext extends BodyBuilderContext
       : super(_member.libraryBuilder, _member.declarationBuilder,
             isDeclarationInstanceMember: _member.isDeclarationInstanceMember);
 
+  @override
+  // Coverage-ignore(suite): Not run.
+  void setBody(Statement body) {
+    _member.setBody(body);
+  }
+
   @override
   bool get isRedirectingFactory => true;
 

pkg/front_end/lib/src/source/class_declaration.dart

@@ -2,20 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:kernel/ast.dart';
-
 import '../base/problems.dart';
-import '../base/scope.dart';
 import '../builder/builder.dart';
 import '../builder/constructor_reference_builder.dart';
 import '../builder/declaration_builders.dart';
-import '../builder/function_builder.dart';
 import '../builder/member_builder.dart';
 import '../builder/name_iterator.dart';
-import '../builder/type_builder.dart';
-import '../codes/cfe_codes.dart';
-import '../dill/dill_member_builder.dart';
-import '../type_inference/type_schema.dart';
 import 'source_factory_builder.dart';
 import 'source_library_builder.dart';
 
@@ -106,112 +98,8 @@ mixin ClassDeclarationMixin implements ClassDeclaration {
           unexpected("$fileUri", "${declaration.declarationBuilder!.fileUri}",
               fileOffset, fileUri);
         }
-        if (declaration is SourceFactoryBuilder &&
-            declaration.redirectionTarget != null) {
-          // Compute the immediate redirection target, not the effective.
-
-          ConstructorReferenceBuilder redirectionTarget =
-              declaration.redirectionTarget!;
-          List<TypeBuilder>? typeArguments = redirectionTarget.typeArguments;
-          Builder? target = redirectionTarget.target;
-          if (typeArguments != null && target is MemberBuilder) {
-            TypeName redirectionTargetName = redirectionTarget.typeName;
-            if (redirectionTargetName.qualifier == null) {
-              // Do nothing. This is the case of an identifier followed by
-              // type arguments, such as the following:
-              //   B<T>
-              //   B<T>.named
-            } else {
-              if (target.name.isEmpty) {
-                // Do nothing. This is the case of a qualified
-                // non-constructor prefix (for example, with a library
-                // qualifier) followed by type arguments, such as the
-                // following:
-                //   lib.B<T>
-              } else if (target.name != redirectionTargetName.name) {
-                // Do nothing. This is the case of a qualified
-                // non-constructor prefix followed by type arguments followed
-                // by a constructor name, such as the following:
-                //   lib.B<T>.named
-              } else {
-                // TODO(cstefantsova,johnniwinther): Handle this in case in
-                // ConstructorReferenceBuilder.resolveIn and unify with other
-                // cases of handling of type arguments after constructor
-                // names.
-                addProblem(
-                    messageConstructorWithTypeArguments,
-                    redirectionTargetName.nameOffset,
-                    redirectionTargetName.nameLength);
-              }
-            }
-          }
-
-          Builder? targetBuilder = redirectionTarget.target;
-          Member? targetNode;
-          if (targetBuilder is FunctionBuilder) {
-            targetNode = targetBuilder.invokeTarget!;
-          } else if (targetBuilder is DillMemberBuilder) {
-            targetNode = targetBuilder.invokeTarget!;
-          } else if (targetBuilder is AmbiguousBuilder) {
-            libraryBuilder.addProblemForRedirectingFactory(
-                declaration,
-                templateDuplicatedDeclarationUse
-                    .withArguments(redirectionTarget.fullNameForErrors),
-                redirectionTarget.charOffset,
-                noLength,
-                redirectionTarget.fileUri);
-          } else {
-            libraryBuilder.addProblemForRedirectingFactory(
-                declaration,
-                templateRedirectionTargetNotFound
-                    .withArguments(redirectionTarget.fullNameForErrors),
-                redirectionTarget.charOffset,
-                noLength,
-                redirectionTarget.fileUri);
-          }
-          if (targetNode != null &&
-              targetNode is Constructor &&
-              targetNode.enclosingClass.isAbstract) {
-            libraryBuilder.addProblemForRedirectingFactory(
-                declaration,
-                templateAbstractRedirectedClassInstantiation
-                    .withArguments(redirectionTarget.fullNameForErrors),
-                redirectionTarget.charOffset,
-                noLength,
-                redirectionTarget.fileUri);
-            targetNode = null;
-          }
-          if (targetNode != null &&
-              targetNode is Constructor &&
-              targetNode.enclosingClass.isEnum) {
-            libraryBuilder.addProblemForRedirectingFactory(
-                declaration,
-                messageEnumFactoryRedirectsToConstructor,
-                redirectionTarget.charOffset,
-                noLength,
-                redirectionTarget.fileUri);
-            targetNode = null;
-          }
-          if (targetNode != null) {
-            List<DartType>? typeArguments =
-                declaration.redirectionTypeArguments;
-            if (typeArguments == null) {
-              int typeArgumentCount;
-              if (targetBuilder!.isExtensionTypeMember) {
-                ExtensionTypeDeclarationBuilder
-                    extensionTypeDeclarationBuilder =
-                    targetBuilder.parent as ExtensionTypeDeclarationBuilder;
-                typeArgumentCount =
-                    extensionTypeDeclarationBuilder.typeParametersCount;
-              } else {
-                typeArgumentCount =
-                    targetNode.enclosingClass!.typeParameters.length;
-              }
-              typeArguments = new List<DartType>.filled(
-                  typeArgumentCount, const UnknownType());
-            }
-            declaration.setRedirectingFactoryBody(targetNode, typeArguments);
-          }
+        if (declaration is SourceFactoryBuilder) {
+          declaration.resolveRedirectingFactory(this);
         }
       }
     }

pkg/front_end/lib/src/source/source_constructor_builder.dart

@@ -259,7 +259,6 @@ abstract class AbstractSourceConstructorBuilder extends SourceMemberBuilderImpl
 
   Statement? bodyInternal;
 
-  @override
   void set body(Statement? newBody) {
 //    if (newBody != null) {
 //      if (isAbstract) {
@@ -457,7 +456,6 @@ abstract class AbstractSourceConstructorBuilder extends SourceMemberBuilderImpl
   @override
   bool get isConstructor => true;
 
-  @override
   Statement? get body {
     if (bodyInternal == null && !isExternal) {
       bodyInternal = new EmptyStatement();