[analyzer/cfe] Make sealed and mixin class errors more precise and synced between the CFE and analyzer.

Updated corresponding language tests. No new behaviour, updated test messages and location.

Change-Id: Ib3c7e2d701bdfbb68757c532b945348f6cbebad0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/280062
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Kallen Tu <[email protected]>

Author: kallentu

pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart

@@ -960,10 +960,12 @@ Message _withArgumentsCantReadFile(Uri uri_, String string) {
 }
 
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
-const Template<Message Function(String name)> templateCantUseClassAsMixin =
-    const Template<Message Function(String name)>(
-        problemMessageTemplate: r"""Class '#name' can't be used as a mixin.""",
-        withArguments: _withArgumentsCantUseClassAsMixin);
+const Template<
+    Message Function(String name)> templateCantUseClassAsMixin = const Template<
+        Message Function(String name)>(
+    problemMessageTemplate:
+        r"""The class '#name' can't be used as a mixin because it isn't a mixin class nor a mixin.""",
+    withArguments: _withArgumentsCantUseClassAsMixin);
 
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Code<Message Function(String name)> codeCantUseClassAsMixin =
@@ -975,7 +977,8 @@ Message _withArgumentsCantUseClassAsMixin(String name) {
   if (name.isEmpty) throw 'No name provided';
   name = demangleMixinApplicationName(name);
   return new Message(codeCantUseClassAsMixin,
-      problemMessage: """Class '${name}' can't be used as a mixin.""",
+      problemMessage:
+          """The class '${name}' can't be used as a mixin because it isn't a mixin class nor a mixin.""",
       arguments: {'name': name});
 }
 
@@ -10914,7 +10917,7 @@ const Template<
             name)> templateSealedClassSubtypeOutsideOfLibrary = const Template<
         Message Function(String name)>(
     problemMessageTemplate:
-        r"""Sealed class '#name' can't be extended, implemented, or mixed in outside of its library.""",
+        r"""The class '#name' can't be extended, implemented, or mixed in outside of its library because it's a sealed class.""",
     withArguments: _withArgumentsSealedClassSubtypeOutsideOfLibrary);
 
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
@@ -10930,7 +10933,7 @@ Message _withArgumentsSealedClassSubtypeOutsideOfLibrary(String name) {
   name = demangleMixinApplicationName(name);
   return new Message(codeSealedClassSubtypeOutsideOfLibrary,
       problemMessage:
-          """Sealed class '${name}' can't be extended, implemented, or mixed in outside of its library.""",
+          """The class '${name}' can't be extended, implemented, or mixed in outside of its library because it's a sealed class.""",
       arguments: {'name': name});
 }
 
@@ -10941,7 +10944,7 @@ const Template<
             name)> templateSealedMixinSubtypeOutsideOfLibrary = const Template<
         Message Function(String name)>(
     problemMessageTemplate:
-        r"""Sealed mixin '#name' can't be mixed in outside of its library.""",
+        r"""The mixin '#name' can't be mixed in outside of its library because it's a sealed mixin.""",
     withArguments: _withArgumentsSealedMixinSubtypeOutsideOfLibrary);
 
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
@@ -10957,7 +10960,7 @@ Message _withArgumentsSealedMixinSubtypeOutsideOfLibrary(String name) {
   name = demangleMixinApplicationName(name);
   return new Message(codeSealedMixinSubtypeOutsideOfLibrary,
       problemMessage:
-          """Sealed mixin '${name}' can't be mixed in outside of its library.""",
+          """The mixin '${name}' can't be mixed in outside of its library because it's a sealed mixin.""",
       arguments: {'name': name});
 }
 

pkg/analyzer/lib/src/error/codes.g.dart

@@ -415,8 +415,8 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
   ///  0: the name of the class being used as a mixin
   static const CompileTimeErrorCode CLASS_USED_AS_MIXIN = CompileTimeErrorCode(
     'CLASS_USED_AS_MIXIN',
-    "The class '{0}' can't be implicitly used as a mixin because it isn't a "
-        "mixin class nor a mixin.",
+    "The class '{0}' can't be used as a mixin because it isn't a mixin class "
+        "nor a mixin.",
   );
 
   static const CompileTimeErrorCode CONCRETE_CLASS_HAS_ENUM_SUPERINTERFACE =
@@ -4294,20 +4294,23 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
   );
 
   ///  Parameters:
-  ///  0: the name of the supertype being extended, implemented, or mixed in
+  ///  0: the name of the sealed class being extended, implemented, or mixed in
   static const CompileTimeErrorCode SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY =
       CompileTimeErrorCode(
-    'SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY',
-    "The sealed class '{0}' can't be extended, implemented, or mixed in "
-        "outside of its library.",
+    'INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY',
+    "The class '{0}' can't be extended, implemented, or mixed in outside of "
+        "its library because it's a sealed class.",
+    uniqueName: 'SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY',
   );
 
   ///  Parameters:
-  ///  0: the name of the supertype being mixed in
+  ///  0: the name of the sealed mixin being mixed in
   static const CompileTimeErrorCode SEALED_MIXIN_SUBTYPE_OUTSIDE_OF_LIBRARY =
       CompileTimeErrorCode(
-    'SEALED_MIXIN_SUBTYPE_OUTSIDE_OF_LIBRARY',
-    "The sealed mixin '{0}' can't be mixed in outside of its library.",
+    'INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY',
+    "The mixin '{0}' can't be mixed in outside of its library because it's a "
+        "sealed mixin.",
+    uniqueName: 'SEALED_MIXIN_SUBTYPE_OUTSIDE_OF_LIBRARY',
   );
 
   ///  No parameters.

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -1395,9 +1395,9 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       _checkForMixinWithConflictingPrivateMember(withClause, superclass);
       _checkForConflictingGenerics(node);
       _checkForBaseClassOrMixinImplementedOutsideOfLibrary(implementsClause);
-      _checkForClassUsedAsMixin(node, withClause);
+      _checkForClassUsedAsMixin(withClause);
       _checkForSealedSupertypeOutsideOfLibrary(
-          node, superclass, withClause, implementsClause);
+          superclass, withClause, implementsClause);
       if (node is ClassDeclaration) {
         _checkForNoDefaultSuperConstructorImplicit(node);
       }
@@ -1838,8 +1838,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   /// No error is emitted if the class being mixed in is a mixin class.
   ///
   /// See [CompileTimeErrorCode.CLASS_USED_AS_MIXIN].
-  void _checkForClassUsedAsMixin(
-      NamedCompilationUnitMember node, WithClause? withClause) {
+  void _checkForClassUsedAsMixin(WithClause? withClause) {
     if (withClause != null) {
       for (NamedType withMixin in withClause.mixinTypes) {
         final withType = withMixin.type;
@@ -1852,7 +1851,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
                   .isEnabled(Feature.class_modifiers)) {
             errorReporter.reportErrorForNode(
                 CompileTimeErrorCode.CLASS_USED_AS_MIXIN,
-                node,
+                withMixin,
                 [withElement.name]);
           }
         }
@@ -4308,60 +4307,39 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
   ///
   /// See [CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY],
   /// [CompileTimeErrorCode.SEALED_MIXIN_SUBTYPE_OUTSIDE_OF_LIBRARY].
-  void _checkForSealedSupertypeOutsideOfLibrary(
-      NamedCompilationUnitMember node,
-      NamedType? superclass,
-      WithClause? withClause,
-      ImplementsClause? implementsClause) {
-    void reportSealedClassOrMixinSubtypeOutsideOfLibraryError(
-        ClassOrMixinElementImpl superclass) {
-      if (superclass.isSealed && superclass.library != _currentLibrary) {
-        if (superclass is MixinElementImpl) {
-          errorReporter.reportErrorForNode(
-              CompileTimeErrorCode.SEALED_MIXIN_SUBTYPE_OUTSIDE_OF_LIBRARY,
-              node,
-              [superclass.name]);
-        } else {
-          errorReporter.reportErrorForNode(
-              CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY,
-              node,
-              [superclass.name]);
+  void _checkForSealedSupertypeOutsideOfLibrary(NamedType? superclass,
+      WithClause? withClause, ImplementsClause? implementsClause) {
+    void reportErrorsForSealedClassesAndMixins(List<NamedType> namedTypes) {
+      for (NamedType namedType in namedTypes) {
+        final type = namedType.type;
+        if (type is InterfaceType) {
+          final element = type.element;
+          if (element is ClassOrMixinElementImpl &&
+              element.isSealed &&
+              element.library != _currentLibrary) {
+            final ErrorCode errorCode;
+            if (element is MixinElementImpl) {
+              errorCode =
+                  CompileTimeErrorCode.SEALED_MIXIN_SUBTYPE_OUTSIDE_OF_LIBRARY;
+            } else {
+              errorCode =
+                  CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY;
+            }
+            errorReporter
+                .reportErrorForNode(errorCode, namedType, [element.name]);
+          }
         }
       }
     }
 
     if (superclass != null) {
-      final superclassType = superclass.type;
-      if (superclassType is InterfaceType) {
-        final superclassElement = superclassType.element;
-        if (superclassElement is ClassElementImpl) {
-          reportSealedClassOrMixinSubtypeOutsideOfLibraryError(
-              superclassElement);
-        }
-      }
+      reportErrorsForSealedClassesAndMixins([superclass]);
     }
     if (withClause != null) {
-      for (NamedType withMixin in withClause.mixinTypes) {
-        final withType = withMixin.type;
-        if (withType is InterfaceType) {
-          final withElement = withType.element;
-          if (withElement is ClassOrMixinElementImpl) {
-            reportSealedClassOrMixinSubtypeOutsideOfLibraryError(withElement);
-          }
-        }
-      }
+      reportErrorsForSealedClassesAndMixins(withClause.mixinTypes);
     }
     if (implementsClause != null) {
-      for (NamedType interface in implementsClause.interfaces) {
-        final interfaceType = interface.type;
-        if (interfaceType is InterfaceType) {
-          final interfaceElement = interfaceType.element;
-          if (interfaceElement is ClassElementImpl) {
-            reportSealedClassOrMixinSubtypeOutsideOfLibraryError(
-                interfaceElement);
-          }
-        }
-      }
+      reportErrorsForSealedClassesAndMixins(implementsClause.interfaces);
     }
   }
 
@@ -5142,8 +5120,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       );
       _checkForConflictingGenerics(node);
       _checkForBaseClassOrMixinImplementedOutsideOfLibrary(implementsClause);
-      _checkForSealedSupertypeOutsideOfLibrary(
-          node, null, null, implementsClause);
+      _checkForSealedSupertypeOutsideOfLibrary(null, null, implementsClause);
     }
   }
 

pkg/analyzer/messages.yaml

@@ -1598,7 +1598,7 @@ CompileTimeErrorCode:
       int y = x as int;
       ```
   CLASS_USED_AS_MIXIN:
-    problemMessage: "The class '{0}' can't be implicitly used as a mixin because it isn't a mixin class nor a mixin."
+    problemMessage: "The class '{0}' can't be used as a mixin because it isn't a mixin class nor a mixin."
     comment: |-
       Parameters:
       0: the name of the class being used as a mixin
@@ -12697,15 +12697,17 @@ CompileTimeErrorCode:
       }
       ```
   SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY:
-    problemMessage: "The sealed class '{0}' can't be extended, implemented, or mixed in outside of its library."
+    sharedName: INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+    problemMessage: "The class '{0}' can't be extended, implemented, or mixed in outside of its library because it's a sealed class."
     comment: |-
       Parameters:
-      0: the name of the supertype being extended, implemented, or mixed in
+      0: the name of the sealed class being extended, implemented, or mixed in
   SEALED_MIXIN_SUBTYPE_OUTSIDE_OF_LIBRARY:
-    problemMessage: "The sealed mixin '{0}' can't be mixed in outside of its library."
+    sharedName: INVALID_USE_OF_TYPE_OUTSIDE_LIBRARY
+    problemMessage: "The mixin '{0}' can't be mixed in outside of its library because it's a sealed mixin."
     comment: |-
       Parameters:
-      0: the name of the supertype being mixed in
+      0: the name of the sealed mixin being mixed in
   SET_ELEMENT_TYPE_NOT_ASSIGNABLE:
     problemMessage: "The element type '{0}' can't be assigned to the set type '{1}'."
     hasPublishedDocs: true

pkg/analyzer/test/src/diagnostics/class_used_as_mixin_test.dart

@@ -46,7 +46,7 @@ class Foo {}
 import 'foo.dart';
 class Bar with Foo {}
 ''', [
-      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 19, 21),
+      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 34, 3),
     ]);
   }
 
@@ -72,7 +72,7 @@ class Foo {}
 import 'foo.dart';
 class Bar with Foo {}
 ''', [
-      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 35, 21),
+      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 50, 3),
     ]);
   }
 
@@ -97,7 +97,7 @@ typedef FooTypedef = Foo;
 import 'foo.dart';
 class Bar with FooTypedef {}
 ''', [
-      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 19, 28),
+      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 34, 10),
     ]);
   }
 
@@ -136,7 +136,7 @@ import 'foo.dart';
 typedef FooTypedef = Foo;
 class Bar with FooTypedef {}
 ''', [
-      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 45, 28),
+      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 60, 10),
     ]);
   }
 

pkg/analyzer/test/src/diagnostics/sealed_class_subtype_outside_of_library_test.dart

@@ -32,7 +32,7 @@ import 'foo.dart';
 class Bar extends Foo {}
 ''', [
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 19, 24),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 37, 3),
     ]);
   }
 
@@ -47,7 +47,7 @@ import 'foo.dart';
 class Bar extends FooTypedef {}
 ''', [
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 19, 31),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 37, 10),
     ]);
   }
 
@@ -62,7 +62,7 @@ typedef FooTypedef = Foo;
 class Bar extends FooTypedef {}
 ''', [
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 45, 31),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 63, 10),
     ]);
   }
 
@@ -95,7 +95,7 @@ import 'foo.dart';
 class Bar implements Foo {}
 ''', [
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 19, 27),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 40, 3),
     ]);
   }
 
@@ -110,7 +110,7 @@ import 'foo.dart';
 class Bar implements FooTypedef {}
 ''', [
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 19, 34),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 40, 10),
     ]);
   }
 
@@ -125,7 +125,7 @@ typedef FooTypedef = Foo;
 class Bar implements FooTypedef {}
 ''', [
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 45, 34),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 66, 10),
     ]);
   }
 
@@ -157,9 +157,9 @@ sealed class Foo {}
 import 'foo.dart';
 class Bar with Foo {}
 ''', [
-      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 19, 21),
+      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 34, 3),
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 19, 21),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 34, 3),
     ]);
   }
 
@@ -173,9 +173,9 @@ typedef FooTypedef = Foo;
 import 'foo.dart';
 class Bar with FooTypedef {}
 ''', [
-      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 19, 28),
+      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 34, 10),
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 19, 28),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 34, 10),
     ]);
   }
 
@@ -189,9 +189,9 @@ import 'foo.dart';
 typedef FooTypedef = Foo;
 class Bar with FooTypedef {}
 ''', [
-      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 45, 28),
+      error(CompileTimeErrorCode.CLASS_USED_AS_MIXIN, 60, 10),
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 45, 28),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 60, 10),
     ]);
   }
 
@@ -217,7 +217,7 @@ import 'foo.dart';
 mixin Bar implements Foo {}
 ''', [
       error(
-          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 19, 27),
+          CompileTimeErrorCode.SEALED_CLASS_SUBTYPE_OUTSIDE_OF_LIBRARY, 40, 3),
     ]);
   }
 }