pre-emptively fix some tests for class modifiers flag flip

Change-Id: Ie7bbea5faa07dcc41f551268bd730bf0416e1fef
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286280
Reviewed-by: Bob Nystrom <rnystrom@google.com>
Commit-Queue: Jake Macdonald <jakemac@google.com>
Auto-Submit: Jake Macdonald <jakemac@google.com>
Commit-Queue: Bob Nystrom <rnystrom@google.com>

pkg/_fe_analyzer_shared/test/inheritance/data/infer_from_opt_in/opt_in.dart

@@ -2,6 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// TODO(51557): Decide if the mixins being applied in this test should be
+// "mixin", "mixin class" or the test should be left at 2.19.
+// @dart=2.19
+
 /*library: nnbd=true*/
 
 /*class: Class:Class,Object*/

tests/language/deferred/mixin_lib1.dart

@@ -2,6 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// TODO(51557): Decide if the mixins being applied in this test should be
+// "mixin", "mixin class" or the test should be left at 2.19.
+// @dart=2.19
+
 library lib1;
 
 import "mixin_shared.dart";

tests/language/deferred/mixin_shared.dart

@@ -2,6 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// TODO(51557): Decide if the mixins being applied in this test should be
+// "mixin", "mixin class" or the test should be left at 2.19.
+// @dart=2.19
+
 library shared;
 
 class SharedMixin {

tests/language/mixin/lib_extends_field_lib.dart

@@ -4,11 +4,11 @@
 
 library mixin_lib_extends_field_lib;
 
-class M1 {
+mixin M1 {
   final bar = "M1-bar";
 }
 
-class M2 {
+mixin M2 {
   var baz = "M2-$_baz";
 }
 

tests/language/mixin/lib_extends_field_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 library mixin_lib_extends_field_test;
 
 import 'package:expect/expect.dart';

tests/language/mixin/lib_extends_method_lib.dart

@@ -4,7 +4,7 @@
 
 library mixin_lib_extends_method_lib;
 
-class M1 {
+mixin M1 {
   bar() => "M1-bar";
 
   clo(s) {
@@ -13,7 +13,7 @@ class M1 {
   }
 }
 
-class M2 {
+mixin M2 {
   // Make sure mixed-in method has access to library-private names.
   bar() => _M2_bar();
   baz() => _M2_baz;

tests/language/mixin/lib_extends_method_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 library mixin_lib_extends_method_test;
 
 import "package:expect/expect.dart";

tests/language/mixin/prefix_lib.dart

@@ -6,6 +6,6 @@ library mixin_prefix_lib;
 
 import "dart:convert";
 
-class MixinClass {
+mixin MixinClass {
   String bar() => json.encode({'a': 1});
 }

tests/language/nnbd/mixed_inheritance/legacy_resolves_conflict_1_error_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 // Requirements=nnbd-weak
 
 // Verifies that a member declared in a null-safe class which overrides

tests/language/nnbd/mixed_inheritance/legacy_resolves_conflict_1_lib.dart

@@ -2,6 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// TODO(51557): Decide if the mixins being applied in this test should be
+// "mixin", "mixin class" or the test should be left at 2.19.
+// @dart=2.19
+
 // This library sets up various null-safe classes which have as a
 // superinterface one of `A<int>`,`A<int?>`, `M<int>` or `M<int?>`.
 // Each class has a getter, setter, and method; each is concrete; and

tests/language/nnbd/mixed_inheritance/legacy_resolves_conflict_1_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 // Requirements=nnbd-weak
 
 // Verify that conflicting implemented interfaces are resolved at a legacy

tests/language/nnbd/mixed_inheritance/legacy_resolves_conflict_2_lib.dart

@@ -2,6 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// TODO(51557): Decide if the mixins being applied in this test should be
+// "mixin", "mixin class" or the test should be left at 2.19.
+// @dart=2.19
+
 // This library declares two null-safe classes `B` and `Bq` with members using
 // non-nullable types respectively nullable types. The member signatures are
 // incompatible (there is no correct override relationship between them in

tests/language/nnbd/mixed_inheritance/legacy_resolves_conflict_2_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 // Requirements=nnbd-weak
 
 // Verify that conflicting member signatures are resolved at a legacy

tests/language/nnbd/mixed_inheritance/legacy_resolves_conflict_3_error_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 // Requirements=nnbd-weak
 
 // Verify that member signatures are computed correctly for null-safe

tests/language/nnbd/mixed_inheritance/legacy_resolves_conflict_3_lib.dart

@@ -2,6 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// TODO(51557): Decide if the mixins being applied in this test should be
+// "mixin", "mixin class" or the test should be left at 2.19.
+// @dart=2.19
+
 // This library declares two null-safe classes `B` and `Bq` with members
 // using non-nullable types respectively nullable types. Subtypes having
 // either `B` or `Bq` as a superinterface are declared in the library

tests/language/nonfunction_type_aliases/generic_usage_function_error_test.dart

@@ -1,8 +1,6 @@
 // Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-//
-// @dart=2.19
 
 
 import 'dart:async';

tests/language/nonfunction_type_aliases/usage_function_error_test.dart

@@ -1,8 +1,6 @@
 // Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
-//
-// @dart=2.19
 
 
 // Introduce an aliased type.

tests/language/optimize/inline_super_field_lib.dart

@@ -20,6 +20,6 @@ library inline_super_field_lib;
 
 var i = 0;
 
-class M1 {
+mixin M1 {
   final bar = ++i;
 }

tests/language/optimize/inline_super_field_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 // Test that source maps use the correct compilation unit when super class
 // fields from another compilation unit are inlined.
 

tests/language/private/mixin2_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 // Dart test for testing access to private fields on mixins.
 
 library private_mixin2;

tests/language/private/other_mixin2.dart

@@ -2,6 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// TODO(51557): Decide if the mixins being applied in this test should be
+// "mixin", "mixin class" or the test should be left at 2.19.
+// @dart=2.19
+
 // Dart test for testing access to private fields on mixins.
 
 library private_mixin2_other;

tests/language/regress/regress20394_runtime_test.dart

@@ -3,7 +3,7 @@
 
 import 'regress20394_lib.dart';
 
-class M {}
+mixin M {}
 
 class C extends Super with M {
 

tests/language/regress/regress20394_test.dart

@@ -1,6 +1,6 @@
 import 'regress20394_lib.dart';
 
-class M {}
+mixin M {}
 
 class C extends Super with M {
   C() : super._private(42);

tests/language/regress/regress25246_1_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 import 'regress25246_2.dart';
 
 class ConcreteClass extends Object with MixIn {}

tests/language/regress/regress25246_2.dart

@@ -4,7 +4,7 @@
 
 import 'regress25246_3.dart';
 
-class MixIn {
+mixin MixIn {
   var test3 = new Test3(() {});
   void test() {
     test3.test();

tests/language/regress/regress9602_other.dart

@@ -5,6 +5,6 @@
 // Regression test case for http://dartbug.com/9602
 library issue9602_other;
 
-class M {
+mixin M {
   var _field;
 }

tests/language/regress/regress9602_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 // Regression test case for http://dartbug.com/9602
 library issue9602;
 

tests/lib/mirrors/declarations_model.dart

@@ -40,7 +40,7 @@ abstract class Interface<I> {
   static _interfaceStaticMethod() => null;
 }
 
-class Mixin<M> {
+mixin Mixin<M> {
   operator *(x) => null;
 
   var mixinInstanceVariable;

tests/lib/mirrors/repeated_private_anon_mixin_app1.dart

@@ -6,9 +6,9 @@ library lib1;
 
 class _S {}
 
-class _M {}
+mixin _M {}
 
-class _M2 {}
+mixin _M2 {}
 
 class MA extends _S with _M {}
 

tests/lib/mirrors/repeated_private_anon_mixin_app2.dart

@@ -6,9 +6,9 @@ library lib2;
 
 class _S {}
 
-class _M {}
+mixin _M {}
 
-class _M2 {}
+mixin _M2 {}
 
 class MA extends _S with _M {}
 

tests/lib/mirrors/repeated_private_anon_mixin_app_test.dart

@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// TODO(51557): Decide if the mixins being applied in this test should be
-// "mixin", "mixin class" or the test should be left at 2.19.
-// @dart=2.19
-
 library test.repeated_private_anon_mixin_app;
 
 // Regression test for symbol mangling.