[cfe/flip-modifiers] Remove error for Function completely. Rely on its modifier errors.

Change-Id: I2532f24b360ea0a2f7afb92f3393719a16fa15e3 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286957 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Kallen Tu <kallentu@google.com>
2024-09-16 00:19:48 +00:00 · 2023-03-07 08:13:19 +00:00 · 2023-03-07 08:13:19 +00:00 · 7bae7294c9
parent 82237f9483
commit 7bae7294c9
22 changed files with 15 additions and 189 deletions
--- a/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart
@ -4045,16 +4045,6 @@ const MessageCode messageExpressionNotMetadata = const MessageCode(
    problemMessage:
        r"""This can't be used as an annotation; an annotation should be a reference to a compile-time constant variable, or a call to a constant constructor.""");

-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Code<Null> codeExtendFunction = messageExtendFunction;
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const MessageCode messageExtendFunction = const MessageCode("ExtendFunction",
-    problemMessage:
-        r"""Extending 'Function' is deprecated because 'Function' is final class.""",
-    correctionMessage:
-        r"""Try removing 'Function' from the 'extends' clause.""");
-
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Template<Message Function(String name)> templateExtendingEnum =
    const Template<Message Function(String name)>(
@ -5662,17 +5652,6 @@ const MessageCode messageIllegalSyncGeneratorVoidReturnType = const MessageCode(
    problemMessage:
        r"""Functions marked 'sync*' can't have return type 'void'.""");

-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Code<Null> codeImplementFunction = messageImplementFunction;
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const MessageCode messageImplementFunction = const MessageCode(
-    "ImplementFunction",
-    problemMessage:
-        r"""Implementing 'Function' is deprecated because 'Function' is final class.""",
-    correctionMessage:
-        r"""Try removing 'Function' from the 'implements' clause.""");
-
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Code<Null> codeImplementsBeforeExtends = messageImplementsBeforeExtends;

@ -9006,15 +8985,6 @@ const MessageCode messageMixinDeclaresConstructor = const MessageCode(
    index: 95,
    problemMessage: r"""Mixins can't declare constructors.""");

-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Code<Null> codeMixinFunction = messageMixinFunction;
-
-// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const MessageCode messageMixinFunction = const MessageCode("MixinFunction",
-    problemMessage:
-        r"""Mixing in 'Function' is deprecated because 'Function' is final class.""",
-    correctionMessage: r"""Try removing 'Function' from the 'with' clause.""");
-
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Template<
    Message Function(
--- a/pkg/front_end/lib/src/fasta/source/source_class_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_class_builder.dart
@ -237,10 +237,6 @@ class SourceClassBuilder extends ClassBuilderImpl
    }
    Supertype? supertype = supertypeBuilder?.buildSupertype(libraryBuilder);
    if (_isFunction(supertype, coreLibrary)) {
-      if (libraryBuilder.libraryFeatures.classModifiers.isEnabled) {
-        libraryBuilder.addProblem(
-            messageExtendFunction, charOffset, noLength, fileUri);
-      }
      supertype = null;
      supertypeBuilder = null;
    }
@ -269,10 +265,6 @@ class SourceClassBuilder extends ClassBuilderImpl
    Supertype? mixedInType =
        mixedInTypeBuilder?.buildMixedInType(libraryBuilder);
    if (_isFunction(mixedInType, coreLibrary)) {
-      if (libraryBuilder.libraryFeatures.classModifiers.isEnabled) {
-        libraryBuilder.addProblem(
-            messageMixinFunction, charOffset, noLength, fileUri);
-      }
      mixedInType = null;
      mixedInTypeBuilder = null;
      actualCls.isAnonymousMixin = false;
@ -323,10 +315,6 @@ class SourceClassBuilder extends ClassBuilderImpl
            interfaceBuilders![i].buildSupertype(libraryBuilder);
        if (supertype != null) {
          if (_isFunction(supertype, coreLibrary)) {
-            if (libraryBuilder.libraryFeatures.classModifiers.isEnabled) {
-              libraryBuilder.addProblem(
-                  messageImplementFunction, charOffset, noLength, fileUri);
-            }
            continue;
          }
          // TODO(ahe): Report an error if supertype is null.
--- a/pkg/front_end/messages.status
+++ b/pkg/front_end/messages.status
@ -301,7 +301,6 @@ ExportOptOutFromOptIn/analyzerCode: Fail
 ExportOptOutFromOptIn/part_wrapped_script: Fail
 ExpressionNotMetadata/analyzerCode: Fail
 ExpressionNotMetadata/example: Fail
-ExtendFunction/analyzerCode: Fail
 ExtendingEnum/example: Fail
 ExtendingRestricted/example: Fail
 ExtendsDynamic/analyzerCode: Fail # Feature not yet in analyzer.
@ -446,7 +445,6 @@ IllegalRecursiveType/analyzerCode: Fail
 IllegalRecursiveType/part_wrapped_script: Fail
 IllegalRecursiveType/script: Fail
 IllegalSyncGeneratorVoidReturnType/analyzerCode: Fail # The analyzer doesn't report this error.
-ImplementFunction/analyzerCode: Fail
 ImplementsBeforeExtends/part_wrapped_script: Fail
 ImplementsBeforeExtends/script: Fail
 ImplementsBeforeOn/part_wrapped_script: Fail
@ -674,9 +672,6 @@ MissingMain/example: Fail
 MissingPartOf/part_wrapped_script: Fail # Using 'part' in the (now) part.
 MissingPrefixInDeferredImport/example: Fail
 MixinDeclaresConstructor/example: Fail
-MixinFunction/analyzerCode: Fail
-MixinFunction/part_wrapped_script: Fail
-MixinFunction/script: Fail
 MixinInferenceNoMatchingClass/example: Fail
 ModifierOutOfOrder/part_wrapped_script1: Fail
 ModifierOutOfOrder/script1: Fail
--- a/pkg/front_end/messages.yaml
+++ b/pkg/front_end/messages.yaml
@ -5479,27 +5479,6 @@ ExportOptOutFromOptIn:
      // @dart=2.5
      class A {}

-ExtendFunction:
-  problemMessage: "Extending 'Function' is deprecated because 'Function' is final class."
-  correctionMessage: "Try removing 'Function' from the 'extends' clause."
-  experiments: class-modifiers
-  script: |
-    class A extends Function {}
-
-ImplementFunction:
-  problemMessage: "Implementing 'Function' is deprecated because 'Function' is final class."
-  correctionMessage: "Try removing 'Function' from the 'implements' clause."
-  experiments: class-modifiers
-  script: |
-    class A implements Function {}
-
-MixinFunction:
-  problemMessage: "Mixing in 'Function' is deprecated because 'Function' is final class."
-  correctionMessage: "Try removing 'Function' from the 'with' clause."
-  experiments: class-modifiers
-  script: |
-    class A extends Object with Function {}
-
 CannotAssignToFinalVariable:
  problemMessage: "Can't assign to the final variable '#name'."
  script: |
--- a/pkg/front_end/testcases/class_modifiers/subtype_function.dart.strong.expect
+++ b/pkg/front_end/testcases/class_modifiers/subtype_function.dart.strong.expect
@ -24,30 +24,11 @@ library /*isNonNullableByDefault*/;
 // class C with Function {}
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:14: Error: The mixin 'Function' can't be mixed-in outside of its library because it's a final mixin.
-// class C with Function {}
-//              ^
-//
 // pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: The type 'C' must be 'base', 'final' or 'sealed' because the supertype 'Function' is 'final'.
 // Try adding 'base', 'final', or 'sealed' to the type.
 // class C with Function {}
 //       ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:5:7: Error: Extending 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'extends' clause.
-// class A extends Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:7:7: Error: Implementing 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'implements' clause.
-// class B implements Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: Mixing in 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'with' clause.
-// class C with Function {}
-//       ^
-//
 import self as self;
 import "dart:core" as core;

--- a/pkg/front_end/testcases/class_modifiers/subtype_function.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/class_modifiers/subtype_function.dart.strong.transformed.expect
@ -24,30 +24,11 @@ library /*isNonNullableByDefault*/;
 // class C with Function {}
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:14: Error: The mixin 'Function' can't be mixed-in outside of its library because it's a final mixin.
-// class C with Function {}
-//              ^
-//
 // pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: The type 'C' must be 'base', 'final' or 'sealed' because the supertype 'Function' is 'final'.
 // Try adding 'base', 'final', or 'sealed' to the type.
 // class C with Function {}
 //       ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:5:7: Error: Extending 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'extends' clause.
-// class A extends Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:7:7: Error: Implementing 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'implements' clause.
-// class B implements Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: Mixing in 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'with' clause.
-// class C with Function {}
-//       ^
-//
 import self as self;
 import "dart:core" as core;

--- a/pkg/front_end/testcases/class_modifiers/subtype_function.dart.weak.expect
+++ b/pkg/front_end/testcases/class_modifiers/subtype_function.dart.weak.expect
@ -24,30 +24,11 @@ library /*isNonNullableByDefault*/;
 // class C with Function {}
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:14: Error: The mixin 'Function' can't be mixed-in outside of its library because it's a final mixin.
-// class C with Function {}
-//              ^
-//
 // pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: The type 'C' must be 'base', 'final' or 'sealed' because the supertype 'Function' is 'final'.
 // Try adding 'base', 'final', or 'sealed' to the type.
 // class C with Function {}
 //       ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:5:7: Error: Extending 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'extends' clause.
-// class A extends Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:7:7: Error: Implementing 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'implements' clause.
-// class B implements Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: Mixing in 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'with' clause.
-// class C with Function {}
-//       ^
-//
 import self as self;
 import "dart:core" as core;

--- a/pkg/front_end/testcases/class_modifiers/subtype_function.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/class_modifiers/subtype_function.dart.weak.modular.expect
@ -24,30 +24,11 @@ library /*isNonNullableByDefault*/;
 // class C with Function {}
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:14: Error: The mixin 'Function' can't be mixed-in outside of its library because it's a final mixin.
-// class C with Function {}
-//              ^
-//
 // pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: The type 'C' must be 'base', 'final' or 'sealed' because the supertype 'Function' is 'final'.
 // Try adding 'base', 'final', or 'sealed' to the type.
 // class C with Function {}
 //       ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:5:7: Error: Extending 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'extends' clause.
-// class A extends Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:7:7: Error: Implementing 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'implements' clause.
-// class B implements Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: Mixing in 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'with' clause.
-// class C with Function {}
-//       ^
-//
 import self as self;
 import "dart:core" as core;

--- a/pkg/front_end/testcases/class_modifiers/subtype_function.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/class_modifiers/subtype_function.dart.weak.outline.expect
@ -24,30 +24,11 @@ library /*isNonNullableByDefault*/;
 // class C with Function {}
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:14: Error: The mixin 'Function' can't be mixed-in outside of its library because it's a final mixin.
-// class C with Function {}
-//              ^
-//
 // pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: The type 'C' must be 'base', 'final' or 'sealed' because the supertype 'Function' is 'final'.
 // Try adding 'base', 'final', or 'sealed' to the type.
 // class C with Function {}
 //       ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:5:7: Error: Extending 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'extends' clause.
-// class A extends Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:7:7: Error: Implementing 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'implements' clause.
-// class B implements Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: Mixing in 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'with' clause.
-// class C with Function {}
-//       ^
-//
 import self as self;
 import "dart:core" as core;

--- a/pkg/front_end/testcases/class_modifiers/subtype_function.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/class_modifiers/subtype_function.dart.weak.transformed.expect
@ -24,30 +24,11 @@ library /*isNonNullableByDefault*/;
 // class C with Function {}
 //              ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:14: Error: The mixin 'Function' can't be mixed-in outside of its library because it's a final mixin.
-// class C with Function {}
-//              ^
-//
 // pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: The type 'C' must be 'base', 'final' or 'sealed' because the supertype 'Function' is 'final'.
 // Try adding 'base', 'final', or 'sealed' to the type.
 // class C with Function {}
 //       ^
 //
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:5:7: Error: Extending 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'extends' clause.
-// class A extends Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:7:7: Error: Implementing 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'implements' clause.
-// class B implements Function {}
-//       ^
-//
-// pkg/front_end/testcases/class_modifiers/subtype_function.dart:9:7: Error: Mixing in 'Function' is deprecated because 'Function' is final class.
-// Try removing 'Function' from the 'with' clause.
-// class C with Function {}
-//       ^
-//
 import self as self;
 import "dart:core" as core;

--- a/pkg/front_end/testcases/general/ignore_function.dart
+++ b/pkg/front_end/testcases/general/ignore_function.dart
@ -2,6 +2,8 @@
 // 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:core" as core;

 class A implements core.Function {
@ -19,4 +21,4 @@ class Function {
  core.bool operator ==(core.Object other) => false;
 }

-main() {}
+main() {}
--- a/pkg/front_end/testcases/general/ignore_function.dart.strong.expect
+++ b/pkg/front_end/testcases/general/ignore_function.dart.strong.expect
@ -2,7 +2,7 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/ignore_function.dart:18:7: Error: Can't use 'Function' as a name here.
+// pkg/front_end/testcases/general/ignore_function.dart:20:7: Error: Can't use 'Function' as a name here.
 // class Function {
 //       ^^^^^^^^
 //
--- a/pkg/front_end/testcases/general/ignore_function.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/ignore_function.dart.strong.transformed.expect
@ -2,7 +2,7 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/ignore_function.dart:18:7: Error: Can't use 'Function' as a name here.
+// pkg/front_end/testcases/general/ignore_function.dart:20:7: Error: Can't use 'Function' as a name here.
 // class Function {
 //       ^^^^^^^^
 //
--- a/pkg/front_end/testcases/general/ignore_function.dart.textual_outline.expect
+++ b/pkg/front_end/testcases/general/ignore_function.dart.textual_outline.expect
@ -1,3 +1,4 @@
+// @dart = 2.19
 import "dart:core" as core;

 class A implements core.Function {
--- a/pkg/front_end/testcases/general/ignore_function.dart.textual_outline_modelled.expect
+++ b/pkg/front_end/testcases/general/ignore_function.dart.textual_outline_modelled.expect
@ -1,3 +1,4 @@
+// @dart = 2.19
 import "dart:core" as core;

 class A implements core.Function {
--- a/pkg/front_end/testcases/general/ignore_function.dart.weak.expect
+++ b/pkg/front_end/testcases/general/ignore_function.dart.weak.expect
@ -2,7 +2,7 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/ignore_function.dart:18:7: Error: Can't use 'Function' as a name here.
+// pkg/front_end/testcases/general/ignore_function.dart:20:7: Error: Can't use 'Function' as a name here.
 // class Function {
 //       ^^^^^^^^
 //
--- a/pkg/front_end/testcases/general/ignore_function.dart.weak.modular.expect
+++ b/pkg/front_end/testcases/general/ignore_function.dart.weak.modular.expect
@ -2,7 +2,7 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/ignore_function.dart:18:7: Error: Can't use 'Function' as a name here.
+// pkg/front_end/testcases/general/ignore_function.dart:20:7: Error: Can't use 'Function' as a name here.
 // class Function {
 //       ^^^^^^^^
 //
--- a/pkg/front_end/testcases/general/ignore_function.dart.weak.outline.expect
+++ b/pkg/front_end/testcases/general/ignore_function.dart.weak.outline.expect
@ -2,7 +2,7 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/ignore_function.dart:18:7: Error: Can't use 'Function' as a name here.
+// pkg/front_end/testcases/general/ignore_function.dart:20:7: Error: Can't use 'Function' as a name here.
 // class Function {
 //       ^^^^^^^^
 //
--- a/pkg/front_end/testcases/general/ignore_function.dart.weak.transformed.expect
+++ b/pkg/front_end/testcases/general/ignore_function.dart.weak.transformed.expect
@ -2,7 +2,7 @@ library /*isNonNullableByDefault*/;
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/ignore_function.dart:18:7: Error: Can't use 'Function' as a name here.
+// pkg/front_end/testcases/general/ignore_function.dart:20:7: Error: Can't use 'Function' as a name here.
 // class Function {
 //       ^^^^^^^^
 //
--- a/pkg/front_end/testcases/general/inherit_function.dart
+++ b/pkg/front_end/testcases/general/inherit_function.dart
@ -2,6 +2,8 @@
 // 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
+
 class A implements Function {}

 class B extends Function {}
--- a/pkg/front_end/testcases/general/inherit_function.dart.textual_outline.expect
+++ b/pkg/front_end/testcases/general/inherit_function.dart.textual_outline.expect
@ -1,3 +1,4 @@
+// @dart = 2.19
 class A implements Function {}

 class B extends Function {}
--- a/pkg/front_end/testcases/general/inherit_function.dart.textual_outline_modelled.expect
+++ b/pkg/front_end/testcases/general/inherit_function.dart.textual_outline_modelled.expect
@ -1,3 +1,4 @@
+// @dart = 2.19
 class A implements Function {}

 class B extends Function {}