[cfe] Remove SourceFunctionBuilderImpl and merge SourceFactoryBuilder and RedirectingFactoryBuilder

This is in preparation for creating factories through fragments.

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

Author: johnniwinther

pkg/front_end/lib/src/fragment/getter.dart

@@ -450,7 +450,6 @@ mixin _DirectGetterEncodingMixin implements _GetterEncoding {
   }
 
   @override
-  // Coverage-ignore(suite): Not run.
   List<NominalParameterBuilder>? get clonedAndDeclaredTypeParameters =>
       _fragment.declaredTypeParameters;
 
@@ -742,7 +741,6 @@ mixin _ExtensionInstanceGetterEncodingMixin implements _GetterEncoding {
   }
 
   @override
-  // Coverage-ignore(suite): Not run.
   List<NominalParameterBuilder>? get clonedAndDeclaredTypeParameters =>
       _clonedDeclarationTypeParameters != null ||
               _fragment.declaredTypeParameters != null

pkg/front_end/lib/src/fragment/method.dart

@@ -575,7 +575,6 @@ mixin _DirectMethodEncodingMixin implements _MethodEncoding {
   }
 
   @override
-  // Coverage-ignore(suite): Not run.
   List<NominalParameterBuilder>? get clonedAndDeclaredTypeParameters =>
       _fragment.declaredTypeParameters;
 
@@ -1093,7 +1092,6 @@ mixin _ExtensionInstanceMethodEncodingMixin implements _MethodEncoding {
   }
 
   @override
-  // Coverage-ignore(suite): Not run.
   List<NominalParameterBuilder>? get clonedAndDeclaredTypeParameters =>
       _clonedDeclarationTypeParameters != null ||
               _fragment.declaredTypeParameters != null

pkg/front_end/lib/src/fragment/setter.dart

@@ -455,7 +455,6 @@ mixin _DirectSetterEncodingMixin implements _SetterEncoding {
   }
 
   @override
-  // Coverage-ignore(suite): Not run.
   List<NominalParameterBuilder>? get clonedAndDeclaredTypeParameters =>
       _fragment.declaredTypeParameters;
 
@@ -759,7 +758,6 @@ mixin _ExtensionInstanceSetterEncodingMixin implements _SetterEncoding {
       _fragment.declaredFormals![index].variable!;
 
   @override
-  // Coverage-ignore(suite): Not run.
   List<NominalParameterBuilder>? get clonedAndDeclaredTypeParameters =>
       _clonedDeclarationTypeParameters != null ||
               _fragment.declaredTypeParameters != null

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

@@ -943,10 +943,10 @@ class FactoryBodyBuilderContext extends BodyBuilderContext
 
 class RedirectingFactoryBodyBuilderContext extends BodyBuilderContext
     with
-        _MemberBodyBuilderContext<RedirectingFactoryBuilder>,
-        _FunctionBodyBuilderContextMixin<RedirectingFactoryBuilder> {
+        _MemberBodyBuilderContext<SourceFactoryBuilder>,
+        _FunctionBodyBuilderContextMixin<SourceFactoryBuilder> {
   @override
-  final RedirectingFactoryBuilder _member;
+  final SourceFactoryBuilder _member;
 
   @override
   final Member _builtMember;
@@ -960,7 +960,7 @@ class RedirectingFactoryBodyBuilderContext extends BodyBuilderContext
 
   @override
   String get redirectingFactoryTargetName {
-    return _member.redirectionTarget.fullNameForErrors;
+    return _member.redirectionTarget!.fullNameForErrors;
   }
 }
 

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

@@ -106,11 +106,12 @@ mixin ClassDeclarationMixin implements ClassDeclaration {
           unexpected("$fileUri", "${declaration.declarationBuilder!.fileUri}",
               fileOffset, fileUri);
         }
-        if (declaration is RedirectingFactoryBuilder) {
+        if (declaration is SourceFactoryBuilder &&
+            declaration.redirectionTarget != null) {
           // Compute the immediate redirection target, not the effective.
 
           ConstructorReferenceBuilder redirectionTarget =
-              declaration.redirectionTarget;
+              declaration.redirectionTarget!;
           List<TypeBuilder>? typeArguments = redirectionTarget.typeArguments;
           Builder? target = redirectionTarget.target;
           if (typeArguments != null && target is MemberBuilder) {
@@ -192,7 +193,8 @@ mixin ClassDeclarationMixin implements ClassDeclaration {
             targetNode = null;
           }
           if (targetNode != null) {
-            List<DartType>? typeArguments = declaration.typeArguments;
+            List<DartType>? typeArguments =
+                declaration.redirectionTypeArguments;
             if (typeArguments == null) {
               int typeArgumentCount;
               if (targetBuilder!.isExtensionTypeMember) {