[cfe] Handle patches as parts

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

Author: johnniwinther

pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart

@@ -15370,6 +15370,28 @@ const MessageCode messagePatchDeclarationOrigin = const MessageCode(
   problemMessage: r"""This is the origin declaration.""",
 );
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codePatchExtensionOrigin = messagePatchExtensionOrigin;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messagePatchExtensionOrigin = const MessageCode(
+  "PatchExtensionOrigin",
+  severity: Severity.context,
+  problemMessage: r"""This is the origin extension.""",
+);
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codePatchExtensionTypeParametersMismatch =
+    messagePatchExtensionTypeParametersMismatch;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messagePatchExtensionTypeParametersMismatch =
+    const MessageCode(
+  "PatchExtensionTypeParametersMismatch",
+  problemMessage:
+      r"""A patch extension must have the same number of type variables as its origin extension.""",
+);
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Template<Message Function(String name, Uri uri_)>
     templatePatchInjectionFailed =

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

@@ -1635,7 +1635,6 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
     List<Library> removedLibraries = <Library>[];
     bool removedDillBuilders = false;
     for (Uri uri in potentiallyReferencedLibraries.keys) {
-      // Coverage-ignore-block(suite): Not run.
       if (uri.isScheme("package")) continue;
       LibraryBuilder? builder =
           currentKernelTarget.loader.deregisterLoadedLibraryBuilder(uri);
@@ -1655,12 +1654,13 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
         _componentProblems.removeLibrary(lib, uriTranslator, partsUsed);
 
         // Technically this isn't necessary as the uri is not a package-uri.
-        _incrementalSerializer?.invalidate(builder.fileUri);
+        _incrementalSerializer
+            // Coverage-ignore(suite): Not run.
+            ?.invalidate(builder.fileUri);
       }
     }
     hierarchy.applyTreeChanges(removedLibraries, const [], const []);
     if (removedDillBuilders) {
-      // Coverage-ignore-block(suite): Not run.
       _makeDillLoaderLibrariesUpToDateWithBuildersMap();
     }
 
@@ -1693,7 +1693,6 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
       [Map<Uri, Source>? uriToSourceExtra,
       Set<Uri?>? partsUsed]) {
     uriToSource.remove(builder.fileUri);
-    // Coverage-ignore(suite): Not run.
     uriToSourceExtra?.remove(builder.fileUri);
     Library lib = builder.library;
     for (LibraryPart part in lib.parts) {

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

@@ -1237,6 +1237,7 @@ abstract class MergedScope<T extends Builder> {
 
   SourceLibraryBuilder get originLibrary;
 
+  // Coverage-ignore(suite): Not run.
   void _addBuilderToMergedScope(
       String name, Builder newBuilder, Builder? existingBuilder,
       {required bool setter, required bool inPatchLibrary}) {
@@ -1276,7 +1277,6 @@ abstract class MergedScope<T extends Builder> {
                 ? templateNonPatchLibraryConflict.withArguments(name)
                 : templateNonAugmentationLibraryConflict.withArguments(name);
           } else {
-            // Coverage-ignore-block(suite): Not run.
             message = inPatchLibrary
                 ? templateNonPatchClassMemberConflict.withArguments(name)
                 : templateNonAugmentationClassMemberConflict
@@ -1312,9 +1312,7 @@ abstract class MergedScope<T extends Builder> {
         } else {
           message = inPatchLibrary
               ? templateUnmatchedPatchDeclaration.withArguments(name)
-              :
-              // Coverage-ignore(suite): Not run.
-              templateUnmatchedAugmentationDeclaration.withArguments(name);
+              : templateUnmatchedAugmentationDeclaration.withArguments(name);
         }
         originLibrary.addProblem(
             message, newBuilder.fileOffset, name.length, newBuilder.fileUri);
@@ -1351,6 +1349,7 @@ abstract class MergedScope<T extends Builder> {
     if (augmentationMember == null) {
       augmentationNameSpace.addLocalMember(name, member, setter: setter);
       if (member is ExtensionBuilder) {
+        // Coverage-ignore-block(suite): Not run.
         augmentationNameSpace.addExtension(member);
       }
     }
@@ -1364,7 +1363,9 @@ abstract class MergedScope<T extends Builder> {
     // `scope.forEachLocalMember`/`scope.forEachLocalSetter`.
 
     // Include all augmentation scope members to the origin scope.
-    nameSpace.forEachLocalMember((String name, Builder member) {
+    nameSpace.forEachLocalMember(
+        // Coverage-ignore(suite): Not run.
+        (String name, Builder member) {
       // In case of duplicates we use the first declaration.
       while (member.isDuplicate) {
         member = member.next!;
@@ -1374,6 +1375,7 @@ abstract class MergedScope<T extends Builder> {
           setter: false, inPatchLibrary: inPatchLibrary);
     });
     if (augmentations != null) {
+      // Coverage-ignore-block(suite): Not run.
       for (String augmentedName in augmentations.keys) {
         for (Builder augmentation in augmentations[augmentedName]!) {
           _addBuilderToMergedScope(augmentedName, augmentation,
@@ -1382,7 +1384,9 @@ abstract class MergedScope<T extends Builder> {
         }
       }
     }
-    nameSpace.forEachLocalSetter((String name, Builder member) {
+    nameSpace.forEachLocalSetter(
+        // Coverage-ignore(suite): Not run.
+        (String name, Builder member) {
       // In case of duplicates we use the first declaration.
       while (member.isDuplicate) {
         member = member.next!;
@@ -1392,6 +1396,7 @@ abstract class MergedScope<T extends Builder> {
           setter: true, inPatchLibrary: inPatchLibrary);
     });
     if (setterAugmentations != null) {
+      // Coverage-ignore-block(suite): Not run.
       for (String augmentedName in setterAugmentations.keys) {
         for (Builder augmentation in setterAugmentations[augmentedName]!) {
           _addBuilderToMergedScope(augmentedName, augmentation,
@@ -1400,7 +1405,9 @@ abstract class MergedScope<T extends Builder> {
         }
       }
     }
-    nameSpace.forEachLocalExtension((ExtensionBuilder extensionBuilder) {
+    nameSpace.forEachLocalExtension(
+        // Coverage-ignore(suite): Not run.
+        (ExtensionBuilder extensionBuilder) {
       if (extensionBuilder is SourceExtensionBuilder &&
           extensionBuilder.isUnnamedExtension) {
         _originNameSpace.addExtension(extensionBuilder);
@@ -1420,7 +1427,9 @@ abstract class MergedScope<T extends Builder> {
       _addBuilderToAugmentationNameSpace(nameSpace, name, originMember,
           setter: true);
     });
-    _originNameSpace.forEachLocalExtension((ExtensionBuilder extensionBuilder) {
+    _originNameSpace.forEachLocalExtension(
+        // Coverage-ignore(suite): Not run.
+        (ExtensionBuilder extensionBuilder) {
       if (extensionBuilder is SourceExtensionBuilder &&
           extensionBuilder.isUnnamedExtension) {
         nameSpace.addExtension(extensionBuilder);
@@ -1433,6 +1442,7 @@ abstract class MergedScope<T extends Builder> {
   bool _allowInjectedPublicMember(Builder newBuilder);
 }
 
+// Coverage-ignore(suite): Not run.
 class MergedLibraryScope extends MergedScope<SourceLibraryBuilder> {
   MergedLibraryScope(SourceLibraryBuilder origin)
       : super(origin, origin.libraryNameSpace);
@@ -1464,11 +1474,14 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
         super(origin, origin.nameSpace);
 
   @override
+  // Coverage-ignore(suite): Not run.
   SourceLibraryBuilder get originLibrary => _origin.libraryBuilder;
 
   void _addAugmentationConstructorScope(DeclarationNameSpace nameSpace,
       {required bool inPatchLibrary}) {
-    nameSpace.forEachConstructor((String name, MemberBuilder newConstructor) {
+    nameSpace.forEachConstructor(
+        // Coverage-ignore(suite): Not run.
+        (String name, MemberBuilder newConstructor) {
       MemberBuilder? existingConstructor =
           _originConstructorNameSpace.lookupConstructor(name);
       bool isAugmentationBuilder = inPatchLibrary
@@ -1483,9 +1496,7 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
               inPatchLibrary
                   ? templateNonPatchConstructorConflict
                       .withArguments(newConstructor.fullNameForErrors)
-                  :
-                  // Coverage-ignore(suite): Not run.
-                  templateNonAugmentationConstructorConflict
+                  : templateNonAugmentationConstructorConflict
                       .withArguments(newConstructor.fullNameForErrors),
               newConstructor.fileOffset,
               noLength,
@@ -1503,9 +1514,7 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
               inPatchLibrary
                   ? templateUnmatchedPatchConstructor
                       .withArguments(newConstructor.fullNameForErrors)
-                  :
-                  // Coverage-ignore(suite): Not run.
-                  templateUnmatchedAugmentationConstructor
+                  : templateUnmatchedAugmentationConstructor
                       .withArguments(newConstructor.fullNameForErrors),
               newConstructor.fileOffset,
               noLength,
@@ -1514,15 +1523,13 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
           _originConstructorNameSpace.addConstructor(name, newConstructor);
           for (DeclarationNameSpace augmentationConstructorNameSpace
               in _augmentationConstructorNameSpaces.values) {
-            // Coverage-ignore-block(suite): Not run.
             _addConstructorToAugmentationScope(
                 augmentationConstructorNameSpace, name, newConstructor);
           }
         }
         if (inPatchLibrary &&
             !name.startsWith('_') &&
             !_allowInjectedPublicMember(newConstructor)) {
-          // Coverage-ignore-block(suite): Not run.
           originLibrary.addProblem(
               templatePatchInjectionFailed.withArguments(
                   name, originLibrary.importUri),
@@ -1561,13 +1568,13 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
   }
 
   @override
+  // Coverage-ignore(suite): Not run.
   bool _allowInjectedPublicMember(Builder newBuilder) {
     if (originLibrary.importUri.isScheme("dart") &&
         originLibrary.importUri.path.startsWith("_")) {
       return true;
     }
     if (newBuilder.isStatic) {
-      // Coverage-ignore-block(suite): Not run.
       return _origin.name.startsWith('_');
     }
     // TODO(johnniwinther): Restrict the use of injected public class members.
@@ -1576,10 +1583,10 @@ class MergedClassMemberScope extends MergedScope<SourceClassBuilder> {
 }
 
 extension on Builder {
+  // Coverage-ignore(suite): Not run.
   bool get isAugmentation {
     Builder self = this;
     if (self is SourceLibraryBuilder) {
-      // Coverage-ignore-block(suite): Not run.
       return self.isAugmentationLibrary;
     } else if (self is SourceClassBuilder) {
       return self.isAugmentation;
@@ -1602,6 +1609,7 @@ extension on Builder {
     return false;
   }
 
+  // Coverage-ignore(suite): Not run.
   void set isConflictingAugmentationMember(bool value) {
     Builder self = this;
     if (self is SourceMemberBuilder) {
@@ -1612,6 +1620,7 @@ extension on Builder {
     // TODO(johnniwinther): Handle all cases here.
   }
 
+  // Coverage-ignore(suite): Not run.
   bool _hasPatchAnnotation(Iterable<MetadataBuilder>? metadata) {
     if (metadata == null) {
       return false;
@@ -1624,6 +1633,7 @@ extension on Builder {
     return false;
   }
 
+  // Coverage-ignore(suite): Not run.
   bool get hasPatchAnnotation {
     Builder self = this;
     if (self is SourceFunctionBuilder) {
@@ -1636,9 +1646,7 @@ extension on Builder {
       return _hasPatchAnnotation(self.metadata);
     } else if (self is SourceMethodBuilder) {
       return _hasPatchAnnotation(self.metadata);
-    }
-    // Coverage-ignore(suite): Not run.
-    else if (self is SourceExtensionTypeDeclarationBuilder) {
+    } else if (self is SourceExtensionTypeDeclarationBuilder) {
       return _hasPatchAnnotation(self.metadata);
     }
     return false;

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

@@ -248,6 +248,10 @@ abstract class Builder {
 
   bool get isTypeParameter;
 
+  /// Adds [augmentation] to this declaration.
+  // TODO(johnniwinther): Remove this augmentations are based on fragments.
+  void addAugmentation(Builder augmentation);
+
   /// Applies [augmentation] to this declaration.
   void applyAugmentation(Builder augmentation);
 
@@ -354,6 +358,12 @@ abstract class BuilderImpl implements Builder {
   @override
   bool get isTypeParameter => false;
 
+  @override
+  // Coverage-ignore(suite): Not run.
+  void addAugmentation(Builder augmentation) {
+    unsupported("${runtimeType}.addAugmentation", fileOffset, fileUri);
+  }
+
   @override
   // Coverage-ignore(suite): Not run.
   void applyAugmentation(Builder augmentation) {

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

@@ -207,6 +207,7 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
           forStaticAccess: true);
     }
     if (declaration == null && isAugmenting) {
+      // Coverage-ignore-block(suite): Not run.
       return origin.findStaticBuilder(
           name, fileOffset, fileUri, accessingLibrary,
           isSetter: isSetter);

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

@@ -73,6 +73,7 @@ abstract class DeclarationBuilderImpl extends TypeDeclarationBuilderImpl
     MemberBuilder? declaration =
         nameSpace.lookupConstructor(name == 'new' ? '' : name);
     if (declaration == null && isAugmenting) {
+      // Coverage-ignore-block(suite): Not run.
       return origin.findConstructorOrFactory(
           name, charOffset, uri, accessingLibrary);
     }

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

@@ -221,7 +221,8 @@ abstract class SourceCompilationUnit
       LibraryNameSpaceBuilder libraryNameSpaceBuilder,
       SourceCompilationUnit parentCompilationUnit,
       List<SourceCompilationUnit> includedParts,
-      Set<Uri> usedParts);
+      Set<Uri> usedParts,
+      {required bool allowPartInParts});
 
   void buildOutlineExpressions(
       Annotatable annotatable, BodyBuilderContext bodyBuilderContext,
@@ -234,6 +235,10 @@ abstract class SourceCompilationUnit
   Message reportFeatureNotEnabled(
       LibraryFeature feature, Uri fileUri, int charOffset, int length);
 
+  /// Registers that [augmentation] is a part of the library for which this is
+  /// the main compilation unit.
+  void registerAugmentation(CompilationUnit augmentation);
+
   /// Reports [message] on all compilation units that access this compilation
   /// unit.
   void addProblemAtAccessors(Message message);

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

@@ -88,10 +88,6 @@ class SynthesizedTypeBuilder extends FixedTypeBuilder {
     DartType type = _typeBuilder.buildAliased(library, typeUse, hierarchy);
     Substitution substitution =
         _computeSubstitution(library, typeUse, hierarchy);
-    if ('$type'.contains('T*')) {
-      // Coverage-ignore-block(suite): Not run.
-      _typeBuilder.buildAliased(library, typeUse, hierarchy);
-    }
     return substitution.substituteType(type);
   }
 

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

@@ -257,6 +257,16 @@ class NominalParameterBuilder extends TypeParameterBuilder {
   /// The [TypeParameter] built by this builder.
   TypeParameter get parameter => origin.actualParameter;
 
+  @override
+  // Coverage-ignore(suite): Not run.
+  void addAugmentation(covariant NominalParameterBuilder augmentation) {
+    assert(
+        _hasHashCode == null,
+        "Cannot apply augmentation since to $this since hashCode has already "
+        "been computed from $actualParameter @\n$_hasHashCode");
+    augmentation.actualOrigin = this;
+  }
+
   @override
   void applyAugmentation(covariant NominalParameterBuilder augmentation) {
     assert(
@@ -723,6 +733,12 @@ class StructuralParameterBuilder extends TypeParameterBuilder {
     }
   }
 
+  @override
+  // Coverage-ignore(suite): Not run.
+  void addAugmentation(covariant StructuralParameterBuilder augmentation) {
+    augmentation.actualOrigin = this;
+  }
+
   @override
   // Coverage-ignore(suite): Not run.
   void applyAugmentation(covariant StructuralParameterBuilder augmentation) {

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

@@ -48,7 +48,6 @@ class ClassFragment extends DeclarationFragmentImpl implements Fragment {
   }
 
   @override
-  // Coverage-ignore(suite): Not run.
   bool get isPatch => enclosingCompilationUnit.isPatch && modifiers.isAugment;
 
   @override