[cfe] Support parts with imports/parts

This is a part of the enhanced-parts feature needed for further progress on the Builder model migration where patch libraries should be handled as patch parts.

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

Author: johnniwinther

pkg/_fe_analyzer_shared/lib/src/parser/class_member_parser.dart

@@ -17,7 +17,9 @@ class ClassMemberParser extends Parser {
   Parser? skipParser;
 
   ClassMemberParser(super.listener,
-      {super.useImplicitCreationExpression, super.allowPatterns});
+      {super.useImplicitCreationExpression,
+      super.allowPatterns,
+      super.enableFeatureEnhancedParts});
 
   @override
   Token parseExpression(Token token) {
@@ -37,7 +39,8 @@ class ClassMemberParser extends Parser {
     // feature together with a no-op listener instead.
     this.skipParser ??= new Parser(new ErrorDelegationListener(listener),
         useImplicitCreationExpression: useImplicitCreationExpression,
-        allowPatterns: allowPatterns);
+        allowPatterns: allowPatterns,
+        enableFeatureEnhancedParts: enableFeatureEnhancedParts);
     Parser skipParser = this.skipParser!;
     skipParser.mayParseFunctionExpressions = mayParseFunctionExpressions;
     skipParser.asyncState = asyncState;

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

@@ -1181,8 +1181,12 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
                 context.options.globalFeatures.tripleShift.isEnabled);
         bool enablePatterns =
             builder.languageVersion >= ExperimentalFlag.patterns.enabledVersion;
+        bool enableEnhancedParts = builder.languageVersion >=
+            ExperimentalFlag.enhancedParts.enabledVersion;
         String? before = textualOutline(previousSource, scannerConfiguration,
-            performModelling: true, enablePatterns: enablePatterns);
+            performModelling: true,
+            enablePatterns: enablePatterns,
+            enableEnhancedParts: enableEnhancedParts);
         if (before == null) {
           // Coverage-ignore-block(suite): Not run.
           recorderForTesting?.recordAdvancedInvalidationResult(
@@ -1193,7 +1197,9 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
         FileSystemEntity entity = c.options.fileSystem.entityForUri(uri);
         if (await entity.exists()) {
           now = textualOutline(await entity.readAsBytes(), scannerConfiguration,
-              performModelling: true, enablePatterns: enablePatterns);
+              performModelling: true,
+              enablePatterns: enablePatterns,
+              enableEnhancedParts: enableEnhancedParts);
         }
         if (before != now) {
           recorderForTesting?.recordAdvancedInvalidationResult(

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

@@ -77,7 +77,7 @@ class LibraryProblemReporting implements ProblemReporting {
   }
 
   void registerLibrary(Library library) {
-    assert(_library == null, "Library has already been register for $this.");
+    assert(_library == null, "Library has already been registered for $this.");
     _library = library;
     if (_problemsAsJson != null) {
       (library.problemsAsJson ??= []).addAll(_problemsAsJson!);

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

@@ -187,14 +187,38 @@ abstract class SourceCompilationUnit implements CompilationUnit {
 
   void addDependencies(Library library, Set<SourceCompilationUnit> seen);
 
-  void includeParts(SourceLibraryBuilder libraryBuilder,
+  /// Runs through all part directives in this compilation unit and adds the
+  /// compilation unit for the parts to the [libraryBuilder] by adding them
+  /// to [includedParts]
+  ///
+  /// [usedParts] is used to ensure that a compilation unit is only included in
+  /// one library. If the compilation unit is part of two libraries, it is only
+  /// included in the first and reported as an error on the second.
+  ///
+  /// This should only be called on the main compilation unit for
+  /// [libraryBuilder]. Inclusion of nested parts is from within this method,
+  /// using [becomePart] for each individual subpart.
+  void includeParts(
       List<SourceCompilationUnit> includedParts, Set<Uri> usedParts);
 
-  void validatePart(
-      SourceLibraryBuilder library,
-      SourceCompilationUnit parentCompilationUnit,
+  /// Includes this compilation unit as a part of [libraryBuilder] with
+  /// [parentCompilationUnit] as the parent compilation unit.
+  ///
+  /// The parent compilation unit is used to define the compilation unit
+  /// scope of this compilation unit.
+  ///
+  /// All fragment in this compilation unit will be added to
+  /// [libraryNameSpaceBuilder].
+  ///
+  /// If parts with parts is supported (through the enhanced parts feature),
+  /// the compilation units of the part directives in this compilation unit
+  /// will be added [libraryBuilder] recursively.
+  void becomePart(
+      SourceLibraryBuilder libraryBuilder,
       LibraryNameSpaceBuilder libraryNameSpaceBuilder,
-      Set<Uri>? usedParts);
+      SourceCompilationUnit parentCompilationUnit,
+      List<SourceCompilationUnit> includedParts,
+      Set<Uri> usedParts);
 
   /// Reports that [feature] is not enabled, using [charOffset] and
   /// [length] for the location of the message.

pkg/front_end/lib/src/compute_platform_binaries_location.dart

@@ -96,8 +96,7 @@ Uri computePlatformBinariesLocation({bool forceBuildDir = false}) {
   // The directory of the Dart VM executable.
   Uri vmDirectory = Uri.base
       .resolveUri(
-          new Uri.file(resolvedExecutable ?? // Coverage-ignore(suite): Not run.
-              Platform.resolvedExecutable))
+          new Uri.file(resolvedExecutable ?? Platform.resolvedExecutable))
       .resolve(".");
   if (vmDirectory.path.endsWith("/bin/")) {
     // Looks like the VM is in a `/bin/` directory, so this is running from a

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

@@ -1697,7 +1697,8 @@ class BodyBuilder extends StackListenerImpl
       {bool doFinishConstructor = true}) {
     Parser parser = new Parser(this,
         useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-        allowPatterns: libraryFeatures.patterns.isEnabled);
+        allowPatterns: libraryFeatures.patterns.isEnabled,
+        enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
     if (!token.isEof) {
       token = parser.parseInitializers(token);
       checkEmpty(token.charOffset);
@@ -1717,7 +1718,8 @@ class BodyBuilder extends StackListenerImpl
   Expression parseFieldInitializer(Token token) {
     Parser parser = new Parser(this,
         useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-        allowPatterns: libraryFeatures.patterns.isEnabled);
+        allowPatterns: libraryFeatures.patterns.isEnabled,
+        enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
     Token endToken =
         parser.parseExpression(parser.syntheticPreviousToken(token));
     assert(checkState(token, [
@@ -1735,7 +1737,8 @@ class BodyBuilder extends StackListenerImpl
   Expression parseAnnotation(Token token) {
     Parser parser = new Parser(this,
         useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-        allowPatterns: libraryFeatures.patterns.isEnabled);
+        allowPatterns: libraryFeatures.patterns.isEnabled,
+        enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
     Token endToken = parser.parseMetadata(parser.syntheticPreviousToken(token));
     assert(checkState(token, [ValueKinds.Expression]));
     Expression annotation = pop() as Expression;
@@ -1746,7 +1749,8 @@ class BodyBuilder extends StackListenerImpl
   ArgumentsImpl parseArguments(Token token) {
     Parser parser = new Parser(this,
         useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-        allowPatterns: libraryFeatures.patterns.isEnabled);
+        allowPatterns: libraryFeatures.patterns.isEnabled,
+        enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
     token = parser.parseArgumentsRest(token);
     ArgumentsImpl arguments = pop() as ArgumentsImpl;
     checkEmpty(token.charOffset);

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

@@ -894,7 +894,8 @@ class DietListener extends StackListenerImpl {
     try {
       Parser parser = new Parser(listener,
           useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-          allowPatterns: libraryFeatures.patterns.isEnabled);
+          allowPatterns: libraryFeatures.patterns.isEnabled,
+          enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
       if (metadata != null) {
         parser.parseMetadataStar(parser.syntheticPreviousToken(metadata));
         listener.pop(); // Pops metadata constants.
@@ -1225,7 +1226,8 @@ class DietListener extends StackListenerImpl {
     try {
       Parser parser = new Parser(bodyBuilder,
           useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-          allowPatterns: libraryFeatures.patterns.isEnabled);
+          allowPatterns: libraryFeatures.patterns.isEnabled,
+          enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
       token = parser.parseFormalParametersOpt(
           parser.syntheticPreviousToken(token), MemberKind.PrimaryConstructor);
       FormalParameters? formals = bodyBuilder.pop() as FormalParameters?;
@@ -1254,7 +1256,8 @@ class DietListener extends StackListenerImpl {
     try {
       Parser parser = new Parser(bodyBuilder,
           useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-          allowPatterns: libraryFeatures.patterns.isEnabled);
+          allowPatterns: libraryFeatures.patterns.isEnabled,
+          enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
       if (metadata != null) {
         parser.parseMetadataStar(parser.syntheticPreviousToken(metadata));
         bodyBuilder.pop(); // Annotations.
@@ -1303,7 +1306,8 @@ class DietListener extends StackListenerImpl {
     Token token = startToken;
     Parser parser = new Parser(bodyBuilder,
         useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-        allowPatterns: libraryFeatures.patterns.isEnabled);
+        allowPatterns: libraryFeatures.patterns.isEnabled,
+        enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
     if (isTopLevel) {
       token = parser.parseTopLevelMember(metadata ?? token);
     } else {
@@ -1335,7 +1339,8 @@ class DietListener extends StackListenerImpl {
       BodyBuilder listener = createListener(bodyBuilderContext, memberScope);
       Parser parser = new Parser(listener,
           useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-          allowPatterns: libraryFeatures.patterns.isEnabled);
+          allowPatterns: libraryFeatures.patterns.isEnabled,
+          enableFeatureEnhancedParts: libraryFeatures.enhancedParts.isEnabled);
       parser.parseMetadataStar(parser.syntheticPreviousToken(metadata));
       return listener.finishMetadata(parent);
     }

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

@@ -10,10 +10,12 @@ const bool useImplicitCreationExpressionInCfe = true;
 
 // TODO(ahe): Move this to parser package.
 class DietParser extends ClassMemberParser {
-  DietParser(Listener listener, {bool allowPatterns = false})
+  DietParser(Listener listener,
+      {required bool allowPatterns, required bool enableFeatureEnhancedParts})
       : super(listener,
             useImplicitCreationExpression: useImplicitCreationExpressionInCfe,
-            allowPatterns: allowPatterns);
+            allowPatterns: allowPatterns,
+            enableFeatureEnhancedParts: enableFeatureEnhancedParts);
 
   @override
   Token parseFormalParametersRest(Token token, MemberKind kind) {