[cfe] Change LibraryBuilder.origin to use effective origin

This updates the SourceLibraryBuilder.origin to return the effective
origin library and not just the immediate origin. In case of an
'import augment' in a part file, the immediate origin is set to the
part "library". Since the part is not a real library, the augmentation
library should not (try to) depend on that library but instead the
library containing the part.

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

Author: johnniwinther

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

@@ -44,6 +44,9 @@ abstract class LibraryBuilder implements ModifierBuilder {
 
   List<Export> get exporters;
 
+  @override
+  LibraryBuilder get origin;
+
   abstract LibraryBuilder? partOfLibrary;
 
   LibraryBuilder get nameOriginBuilder;
@@ -380,6 +383,6 @@ abstract class LibraryBuilderImpl extends ModifierBuilderImpl
 
   @override
   StringBuffer printOn(StringBuffer buffer) {
-    return buffer..write(name ?? (isPart ? fileUri : importUri));
+    return buffer..write(isPart || isPatch ? fileUri : importUri);
   }
 }

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

@@ -88,6 +88,9 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
     lazyExportScope.libraryBuilder = this;
   }
 
+  @override
+  LibraryBuilder get origin => this;
+
   void ensureLoaded() {
     if (!isReadyToBuild) throw new StateError("Not ready to build.");
     if (isBuilt && !isBuiltAndMarked) {

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

@@ -174,7 +174,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
   @override
   final Library library;
 
-  final SourceLibraryBuilder? _origin;
+  final SourceLibraryBuilder? _immediateOrigin;
 
   final List<SourceFunctionBuilder> nativeMethods = <SourceFunctionBuilder>[];
 
@@ -307,7 +307,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
         currentTypeParameterScopeBuilder = _libraryTypeParameterScopeBuilder,
         referencesFromIndexed =
             referencesFrom == null ? null : new IndexedLibrary(referencesFrom),
-        _origin = origin,
+        _immediateOrigin = origin,
         _omittedTypeDeclarationBuilders = omittedTypes,
         super(
             fileUri,
@@ -1587,7 +1587,16 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
   }
 
   @override
-  SourceLibraryBuilder get origin => _origin ?? this;
+  bool get isPatch => _immediateOrigin != null;
+
+  @override
+  SourceLibraryBuilder get origin {
+    SourceLibraryBuilder? origin = _immediateOrigin;
+    if (origin != null && origin.isPart) {
+      origin = origin.partOfLibrary as SourceLibraryBuilder;
+    }
+    return origin?.origin ?? this;
+  }
 
   @override
   Uri get importUri => library.importUri;

pkg/front_end/messages.status

@@ -888,7 +888,7 @@ UndefinedExtensionSetter/example: Fail
 UnexpectedToken/part_wrapped_script1: Fail
 UnexpectedToken/script1: Fail
 UnmatchedAugmentationClassMember/analyzerCode: Fail
-UnmatchedAugmentationClassMember/example: Fail
+UnmatchedAugmentationClassMember/part_wrapped_script: Fail # Uses imports
 UnmatchedToken/part_wrapped_script1: Fail
 UnmatchedToken/part_wrapped_script3: Fail
 UnmatchedToken/script1: Fail

pkg/front_end/messages.yaml

@@ -5622,6 +5622,15 @@ MacroClassNotDeclaredMacro:
 UnmatchedAugmentationClassMember:
   problemMessage: "Augmentation member '#name' doesn't match a member in the augmented class."
   correctionMessage: "Try changing the name to an existing member or removing the 'augment' modifier."
+  experiments: macros
+  script:
+    main.dart:
+      import augment 'lib.dart';
+      class Class {}
+    lib.dart:
+      augment class Class {
+        augment void method() {}
+      }
 
 NonAugmentationClassMemberConflict:
   problemMessage: "Member '#name' conflicts with an existing member of the same name in the augmented class."