[cfe] Remove tests using import augment

This is in preparation for a change in the CFE that stops support for 'import augment'.

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

Author: johnniwinther

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

@@ -174,7 +174,9 @@ extension type const Modifiers(int _mask) implements Object {
       Token? staticToken,
       Token? varFinalOrConst}) {
     assert(abstractToken == null || abstractToken.type == Keyword.ABSTRACT);
-    assert(augmentToken == null || augmentToken.type == Keyword.AUGMENT);
+    assert(augmentToken == null ||
+        // Coverage-ignore(suite): Not run.
+        augmentToken.type == Keyword.AUGMENT);
     assert(baseToken == null || baseToken.type == Keyword.BASE);
     assert(covariantToken == null || covariantToken.type == Keyword.COVARIANT);
     assert(constToken == null || constToken.type == Keyword.CONST);

pkg/front_end/messages.status

@@ -82,8 +82,6 @@ CompilingWithoutSoundNullSafety/analyzerCode: Fail
 ConflictingModifiers/part_wrapped_script1: Fail
 ConflictingModifiers/script1: Fail
 ConflictsWithTypeParameter/example: Fail
-ConstructorShouldBeListedAsCallableInDynamicInterface/analyzerCode: Fail
-ConstructorShouldBeListedAsCallableInDynamicInterface/example: Fail
 ConstAndFinal/declaration3: Fail
 ConstAndFinal/declaration4: Fail
 ConstAndFinal/part_wrapped_declaration3: Fail
@@ -163,6 +161,8 @@ ConstEvalZeroDivisor/example: Fail
 ConstFieldWithoutInitializer/example: Fail
 ConstructorNotFound/example: Fail
 ConstructorNotSync/example: Fail
+ConstructorShouldBeListedAsCallableInDynamicInterface/analyzerCode: Fail
+ConstructorShouldBeListedAsCallableInDynamicInterface/example: Fail
 ConstructorTearOffWithTypeArguments/analyzerCode: Fail
 ContinueLabelNotTarget/example: Fail
 ContinueOutsideOfLoop/part_wrapped_script1: Fail
@@ -795,10 +795,13 @@ NeverValueWarning/analyzerCode: Fail
 NeverValueWarning/example: Fail
 NewAsSelector/analyzerCode: Fail
 NoAugmentSuperInvokeTarget/analyzerCode: Fail
+NoAugmentSuperInvokeTarget/example: Fail
 NoAugmentSuperInvokeTarget/part_wrapped_script: Fail # Uses imports
 NoAugmentSuperReadTarget/analyzerCode: Fail
+NoAugmentSuperReadTarget/example: Fail
 NoAugmentSuperReadTarget/part_wrapped_script: Fail # Uses imports
 NoAugmentSuperWriteTarget/analyzerCode: Fail
+NoAugmentSuperWriteTarget/example: Fail
 NoAugmentSuperWriteTarget/part_wrapped_script: Fail # Uses imports
 NoFormals/example: Fail
 NoMacroApplicationTarget/analyzerCode: Fail
@@ -811,14 +814,19 @@ NonAgnosticConstant/example: Fail
 NonAsciiIdentifier/expression: Fail
 NonAsciiIdentifier/part_wrapped_expression: Fail
 NonAugmentationClassConflict/analyzerCode: Fail
+NonAugmentationClassConflict/example: Fail
 NonAugmentationClassConflict/part_wrapped_script: Fail
 NonAugmentationClassMemberConflict/analyzerCode: Fail
+NonAugmentationClassMemberConflict/example: Fail
 NonAugmentationClassMemberConflict/part_wrapped_script: Fail # Uses imports
 NonAugmentationConstructorConflict/analyzerCode: Fail
+NonAugmentationConstructorConflict/example: Fail
 NonAugmentationConstructorConflict/part_wrapped_script: Fail # Uses imports
 NonAugmentationLibraryConflict/analyzerCode: Fail
+NonAugmentationLibraryConflict/example: Fail
 NonAugmentationLibraryConflict/part_wrapped_script: Fail
 NonAugmentationLibraryMemberConflict/analyzerCode: Fail
+NonAugmentationLibraryMemberConflict/example: Fail
 NonAugmentationLibraryMemberConflict/part_wrapped_script: Fail # Uses imports
 NonConstConstructor/example: Fail
 NonConstFactory/example: Fail
@@ -949,6 +957,8 @@ PrefixAfterCombinator/example: Fail
 PreviousUseOfName/analyzerCode: Fail
 PreviousUseOfName/example: Fail
 PrivateNamedParameter/example: Fail
+RecordUseCannotBePlacedHere/analyzerCode: Fail
+RecordUseCannotBePlacedHere/example: Fail
 RecordUsedAsCallable/analyzerCode: Fail
 RecordUsedAsCallable/part_wrapped_script: Fail
 RecordUsedAsCallable/script: Fail
@@ -962,8 +972,6 @@ RequiredNamedParameterHasDefaultValueError/analyzerCode: Fail
 RequiredNamedParameterHasDefaultValueError/example: Fail
 RequiredNamedParameterHasDefaultValueWarning/analyzerCode: Fail
 RequiredNamedParameterHasDefaultValueWarning/example: Fail
-RecordUseCannotBePlacedHere/analyzerCode: Fail
-RecordUseCannotBePlacedHere/example: Fail
 RestPatternInMapPattern/analyzerCode: Fail
 RestPatternMoreThanOne/analyzerCode: Fail
 RethrowNotCatch/example: Fail
@@ -1063,14 +1071,18 @@ UnexpectedToken/script1: Fail
 UnhandledMacroApplication/analyzerCode: Fail
 UnhandledMacroApplication/example: Fail
 UnmatchedAugmentationClass/analyzerCode: Fail
+UnmatchedAugmentationClass/example: Fail
 UnmatchedAugmentationClass/part_wrapped_script: Fail
 UnmatchedAugmentationClassMember/analyzerCode: Fail
+UnmatchedAugmentationClassMember/example: Fail
 UnmatchedAugmentationClassMember/part_wrapped_script: Fail # Uses imports
 UnmatchedAugmentationConstructor/analyzerCode: Fail
+UnmatchedAugmentationConstructor/example: Fail
 UnmatchedAugmentationConstructor/part_wrapped_script: Fail # Uses imports
 UnmatchedAugmentationDeclaration/analyzerCode: Fail
 UnmatchedAugmentationDeclaration/example: Fail
 UnmatchedAugmentationLibraryMember/analyzerCode: Fail
+UnmatchedAugmentationLibraryMember/example: Fail
 UnmatchedAugmentationLibraryMember/part_wrapped_script: Fail # Uses imports
 UnmatchedPatchClass/analyzerCode: Fail
 UnmatchedPatchClass/example: Fail

pkg/front_end/messages.yaml

@@ -6266,15 +6266,7 @@ 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() {}
-      }
+  experiments: augmentations
 
 UnmatchedPatchClassMember:
   problemMessage: "Patch member '#name' doesn't match a member in the origin class."
@@ -6283,12 +6275,7 @@ UnmatchedPatchClassMember:
 UnmatchedAugmentationLibraryMember:
   problemMessage: "Augmentation member '#name' doesn't match a member in the augmented library."
   correctionMessage: "Try changing the name to an existing member or removing the 'augment' modifier."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-    lib.dart:
-      augment void method() {}
+  experiments: augmentations
 
 UnmatchedPatchLibraryMember:
   problemMessage: "Patch member '#name' doesn't match a member in the origin library."
@@ -6297,12 +6284,7 @@ UnmatchedPatchLibraryMember:
 UnmatchedAugmentationClass:
   problemMessage: "Augmentation class '#name' doesn't match a class in the augmented library."
   correctionMessage: "Try changing the name to an existing class or removing the 'augment' modifier."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-    lib.dart:
-      augment class Class {}
+  experiments: augmentations
 
 UnmatchedPatchClass:
   problemMessage: "Patch class '#name' doesn't match a class in the origin library."
@@ -6320,17 +6302,7 @@ UnmatchedPatchDeclaration:
 UnmatchedAugmentationConstructor:
   problemMessage: "Augmentation constructor '#name' doesn't match a constructor in the augmented class."
   correctionMessage: "Try changing the name to an existing constructor or removing the 'augment' modifier."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      class Class {
-        Class.name1();
-      }
-    lib.dart:
-      augment class Class {
-        augment Class.name2();
-      }
+  experiments: augmentations
 
 UnmatchedPatchConstructor:
   problemMessage: "Patch constructor '#name' doesn't match a constructor in the origin class."
@@ -6339,17 +6311,7 @@ UnmatchedPatchConstructor:
 NonAugmentationClassMemberConflict:
   problemMessage: "Member '#name' conflicts with an existing member of the same name in the augmented class."
   correctionMessage: "Try changing the name of the member or adding an 'augment' modifier."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      class Class {
-        void method() {}
-      }
-    lib.dart:
-      augment class Class {
-        void method() {}
-      }
+  experiments: augmentations
 
 NonPatchClassMemberConflict:
   problemMessage: "Member '#name' conflicts with an existing member of the same name in the origin class."
@@ -6358,13 +6320,7 @@ NonPatchClassMemberConflict:
 NonAugmentationLibraryMemberConflict:
   problemMessage: "Member '#name' conflicts with an existing member of the same name in the augmented library."
   correctionMessage: "Try changing the name of the member or adding an 'augment' modifier."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      void method() {}
-    lib.dart:
-      void method() {}
+  experiments: augmentations
 
 NonPatchLibraryMemberConflict:
   problemMessage: "Member '#name' conflicts with an existing member of the same name in the origin library."
@@ -6373,13 +6329,7 @@ NonPatchLibraryMemberConflict:
 NonAugmentationLibraryConflict:
   problemMessage: "Declaration '#name' conflicts with an existing declaration of the same name in the augmented library."
   correctionMessage: "Try changing the name of the declaration."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      void method() {}
-    lib.dart:
-      class method {}
+  experiments: augmentations
 
 NonPatchLibraryConflict:
   problemMessage: "Declaration '#name' conflicts with an existing declaration of the same name in the origin library."
@@ -6388,13 +6338,7 @@ NonPatchLibraryConflict:
 NonAugmentationClassConflict:
   problemMessage: "Class '#name' conflicts with an existing class of the same name in the augmented library."
   correctionMessage: "Try changing the name of the class or adding an 'augment' modifier."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      class Class {}
-    lib.dart:
-      class Class {}
+  experiments: augmentations
 
 NonPatchClassConflict:
   problemMessage: "Class '#name' conflicts with an existing class of the same name in the origin library."
@@ -6403,17 +6347,7 @@ NonPatchClassConflict:
 NonAugmentationConstructorConflict:
   problemMessage: "Constructor '#name' conflicts with an existing constructor of the same name in the augmented class."
   correctionMessage: "Try changing the name of the constructor or adding an 'augment' modifier."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      class Class {
-        Class.name();
-      }
-    lib.dart:
-      augment class Class {
-        Class.name();
-      }
+  experiments: augmentations
 
 NonPatchConstructorConflict:
   problemMessage: "Constructor '#name' conflicts with an existing constructor of the same name in the origin class."
@@ -6507,39 +6441,15 @@ MixinApplicationNoConcreteMemberContext:
 
 NoAugmentSuperReadTarget:
   problemMessage: "Cannot read from 'augment super'."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      void set setter(value) {}
-    lib.dart:
-      augment void set setter(value) {
-        augment super;
-      }
+  experiments: augmentations
 
 NoAugmentSuperWriteTarget:
   problemMessage: "Cannot write to 'augment super'."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      void method() {}
-    lib.dart:
-      augment void method() {
-        augment super = 42;
-      }
+  experiments: augmentations
 
 NoAugmentSuperInvokeTarget:
   problemMessage: "Cannot call 'augment super'."
-  experiments: macros
-  script:
-    main.dart:
-      import augment 'lib.dart';
-      void set setter(value) {}
-    lib.dart:
-      augment void set setter(value) {
-        augment super();
-      }
+  experiments: augmentations
 
 IndexOutOfBoundInRecordIndexGet:
   problemMessage: "Index #count is out of range 0..#count2 of positional fields of records #type."