[cfe] Add introductory to SourceExtensionBuilder

Change-Id: I34966f96110b6101dbdf96571af12eba2b0e39d1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/389460
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/base/scope.dart

@@ -1474,7 +1474,7 @@ extension on Builder {
     // TODO(johnniwinther): Handle all cases here.
   }
 
-  bool _hasPatchAnnotation(List<MetadataBuilder>? metadata) {
+  bool _hasPatchAnnotation(Iterable<MetadataBuilder>? metadata) {
     if (metadata == null) {
       return false;
     }

pkg/front_end/lib/src/builder/extension_builder.dart

@@ -13,6 +13,9 @@ abstract class ExtensionBuilder implements DeclarationBuilder {
   /// The type of the on-clause of the extension declaration.
   TypeBuilder get onType;
 
+  /// Reference for the extension built by this builder.
+  Reference get reference;
+
   /// Return the [Extension] built by this builder.
   Extension get extension;
 

pkg/front_end/lib/src/dill/dill_extension_builder.dart

@@ -87,6 +87,9 @@ class DillExtensionBuilder extends ExtensionBuilderImpl
     }
   }
 
+  @override
+  Reference get reference => extension.reference;
+
   @override
   int get charOffset => extension.fileOffset;
 

pkg/front_end/lib/src/dill/dill_library_builder.dart

@@ -473,7 +473,7 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
                   reference == declaration.reference) ||
               (declaration is MemberBuilder && node == declaration.member) ||
               (declaration is ExtensionBuilder &&
-                  node == declaration.extension) ||
+                  reference == declaration.reference) ||
               (declaration is ExtensionTypeDeclarationBuilder &&
                   node == declaration.extensionTypeDeclaration),
           "Unexpected declaration ${declaration} (${declaration.runtimeType}) "

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

@@ -14,7 +14,6 @@ import '../builder/builder_mixins.dart';
 import '../builder/declaration_builders.dart';
 import '../builder/library_builder.dart';
 import '../builder/member_builder.dart';
-import '../builder/metadata_builder.dart';
 import '../builder/name_iterator.dart';
 import '../builder/procedure_builder.dart';
 import '../builder/type_builder.dart';
@@ -39,8 +38,6 @@ mixin SourceDeclarationBuilderMixin
   @override
   Uri get fileUri;
 
-  List<MetadataBuilder>? get metadata;
-
   /// Returns the [Annotatable] node that holds the annotations declared on
   /// this declaration or its augmentations.
   Annotatable get annotatable;
@@ -165,16 +162,6 @@ mixin SourceDeclarationBuilderMixin
 
   void buildOutlineExpressions(ClassHierarchy classHierarchy,
       List<DelayedDefaultValueCloner> delayedDefaultValueCloners) {
-    MetadataBuilder.buildAnnotations(
-        annotatable,
-        metadata,
-        createBodyBuilderContext(
-            inOutlineBuildingPhase: true,
-            inMetadata: true,
-            inConstFields: false),
-        libraryBuilder,
-        fileUri,
-        libraryBuilder.scope);
     if (typeParameters != null) {
       for (int i = 0; i < typeParameters!.length; i++) {
         typeParameters![i].buildOutlineExpressions(

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

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:kernel/ast.dart';
+import 'package:kernel/class_hierarchy.dart';
 
 import '../base/common.dart';
 import '../base/modifiers.dart';
@@ -19,7 +20,9 @@ import '../codes/cfe_codes.dart'
         messagePatchDeclarationMismatch,
         messagePatchDeclarationOrigin,
         noLength;
+import '../fragment/fragment.dart';
 import '../kernel/body_builder_context.dart';
+import '../kernel/kernel_helper.dart';
 import 'name_scheme.dart';
 import 'source_builder_mixins.dart';
 import 'source_library_builder.dart';
@@ -31,18 +34,14 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
   @override
   final SourceLibraryBuilder parent;
 
-  @override
-  final int charOffset;
+  final int _nameOffset;
 
   @override
   final Uri fileUri;
 
-  @override
-  final List<MetadataBuilder>? metadata;
-
   final Modifiers _modifiers;
 
-  final Extension _extension;
+  late final Extension _extension;
 
   SourceExtensionBuilder? _origin;
   SourceExtensionBuilder? augmentationForTesting;
@@ -68,35 +67,54 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
 
   final ExtensionName extensionName;
 
+  final Reference _reference;
+
+  /// The `extension` declaration that introduces this extension. Subsequent
+  /// extensions of the same name must be augmentations.
+  // TODO(johnniwinther): Add [_augmentations] field.
+  final ExtensionFragment _introductory;
+
   SourceExtensionBuilder(
-      {required this.metadata,
-      required Modifiers modifiers,
-      required this.extensionName,
-      required this.typeParameters,
-      required this.onType,
-      required this.typeParameterScope,
-      required DeclarationNameSpaceBuilder nameSpaceBuilder,
-      required SourceLibraryBuilder enclosingLibraryBuilder,
+      {required SourceLibraryBuilder enclosingLibraryBuilder,
       required this.fileUri,
       required int startOffset,
       required int nameOffset,
       required int endOffset,
+      required ExtensionFragment fragment,
       required Reference? reference})
-      : charOffset = nameOffset,
+      : _introductory = fragment,
+        _reference = reference ?? new Reference(),
+        _nameOffset = nameOffset,
         parent = enclosingLibraryBuilder,
-        _modifiers = modifiers,
-        _extension = new Extension(
-            name: extensionName.name,
-            fileUri: fileUri,
-            typeParameters: NominalVariableBuilder.typeParametersFromBuilders(
-                typeParameters),
-            reference: reference)
-          ..isUnnamedExtension = extensionName.isUnnamedExtension
-          ..fileOffset = nameOffset,
-        _nameSpaceBuilder = nameSpaceBuilder {
+        _modifiers = fragment.modifiers,
+        extensionName = fragment.extensionName,
+        typeParameters = fragment.typeParameters,
+        typeParameterScope = fragment.typeParameterScope,
+        onType = fragment.onType,
+        _nameSpaceBuilder = fragment.toDeclarationNameSpaceBuilder() {
+    _introductory.builder = this;
+    _introductory.bodyScope.declarationBuilder = this;
+
+    // TODO(johnniwinther): Move this to the [build] once augmentations are
+    // handled through fragments.
+    _extension = new Extension(
+        name: extensionName.name,
+        fileUri: fileUri,
+        typeParameters:
+            NominalVariableBuilder.typeParametersFromBuilders(typeParameters),
+        reference: _reference)
+      ..isUnnamedExtension = extensionName.isUnnamedExtension
+      ..fileOffset = _nameOffset;
     extensionName.attachExtension(_extension);
   }
 
+  // TODO(johnniwinther): Avoid exposing this. Annotations for macros and
+  //  patches should be computing from within the builder.
+  Iterable<MetadataBuilder>? get metadata => _introductory.metadata;
+
+  @override
+  int get charOffset => _nameOffset;
+
   @override
   String get name => extensionName.name;
 
@@ -162,11 +180,12 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
       : throw new UnimplementedError("SourceExtensionBuilder.mergedScope");
 
   @override
-  Extension get extension => isAugmenting
-      ?
-      // Coverage-ignore(suite): Not run.
-      origin._extension
-      : _extension;
+  Reference get reference => _reference;
+
+  @override
+  Extension get extension {
+    return isAugmenting ? origin.extension : _extension;
+  }
 
   @override
   BodyBuilderContext createBodyBuilderContext(
@@ -195,10 +214,26 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
     _extension.onType = onType.build(libraryBuilder, TypeUse.extensionOnType);
 
     buildInternal(coreLibrary, addMembersToLibrary: addMembersToLibrary);
-
     return _extension;
   }
 
+  @override
+  void buildOutlineExpressions(ClassHierarchy classHierarchy,
+      List<DelayedDefaultValueCloner> delayedDefaultValueCloners) {
+    MetadataBuilder.buildAnnotations(
+        annotatable,
+        _introductory.metadata,
+        createBodyBuilderContext(
+            inOutlineBuildingPhase: true,
+            inMetadata: true,
+            inConstFields: false),
+        libraryBuilder,
+        _introductory.fileUri,
+        libraryBuilder.scope);
+
+    super.buildOutlineExpressions(classHierarchy, delayedDefaultValueCloners);
+  }
+
   @override
   // Coverage-ignore(suite): Not run.
   void addMemberInternal(SourceMemberBuilder memberBuilder,
@@ -263,11 +298,11 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
   }
 
   @override
-  // Coverage-ignore(suite): Not run.
   void applyAugmentation(Builder augmentation) {
     if (augmentation is SourceExtensionBuilder) {
       augmentation._origin = this;
       if (retainDataForTesting) {
+        // Coverage-ignore-block(suite): Not run.
         augmentationForTesting = augmentation;
       }
       // TODO(johnniwinther): Check that type parameters and on-type match
@@ -280,14 +315,17 @@ class SourceExtensionBuilder extends ExtensionBuilderImpl
           member.applyAugmentation(memberAugmentation);
         }
       });
-      nameSpace.forEachLocalSetter((String name, Builder member) {
+      nameSpace.forEachLocalSetter(
+          // Coverage-ignore(suite): Not run.
+          (String name, Builder member) {
         Builder? memberAugmentation =
             augmentation.nameSpace.lookupLocalMember(name, setter: true);
         if (memberAugmentation != null) {
           member.applyAugmentation(memberAugmentation);
         }
       });
     } else {
+      // Coverage-ignore-block(suite): Not run.
       libraryBuilder.addProblem(messagePatchDeclarationMismatch,
           augmentation.charOffset, noLength, augmentation.fileUri, context: [
         messagePatchDeclarationOrigin.withLocation(

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

@@ -61,7 +61,8 @@ class SourceExtensionTypeDeclarationBuilder
   @override
   final Uri fileUri;
 
-  @override
+  // TODO(johnniwinther): Avoid exposing this. Annotations for macros and
+  //  patches should be computing from within the builder.
   final List<MetadataBuilder>? metadata;
 
   final Modifiers _modifiers;
@@ -722,6 +723,17 @@ class SourceExtensionTypeDeclarationBuilder
   @override
   void buildOutlineExpressions(ClassHierarchy classHierarchy,
       List<DelayedDefaultValueCloner> delayedDefaultValueCloners) {
+    MetadataBuilder.buildAnnotations(
+        annotatable,
+        metadata,
+        createBodyBuilderContext(
+            inOutlineBuildingPhase: true,
+            inMetadata: true,
+            inConstFields: false),
+        libraryBuilder,
+        fileUri,
+        libraryBuilder.scope);
+
     super.buildOutlineExpressions(classHierarchy, delayedDefaultValueCloners);
 
     Iterator<SourceMemberBuilder> iterator =

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

@@ -763,7 +763,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
             case TypeAliasBuilder():
               library.additionalExports.add(builder.reference);
             case ExtensionBuilder():
-              library.additionalExports.add(builder.extension.reference);
+              library.additionalExports.add(builder.reference);
             case ExtensionTypeDeclarationBuilder():
               library.additionalExports
                   .add(builder.extensionTypeDeclaration.reference);

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

@@ -52,7 +52,10 @@ class SourceTypeAliasBuilder extends TypeAliasBuilderImpl {
   @override
   Map<Name, Procedure>? tearOffs;
 
-  TypedefFragment _introductory;
+  /// The `typedef` declaration that introduces this typedef. Subsequent
+  /// typedefs of the same name must be augmentations.
+  // TODO(johnniwinther): Add [_augmentations] field.
+  final TypedefFragment _introductory;
 
   SourceTypeAliasBuilder(
       {required this.name,

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

@@ -268,21 +268,13 @@ class _Added {
           reference = indexedLibrary?.lookupExtension(fragment.name);
         }
         SourceExtensionBuilder extensionBuilder = new SourceExtensionBuilder(
-            metadata: fragment.metadata,
-            modifiers: fragment.modifiers,
-            extensionName: fragment.extensionName,
-            typeParameters: fragment.typeParameters,
-            onType: fragment.onType,
-            typeParameterScope: fragment.typeParameterScope,
-            nameSpaceBuilder: fragment.toDeclarationNameSpaceBuilder(),
             enclosingLibraryBuilder: enclosingLibraryBuilder,
             fileUri: fragment.fileUri,
             startOffset: fragment.startOffset,
             nameOffset: fragment.nameOffset,
             endOffset: fragment.endOffset,
+            fragment: fragment,
             reference: reference);
-        fragment.builder = extensionBuilder;
-        fragment.bodyScope.declarationBuilder = extensionBuilder;
         builders.add(new _AddBuilder(fragment.name, extensionBuilder,
             fragment.fileUri, fragment.fileOffset));
         if (reference != null) {