Augment. Remove redundant forAugmentationLibrary flag, use libraryFeatures.augmentations instead.

Change-Id: If6e5ce47e93d95c33ad796d21888d26d93f46735
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/489980
Reviewed-by: Paul Berry <paulberry@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

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

@@ -2127,7 +2127,6 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
             conditionalImportSupported:
                 libraryBuilder.conditionalImportSupported,
             importability: libraryBuilder.importability,
-            forAugmentationLibrary: false,
             forPatchLibrary: false,
             referenceIsPartOwner: null,
             packageUri: null,
@@ -2193,7 +2192,6 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
         parentExtensionScope: debugCompilationUnit.extensionScope,
         conditionalImportSupported: libraryBuilder.conditionalImportSupported,
         importability: libraryBuilder.importability,
-        forAugmentationLibrary: false,
         forPatchLibrary: false,
         referenceIsPartOwner: null,
         packageUri: null,

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

@@ -155,9 +155,6 @@ abstract class SourceCompilationUnit
     int length = noLength,
   });
 
-  // TODO(johnniwinther): Remove this.
-  bool get forAugmentationLibrary;
-
   // TODO(johnniwinther): Remove this.
   bool get forPatchLibrary;
 

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

@@ -976,7 +976,6 @@ class FragmentFactoryImpl implements FragmentFactory {
               _augmentationRoot
             : null,
         accessor: _compilationUnit,
-        isAugmentation: isAugmentationImport,
         referencesFromIndex: isAugmentationImport
             ?
               // Coverage-ignore(suite): Not run.

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

@@ -160,9 +160,6 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
 
   LibraryFeatures? _libraryFeatures;
 
-  @override
-  final bool forAugmentationLibrary;
-
   @override
   final bool forPatchLibrary;
 
@@ -194,7 +191,6 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
     Map<String, Builder>? omittedTypeDeclarationBuilders,
     LookupScope? parentScope,
     ExtensionScope? parentExtensionScope,
-    required bool forAugmentationLibrary,
     required SourceCompilationUnit? augmentationRoot,
     required LibraryBuilder? resolveInLibrary,
     required bool? referenceIsPartOwner,
@@ -221,7 +217,6 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
       parentExtensionScope: parentExtensionScope,
       importNameSpace: importNameSpace,
       prefixNameSpace: prefixNameSpace,
-      forAugmentationLibrary: forAugmentationLibrary,
       augmentationRoot: augmentationRoot,
       resolveInLibrary: resolveInLibrary,
       referenceIsPartOwner: referenceIsPartOwner,
@@ -246,7 +241,6 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
     ExtensionScope? parentExtensionScope,
     required ComputedMutableNameSpace importNameSpace,
     required ComputedMutableNameSpace prefixNameSpace,
-    required this.forAugmentationLibrary,
     required SourceCompilationUnit? augmentationRoot,
     required LibraryBuilder? resolveInLibrary,
     required bool? referenceIsPartOwner,
@@ -668,7 +662,7 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
           indexedLibrary: indexedLibrary,
           referenceIsPartOwner: _referenceIsPartOwner,
           conditionalImportSupported: conditionalImportSupported,
-          isAugmentation: forAugmentationLibrary,
+          isAugmentation: isAugmenting,
           isPatch: forPatchLibrary,
           parentScope: _parentScope,
           parentExtensionScope: _parentExtensionScope,
@@ -1233,7 +1227,6 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
       -1,
       origin: null,
       accessor: this,
-      isAugmentation: false,
       referencesFromIndex: indexedLibrary,
     );
     Import import = new Import(

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

@@ -338,7 +338,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
 
   // Coverage-ignore(suite): Not run.
   /// `true` if this is an augmentation library.
-  bool get isAugmentationLibrary => compilationUnit.forAugmentationLibrary;
+  bool get isAugmentationLibrary => compilationUnit.isAugmenting;
 
   // Coverage-ignore(suite): Not run.
   /// `true` if this is a patch library.

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

@@ -410,7 +410,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
     SourceCompilationUnit? origin,
     IndexedLibrary? referencesFromIndex,
     bool? referenceIsPartOwner,
-    bool isAugmentation = false,
     bool isPatch = false,
     required bool mayImplementRestrictedTypes,
   }) {
@@ -435,7 +434,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
               ? target.uriTranslator.isLibraryImportable(importUri.path)
               : Importability.always),
       isAugmenting: origin != null,
-      forAugmentationLibrary: isAugmentation,
       forPatchLibrary: isPatch,
       mayImplementRestrictedTypes: mayImplementRestrictedTypes,
     );
@@ -484,7 +482,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
     required SourceCompilationUnit? origin,
     required IndexedLibrary? referencesFromIndex,
     required bool? referenceIsPartOwner,
-    required bool isAugmentation,
     required bool isPatch,
     required bool addAsRoot,
   }) {
@@ -606,7 +603,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
       origin: origin,
       referencesFromIndex: referencesFromIndex,
       referenceIsPartOwner: referenceIsPartOwner,
-      isAugmentation: isAugmentation,
       isPatch: isPatch,
       mayImplementRestrictedTypes: target.backendTarget.mayDefineRestrictedType(
         originImportUri,
@@ -694,7 +690,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
     SourceCompilationUnit? origin,
     IndexedLibrary? referencesFromIndex,
     bool? referenceIsPartOwner,
-    bool isAugmentation = false,
     bool isPatch = false,
   }) {
     CompilationUnit libraryBuilder = _read(
@@ -704,7 +699,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
       origin: origin,
       referencesFromIndex: referencesFromIndex,
       referenceIsPartOwner: referenceIsPartOwner,
-      isAugmentation: isAugmentation,
       isPatch: isPatch,
       addAsRoot: false,
     );
@@ -806,7 +800,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
       fileUri: fileUri,
       referencesFromIndex: referencesFromIndex,
       addAsRoot: true,
-      isAugmentation: false,
       isPatch: false,
     );
     // TODO(johnniwinther): Avoid using the first library, if present, as the
@@ -869,7 +862,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
     SourceCompilationUnit? origin,
     required IndexedLibrary? referencesFromIndex,
     bool? referenceIsPartOwner,
-    required bool isAugmentation,
     required bool isPatch,
     required bool addAsRoot,
   }) {
@@ -886,7 +878,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
           origin: origin,
           referencesFromIndex: referencesFromIndex,
           referenceIsPartOwner: referenceIsPartOwner,
-          isAugmentation: isAugmentation,
           isPatch: isPatch,
           addAsRoot: addAsRoot,
         );
@@ -1191,7 +1182,11 @@ severity: $severity
           compilationUnit.importUri,
           compilationUnit.packageLanguageVersion.version,
         ),
-        forAugmentationLibrary: compilationUnit.forAugmentationLibrary,
+        forAugmentationLibrary: target.isExperimentEnabledInLibraryByVersion(
+          ExperimentalFlag.augmentations,
+          compilationUnit.importUri,
+          compilationUnit.packageLanguageVersion.version,
+        ),
       ),
       languageVersionChanged: (Scanner scanner, LanguageVersionToken version) {
         if (!suppressLexicalErrors) {
@@ -1204,6 +1199,8 @@ severity: $severity
         scanner.configuration = new ScannerConfiguration(
           enableTripleShift:
               compilationUnit.libraryFeatures.tripleShift.isEnabled,
+          forAugmentationLibrary:
+              compilationUnit.libraryFeatures.augmentations.isEnabled,
         );
       },
       allowLazyStrings: allowLazyStrings,

pkg/front_end/test/generator_to_string_test.dart

@@ -108,7 +108,6 @@ Future<void> main() async {
       ),
       originImportUri: uri,
       indexedLibrary: null,
-      forAugmentationLibrary: false,
       augmentationRoot: null,
       resolveInLibrary: null,
       referenceIsPartOwner: null,

pkg/front_end/tool/dart_doctest_impl.dart

@@ -1119,7 +1119,6 @@ class DocTestIncrementalCompiler extends IncrementalCompiler {
           loader: loader,
           resolveInLibrary: libraryBuilder,
           conditionalImportSupported: true,
-          forAugmentationLibrary: false,
           isAugmenting: false,
           forPatchLibrary: false,
           referenceIsPartOwner: null,
@@ -1220,7 +1219,6 @@ class DocTestSourceLoader extends SourceLoader {
     SourceCompilationUnit? origin,
     IndexedLibrary? referencesFromIndex,
     bool? referenceIsPartOwner,
-    bool isAugmentation = false,
     bool isPatch = false,
     required bool mayImplementRestrictedTypes,
   }) {
@@ -1244,7 +1242,6 @@ class DocTestSourceLoader extends SourceLoader {
       origin: origin,
       referencesFromIndex: referencesFromIndex,
       referenceIsPartOwner: referenceIsPartOwner,
-      isAugmentation: isAugmentation,
       isPatch: isPatch,
       mayImplementRestrictedTypes: mayImplementRestrictedTypes,
     );