[cfe] Create factories through fragments

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

Author: johnniwinther

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

@@ -76,7 +76,17 @@ class _FactoryBodyBuildingContext implements FunctionBodyBuildingContext {
 
   @override
   LocalScope computeFormalParameterScope(LookupScope typeParameterScope) {
-    return _fragment.builder.computeFormalParameterScope(typeParameterScope);
+    if (_fragment.formals == null) {
+      return new FormalParameterScope(parent: typeParameterScope);
+    }
+    Map<String, Builder> local = <String, Builder>{};
+    for (FormalParameterBuilder formal in _fragment.formals!) {
+      if (formal.isWildcard) {
+        continue;
+      }
+      local[formal.name] = formal;
+    }
+    return new FormalParameterScope(local: local, parent: typeParameterScope);
   }
 
   @override

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

@@ -24,7 +24,6 @@ import '../source/source_constructor_builder.dart';
 import '../source/source_enum_builder.dart';
 import '../source/source_extension_builder.dart';
 import '../source/source_extension_type_declaration_builder.dart';
-import '../source/source_factory_builder.dart';
 import '../source/source_function_builder.dart';
 import '../source/source_library_builder.dart';
 import '../source/source_member_builder.dart';
@@ -759,11 +758,6 @@ mixin _FunctionBodyBuilderContextMixin<T extends SourceFunctionBuilder>
   @override
   List<FormalParameterBuilder>? get formals => _member.formals;
 
-  @override
-  LocalScope computeFormalParameterInitializerScope(LocalScope parent) {
-    return _member.computeFormalParameterInitializerScope(parent);
-  }
-
   @override
   FormalParameterBuilder? getFormalParameterByName(Identifier name) {
     return _member.getFormal(name);
@@ -872,6 +866,11 @@ class ConstructorBodyBuilderContext extends BodyBuilderContext
       : super(_member.libraryBuilder, _member.declarationBuilder,
             isDeclarationInstanceMember: _member.isDeclarationInstanceMember);
 
+  @override
+  LocalScope computeFormalParameterInitializerScope(LocalScope parent) {
+    return _member.computeFormalParameterInitializerScope(parent);
+  }
+
   @override
   void setBody(Statement body) {
     _member.body = body;
@@ -907,6 +906,11 @@ class ExtensionTypeConstructorBodyBuilderContext extends BodyBuilderContext
       : super(_member.libraryBuilder, _member.declarationBuilder,
             isDeclarationInstanceMember: _member.isDeclarationInstanceMember);
 
+  @override
+  LocalScope computeFormalParameterInitializerScope(LocalScope parent) {
+    return _member.computeFormalParameterInitializerScope(parent);
+  }
+
   @override
   void setBody(Statement body) {
     _member.body = body;
@@ -921,65 +925,6 @@ class ExtensionTypeConstructorBodyBuilderContext extends BodyBuilderContext
   TreeNode get _initializerParent => _member.invokeTarget;
 }
 
-class FactoryBodyBuilderContext extends BodyBuilderContext
-    with
-        _MemberBodyBuilderContext<SourceFactoryBuilder>,
-        _FunctionBodyBuilderContextMixin<SourceFactoryBuilder> {
-  @override
-  final SourceFactoryBuilder _member;
-
-  @override
-  final Member _builtMember;
-
-  FactoryBodyBuilderContext(this._member, this._builtMember)
-      : super(_member.libraryBuilder, _member.declarationBuilder,
-            isDeclarationInstanceMember: _member.isDeclarationInstanceMember);
-
-  @override
-  void setBody(Statement body) {
-    _member.setBody(body);
-  }
-
-  @override
-  void setAsyncModifier(AsyncMarker asyncModifier) {
-    _member.asyncModifier = asyncModifier;
-  }
-
-  @override
-  DartType get returnTypeContext {
-    return _member.function.returnType;
-  }
-}
-
-class RedirectingFactoryBodyBuilderContext extends BodyBuilderContext
-    with
-        _MemberBodyBuilderContext<SourceFactoryBuilder>,
-        _FunctionBodyBuilderContextMixin<SourceFactoryBuilder> {
-  @override
-  final SourceFactoryBuilder _member;
-
-  @override
-  final Member _builtMember;
-
-  RedirectingFactoryBodyBuilderContext(this._member, this._builtMember)
-      : 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;
-
-  @override
-  String get redirectingFactoryTargetName {
-    return _member.redirectionTarget!.fullNameForErrors;
-  }
-}
-
 class ParameterBodyBuilderContext extends BodyBuilderContext {
   factory ParameterBodyBuilderContext(
       LibraryBuilder libraryBuilder,

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

@@ -99,7 +99,7 @@ mixin ClassDeclarationMixin implements ClassDeclaration {
               fileOffset, fileUri);
         }
         if (declaration is SourceFactoryBuilder) {
-          declaration.resolveRedirectingFactory(this);
+          declaration.resolveRedirectingFactory();
         }
       }
     }

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

@@ -175,7 +175,6 @@ abstract class AbstractSourceConstructorBuilder extends SourceMemberBuilderImpl
   /// of a augmented member or by not being the last among augmentations.
   bool get isAugmented;
 
-  @override
   LocalScope computeFormalParameterScope(LookupScope parent) {
     if (formals == null) return new FormalParameterScope(parent: parent);
     Map<String, Builder> local = <String, Builder>{};
@@ -191,7 +190,6 @@ abstract class AbstractSourceConstructorBuilder extends SourceMemberBuilderImpl
     return new FormalParameterScope(local: local, parent: parent);
   }
 
-  @override
   LocalScope computeFormalParameterInitializerScope(LocalScope parent) {
     // From
     // [dartLangSpec.tex](../../../../../../docs/language/dartLangSpec.tex) at