[front end] Use code... instead of message....

This is part of a series of CLs that will standardize CFE error
reporting to always use `codeFoo.withArguments(...)` when reporting
errors that take arguments and `codeFoo` when reporting errors that
don't take arguments, rather than `templateFoo.withArguments(...)`
when reporting errors that take arguments and `messageFoo` when
reporting errors that don't take arguments. This change will have two
advantages:

- It will lend greater consistency to the CFE codebase, by allowing
  the same `code...` objects to be used both to name error codes
  (e.g., in test expectations) and to report errors. This will allow
  everything associated with a certain error code to be found using a
  single invocation of "Find References" in the editor, rather than
  having to search separately for uses of the code and the message or
  template.

- It should hopefully make the experience of writing code that reports
  errors more pleasant, since it will no longer be necessary to look
  up an error to see whether it takes arguments before using it;
  instead, the developer will be able to type the name of the message
  `code...` declaration, and then use autocompletion to see whether
  `.withArguments(...)` is required.

In this CL, references to the `message...` declarations that define
errors are changed to the equivalent `code...` declarations. There is
no functional change, since these declarations denote the same
constant object. In a follow-up CL, the `message...` declarations will
be removed.

Tested: standard trybots
Change-Id: I44d4b3cffb768b908d4341a7851f270db6caa87b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/443183
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Jackson Gardner <jacksongardner@google.com>
Reviewed-by: Mayank Patke <fishythefish@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>

pkg/_fe_analyzer_shared/lib/src/parser/block_kind.dart

@@ -19,11 +19,11 @@ class BlockKind {
 
   static const BlockKind catchClause = const BlockKind._(
     'catch clause',
-    message: codes.messageExpectedCatchClauseBody,
+    message: codes.codeExpectedCatchClauseBody,
   );
   static const BlockKind classDeclaration = const BlockKind._(
     'class declaration',
-    message: codes.messageExpectedClassBody,
+    message: codes.codeExpectedClassBody,
   );
   static const BlockKind enumDeclaration = const BlockKind._(
     'enum declaration',
@@ -31,15 +31,15 @@ class BlockKind {
   );
   static const BlockKind extensionDeclaration = const BlockKind._(
     'extension declaration',
-    message: codes.messageExpectedExtensionBody,
+    message: codes.codeExpectedExtensionBody,
   );
   static const BlockKind extensionTypeDeclaration = const BlockKind._(
     'extension type declaration',
-    message: codes.messageExpectedExtensionTypeBody,
+    message: codes.codeExpectedExtensionTypeBody,
   );
   static const BlockKind finallyClause = const BlockKind._(
     'finally clause',
-    message: codes.messageExpectedFinallyClauseBody,
+    message: codes.codeExpectedFinallyClauseBody,
   );
   static const BlockKind functionBody = const BlockKind._(
     'function body',
@@ -48,19 +48,19 @@ class BlockKind {
   static const BlockKind invalid = const BlockKind._('invalid');
   static const BlockKind mixinDeclaration = const BlockKind._(
     'mixin declaration',
-    message: codes.messageExpectedMixinBody,
+    message: codes.codeExpectedMixinBody,
   );
   static const BlockKind statement = const BlockKind._('statement');
   static const BlockKind switchExpression = const BlockKind._(
     'switch expression',
-    message: codes.messageExpectedSwitchExpressionBody,
+    message: codes.codeExpectedSwitchExpressionBody,
   );
   static const BlockKind switchStatement = const BlockKind._(
     'switch statement',
-    message: codes.messageExpectedSwitchStatementBody,
+    message: codes.codeExpectedSwitchStatementBody,
   );
   static const BlockKind tryStatement = const BlockKind._(
     'try statement',
-    message: codes.messageExpectedTryStatementBody,
+    message: codes.codeExpectedTryStatementBody,
   );
 }

pkg/_fe_analyzer_shared/lib/src/parser/directive_context.dart

@@ -38,15 +38,15 @@ class DirectiveContext {
       case DirectiveState.ImportAndExport:
         state = DirectiveState.ImportAndExport;
       case DirectiveState.Part:
-        parser.reportRecoverableError(token, messageExportAfterPart);
+        parser.reportRecoverableError(token, codeExportAfterPart);
       case DirectiveState.PartOf:
         if (enableFeatureEnhancedParts) {
           state = DirectiveState.ImportAndExport;
         } else {
-          parser.reportRecoverableError(token, messageNonPartOfDirectiveInPart);
+          parser.reportRecoverableError(token, codeNonPartOfDirectiveInPart);
         }
       case DirectiveState.Declarations:
-        parser.reportRecoverableError(token, messageDirectiveAfterDeclaration);
+        parser.reportRecoverableError(token, codeDirectiveAfterDeclaration);
     }
   }
 
@@ -58,15 +58,15 @@ class DirectiveContext {
       case DirectiveState.ImportAndExport:
         state = DirectiveState.ImportAndExport;
       case DirectiveState.Part:
-        parser.reportRecoverableError(token, messageImportAfterPart);
+        parser.reportRecoverableError(token, codeImportAfterPart);
       case DirectiveState.PartOf:
         if (enableFeatureEnhancedParts) {
           state = DirectiveState.ImportAndExport;
         } else {
-          parser.reportRecoverableError(token, messageNonPartOfDirectiveInPart);
+          parser.reportRecoverableError(token, codeNonPartOfDirectiveInPart);
         }
       case DirectiveState.Declarations:
-        parser.reportRecoverableError(token, messageDirectiveAfterDeclaration);
+        parser.reportRecoverableError(token, codeDirectiveAfterDeclaration);
     }
   }
 
@@ -77,11 +77,11 @@ class DirectiveContext {
     }
     // Recovery
     if (state == DirectiveState.Library) {
-      parser.reportRecoverableError(token, messageMultipleLibraryDirectives);
+      parser.reportRecoverableError(token, codeMultipleLibraryDirectives);
     } else if (state == DirectiveState.PartOf) {
-      parser.reportRecoverableError(token, messageNonPartOfDirectiveInPart);
+      parser.reportRecoverableError(token, codeNonPartOfDirectiveInPart);
     } else {
-      parser.reportRecoverableError(token, messageLibraryDirectiveNotFirst);
+      parser.reportRecoverableError(token, codeLibraryDirectiveNotFirst);
     }
   }
 
@@ -97,10 +97,10 @@ class DirectiveContext {
         if (enableFeatureEnhancedParts) {
           state = DirectiveState.ImportAndExport;
         } else {
-          parser.reportRecoverableError(token, messageNonPartOfDirectiveInPart);
+          parser.reportRecoverableError(token, codeNonPartOfDirectiveInPart);
         }
       case DirectiveState.Declarations:
-        parser.reportRecoverableError(token, messageDirectiveAfterDeclaration);
+        parser.reportRecoverableError(token, codeDirectiveAfterDeclaration);
     }
   }
 
@@ -111,9 +111,9 @@ class DirectiveContext {
     }
     // Recovery
     if (state == DirectiveState.PartOf) {
-      parser.reportRecoverableError(token, messagePartOfTwice);
+      parser.reportRecoverableError(token, codePartOfTwice);
     } else {
-      parser.reportRecoverableError(token, messageNonPartOfDirectiveInPart);
+      parser.reportRecoverableError(token, codeNonPartOfDirectiveInPart);
     }
   }
 

pkg/_fe_analyzer_shared/lib/src/parser/identifier_context_impl.dart

@@ -31,7 +31,7 @@ class CatchParameterIdentifierContext extends IdentifierContext {
     }
 
     // Recovery
-    parser.reportRecoverableError(identifier, codes.messageCatchSyntax);
+    parser.reportRecoverableError(identifier, codes.codeCatchSyntax);
     if (looksLikeStatementStart(identifier) ||
         identifier.isA(TokenType.COMMA) ||
         identifier.isA(TokenType.CLOSE_PAREN) ||
@@ -1156,7 +1156,7 @@ class MethodDeclarationIdentifierContext extends IdentifierContext {
       return parser.insertSyntheticIdentifier(
         identifier,
         this,
-        message: codes.messageMissingOperatorKeyword,
+        message: codes.codeMissingOperatorKeyword,
         messageOnToken: identifier,
       );
     } else if (identifier.isA(TokenType.PERIOD) ||
@@ -1518,7 +1518,7 @@ class TypeReferenceIdentifierContext extends IdentifierContext {
       return next;
     } else if (next.isKeywordOrIdentifier) {
       if (next.isA(Keyword.VOID)) {
-        parser.reportRecoverableError(next, codes.messageInvalidVoid);
+        parser.reportRecoverableError(next, codes.codeInvalidVoid);
       } else if (next.type.isBuiltIn) {
         if (!isBuiltInIdentifierAllowed) {
           parser.reportRecoverableErrorWithToken(
@@ -1527,7 +1527,7 @@ class TypeReferenceIdentifierContext extends IdentifierContext {
           );
         }
       } else if (next.isA(Keyword.VAR)) {
-        parser.reportRecoverableError(next, codes.messageVarAsTypeName);
+        parser.reportRecoverableError(next, codes.codeVarAsTypeName);
       } else {
         parser.reportRecoverableErrorWithToken(next, codes.codeExpectedType);
       }
@@ -1634,9 +1634,9 @@ class TypeVariableDeclarationIdentifierContext extends IdentifierContext {
 void checkAsyncAwaitYieldAsIdentifier(Token identifier, Parser parser) {
   if (!parser.inPlainSync && identifier.type.isPseudo) {
     if (identifier.isA(Keyword.AWAIT)) {
-      parser.reportRecoverableError(identifier, codes.messageAwaitAsIdentifier);
+      parser.reportRecoverableError(identifier, codes.codeAwaitAsIdentifier);
     } else if (identifier.isA(Keyword.YIELD)) {
-      parser.reportRecoverableError(identifier, codes.messageYieldAsIdentifier);
+      parser.reportRecoverableError(identifier, codes.codeYieldAsIdentifier);
     }
   }
 }

pkg/_fe_analyzer_shared/lib/src/parser/modifier_context.dart

@@ -241,7 +241,7 @@ class ModifierContext {
       if (varFinalOrConst != null) {
         parser.reportRecoverableError(
           varFinalOrConst!,
-          codes.messageFunctionTypedParameterVar,
+          codes.codeFunctionTypedParameterVar,
         );
       }
     }
@@ -274,7 +274,7 @@ class ModifierContext {
     if (abstractToken != null) {
       parser.reportRecoverableError(
         abstractToken!,
-        codes.messageAbstractClassMember,
+        codes.codeAbstractClassMember,
       );
     }
     reportExtraneousModifier(lateToken);
@@ -445,7 +445,7 @@ class ModifierContext {
     } else if (covariantToken != null) {
       reportConflictingModifiers(next, covariantToken!);
     } else if (finalToken != null) {
-      parser.reportRecoverableError(next, codes.messageConstAndFinal);
+      parser.reportRecoverableError(next, codes.codeConstAndFinal);
     } else if (varToken != null) {
       reportConflictingModifiers(next, varToken!);
     } else {
@@ -484,7 +484,7 @@ class ModifierContext {
     } else if (constToken != null) {
       reportConflictingModifiers(next, constToken!);
     } else if (staticToken != null) {
-      parser.reportRecoverableError(next, codes.messageCovariantAndStatic);
+      parser.reportRecoverableError(next, codes.codeCovariantAndStatic);
     } else {
       throw 'Internal Error: Unhandled recovery: $next';
     }
@@ -537,9 +537,9 @@ class ModifierContext {
     } else if (_afterFactory) {
       reportExtraneousModifier(next);
     } else if (constToken != null) {
-      parser.reportRecoverableError(next, codes.messageConstAndFinal);
+      parser.reportRecoverableError(next, codes.codeConstAndFinal);
     } else if (varToken != null) {
-      parser.reportRecoverableError(next, codes.messageFinalAndVar);
+      parser.reportRecoverableError(next, codes.codeFinalAndVar);
     } else if (lateToken != null) {
       reportModifierOutOfOrder(next, lateToken!.lexeme);
     } else {
@@ -612,7 +612,7 @@ class ModifierContext {
 
     // Recovery
     if (covariantToken != null) {
-      parser.reportRecoverableError(next, codes.messageCovariantAndStatic);
+      parser.reportRecoverableError(next, codes.codeCovariantAndStatic);
     } else if (staticToken != null) {
       parser.reportRecoverableErrorWithToken(
         next,
@@ -645,7 +645,7 @@ class ModifierContext {
     } else if (constToken != null) {
       reportConflictingModifiers(next, constToken!);
     } else if (finalToken != null) {
-      parser.reportRecoverableError(next, codes.messageFinalAndVar);
+      parser.reportRecoverableError(next, codes.codeFinalAndVar);
     } else {
       throw 'Internal Error: Unexpected varFinalOrConst: $varFinalOrConst';
     }
@@ -676,14 +676,14 @@ class ModifierContext {
   void reportTopLevelModifierError(Token? modifier, Token afterModifiers) {
     if (modifier != null) {
       if (modifier.isA(Keyword.CONST) && afterModifiers.isA(Keyword.CLASS)) {
-        parser.reportRecoverableError(modifier, codes.messageConstClass);
+        parser.reportRecoverableError(modifier, codes.codeConstClass);
       } else if (modifier.isA(Keyword.EXTERNAL)) {
         if (afterModifiers.isA(Keyword.CLASS)) {
-          parser.reportRecoverableError(modifier, codes.messageExternalClass);
+          parser.reportRecoverableError(modifier, codes.codeExternalClass);
         } else if (afterModifiers.isA(Keyword.ENUM)) {
-          parser.reportRecoverableError(modifier, codes.messageExternalEnum);
+          parser.reportRecoverableError(modifier, codes.codeExternalEnum);
         } else if (afterModifiers.isA(Keyword.TYPEDEF)) {
-          parser.reportRecoverableError(modifier, codes.messageExternalTypedef);
+          parser.reportRecoverableError(modifier, codes.codeExternalTypedef);
         } else {
           parser.reportRecoverableErrorWithToken(
             modifier,

pkg/_fe_analyzer_shared/lib/src/parser/parser.dart

@@ -13,7 +13,7 @@ import 'parser_impl.dart' show Parser;
 import 'parser_error.dart' show ParserError;
 
 import '../messages/codes.dart'
-    show Message, messageNativeClauseShouldBeAnnotation;
+    show Message, codeNativeClauseShouldBeAnnotation;
 
 export 'assert.dart' show Assert;
 
@@ -61,7 +61,7 @@ class ErrorCollectingListener extends Listener {
     Token endToken,
   ) {
     /// TODO(danrubel): Ignore this error until we deprecate `native` support.
-    if (message == messageNativeClauseShouldBeAnnotation) {
+    if (message == codeNativeClauseShouldBeAnnotation) {
       return;
     }
     recoverableErrors.add(

pkg/_fe_analyzer_shared/lib/src/parser/quote.dart

@@ -245,7 +245,7 @@ String unescapeCodeUnits(
       if (codeUnits.length == ++i) {
         // This should only be reachable in error cases.
         listener.handleUnescapeError(
-          codes.messageInvalidEscapeStarted,
+          codes.codeInvalidEscapeStarted,
           location,
           i,
           /* length = */ 1,
@@ -279,7 +279,7 @@ String unescapeCodeUnits(
         int begin = i;
         if (codeUnits.length <= i + 2) {
           listener.handleUnescapeError(
-            codes.messageInvalidHexEscape,
+            codes.codeInvalidHexEscape,
             location,
             begin,
             codeUnits.length + 1 - begin,
@@ -291,7 +291,7 @@ String unescapeCodeUnits(
           int digit = codeUnits[++i];
           if (!isHexDigit(digit)) {
             listener.handleUnescapeError(
-              codes.messageInvalidHexEscape,
+              codes.codeInvalidHexEscape,
               location,
               begin,
               i + 1 - begin,
@@ -304,7 +304,7 @@ String unescapeCodeUnits(
         int begin = i;
         if (codeUnits.length == i + 1) {
           listener.handleUnescapeError(
-            codes.messageInvalidUnicodeEscapeUStarted,
+            codes.codeInvalidUnicodeEscapeUStarted,
             location,
             begin,
             codeUnits.length + 1 - begin,
@@ -317,7 +317,7 @@ String unescapeCodeUnits(
           // Expect 1-6 hex digits followed by '}'.
           if (codeUnits.length == ++i) {
             listener.handleUnescapeError(
-              codes.messageInvalidUnicodeEscapeUBracket,
+              codes.codeInvalidUnicodeEscapeUBracket,
               location,
               begin,
               i + 1 - begin,
@@ -328,7 +328,7 @@ String unescapeCodeUnits(
           for (int j = 0; j < 7; j++) {
             if (codeUnits.length == ++i) {
               listener.handleUnescapeError(
-                codes.messageInvalidUnicodeEscapeUBracket,
+                codes.codeInvalidUnicodeEscapeUBracket,
                 location,
                 begin,
                 i + 1 - begin,
@@ -344,7 +344,7 @@ String unescapeCodeUnits(
             }
             if (!isHexDigit(digit)) {
               listener.handleUnescapeError(
-                codes.messageInvalidUnicodeEscapeUBracket,
+                codes.codeInvalidUnicodeEscapeUBracket,
                 location,
                 begin,
                 i + 2 - begin,
@@ -355,7 +355,7 @@ String unescapeCodeUnits(
           }
           if (!foundEndBracket) {
             listener.handleUnescapeError(
-              codes.messageInvalidUnicodeEscapeUBracket,
+              codes.codeInvalidUnicodeEscapeUBracket,
               location,
               begin,
               i + 1 - begin,
@@ -365,7 +365,7 @@ String unescapeCodeUnits(
           // Expect exactly 4 hex digits.
           if (codeUnits.length <= i + 4) {
             listener.handleUnescapeError(
-              codes.messageInvalidUnicodeEscapeUNoBracket,
+              codes.codeInvalidUnicodeEscapeUNoBracket,
               location,
               begin,
               codeUnits.length + 1 - begin,
@@ -377,7 +377,7 @@ String unescapeCodeUnits(
             int digit = codeUnits[++i];
             if (!isHexDigit(digit)) {
               listener.handleUnescapeError(
-                codes.messageInvalidUnicodeEscapeUNoBracket,
+                codes.codeInvalidUnicodeEscapeUNoBracket,
                 location,
                 begin,
                 i + 1 - begin,
@@ -389,7 +389,7 @@ String unescapeCodeUnits(
         }
         if (code > 0x10FFFF) {
           listener.handleUnescapeError(
-            codes.messageInvalidCodePoint,
+            codes.codeInvalidCodePoint,
             location,
             begin,
             i + 1 - begin,

pkg/_fe_analyzer_shared/lib/src/parser/type_info_impl.dart

@@ -430,7 +430,7 @@ class VoidType implements TypeInfo {
   @override
   Token ensureTypeNotVoid(Token token, Parser parser) {
     // Report an error, then parse `void` as if it were a type name.
-    parser.reportRecoverableError(token.next!, codes.messageInvalidVoid);
+    parser.reportRecoverableError(token.next!, codes.codeInvalidVoid);
     return simpleType.parseTypeNotVoid(token, parser);
   }
 
@@ -454,7 +454,7 @@ class VoidType implements TypeInfo {
         hasTypeArguments = true;
         parser.reportRecoverableError(
           token.next!,
-          codes.messageVoidWithTypeArguments,
+          codes.codeVoidWithTypeArguments,
         );
         token = typeParam.parseArguments(token, parser);
       }
@@ -1450,7 +1450,7 @@ class ComplexTypeParamOrArgInfo extends TypeParamOrArgInfo {
           parser.reportRecoverableErrorWithEnd(
             atToken,
             next,
-            codes.messageAnnotationOnTypeArgument,
+            codes.codeAnnotationOnTypeArgument,
           );
           typeInfo = computeType(next, /* required = */ true, inDeclaration);
         }
@@ -1509,7 +1509,7 @@ class ComplexTypeParamOrArgInfo extends TypeParamOrArgInfo {
           // Report an error and skip actual identifier
           parser.reportRecoverableError(
             identifier,
-            codes.messageMultipleVarianceModifiers,
+            codes.codeMultipleVarianceModifiers,
           );
           variance = variance.next!;
           identifier = identifier.next!;

pkg/_fe_analyzer_shared/lib/src/scanner/abstract_scanner.dart

@@ -31,11 +31,11 @@ import 'token.dart' as analyzer show StringToken;
 
 import '../messages/codes.dart'
     show
-        messageExpectedHexDigit,
-        messageMissingExponent,
-        messageUnexpectedDollarInString,
-        messageUnexpectedSeparatorInNumber,
-        messageUnterminatedComment;
+        codeExpectedHexDigit,
+        codeMissingExponent,
+        codeUnexpectedDollarInString,
+        codeUnexpectedSeparatorInNumber,
+        codeUnterminatedComment;
 
 import '../util/link.dart' show Link;
 
@@ -1492,7 +1492,7 @@ abstract class AbstractScanner implements Scanner {
           // Not allowed.
           prependErrorToken(
             new UnterminatedToken(
-              messageUnexpectedSeparatorInNumber,
+              codeUnexpectedSeparatorInNumber,
               start,
               stringOffset,
             ),
@@ -1505,7 +1505,7 @@ abstract class AbstractScanner implements Scanner {
             // Not allowed.
             prependErrorToken(
               new UnterminatedToken(
-                messageUnexpectedSeparatorInNumber,
+                codeUnexpectedSeparatorInNumber,
                 start,
                 stringOffset,
               ),
@@ -1527,7 +1527,7 @@ abstract class AbstractScanner implements Scanner {
           // End of the number is a separator; not allowed.
           prependErrorToken(
             new UnterminatedToken(
-              messageUnexpectedSeparatorInNumber,
+              codeUnexpectedSeparatorInNumber,
               start,
               stringOffset,
             ),
@@ -1567,7 +1567,7 @@ abstract class AbstractScanner implements Scanner {
           // Not allowed.
           prependErrorToken(
             new UnterminatedToken(
-              messageUnexpectedSeparatorInNumber,
+              codeUnexpectedSeparatorInNumber,
               start,
               stringOffset,
             ),
@@ -1578,7 +1578,7 @@ abstract class AbstractScanner implements Scanner {
       } else {
         if (!hasDigits) {
           prependErrorToken(
-            new UnterminatedToken(messageExpectedHexDigit, start, stringOffset),
+            new UnterminatedToken(codeExpectedHexDigit, start, stringOffset),
           );
           // Recovery
           appendSyntheticSubstringToken(
@@ -1593,7 +1593,7 @@ abstract class AbstractScanner implements Scanner {
           // End of the number is a separator; not allowed.
           prependErrorToken(
             new UnterminatedToken(
-              messageUnexpectedSeparatorInNumber,
+              codeUnexpectedSeparatorInNumber,
               start,
               stringOffset,
             ),
@@ -1652,7 +1652,7 @@ abstract class AbstractScanner implements Scanner {
           // Not allowed.
           prependErrorToken(
             new UnterminatedToken(
-              messageUnexpectedSeparatorInNumber,
+              codeUnexpectedSeparatorInNumber,
               start,
               stringOffset,
             ),
@@ -1663,7 +1663,7 @@ abstract class AbstractScanner implements Scanner {
         while (next == $_) {
           prependErrorToken(
             new UnterminatedToken(
-              messageUnexpectedSeparatorInNumber,
+              codeUnexpectedSeparatorInNumber,
               start,
               stringOffset,
             ),
@@ -1685,7 +1685,7 @@ abstract class AbstractScanner implements Scanner {
             if (!hasExponentDigits) {
               prependErrorToken(
                 new UnterminatedToken(
-                  messageUnexpectedSeparatorInNumber,
+                  codeUnexpectedSeparatorInNumber,
                   start,
                   stringOffset,
                 ),
@@ -1705,7 +1705,7 @@ abstract class AbstractScanner implements Scanner {
               );
               prependErrorToken(
                 new UnterminatedToken(
-                  messageMissingExponent,
+                  codeMissingExponent,
                   tokenStart,
                   stringOffset,
                 ),
@@ -1720,7 +1720,7 @@ abstract class AbstractScanner implements Scanner {
           // End of the number is a separator; not allowed.
           prependErrorToken(
             new UnterminatedToken(
-              messageUnexpectedSeparatorInNumber,
+              codeUnexpectedSeparatorInNumber,
               start,
               stringOffset,
             ),
@@ -1734,7 +1734,7 @@ abstract class AbstractScanner implements Scanner {
           // End of the number is a separator; not allowed.
           prependErrorToken(
             new UnterminatedToken(
-              messageUnexpectedSeparatorInNumber,
+              codeUnexpectedSeparatorInNumber,
               start,
               stringOffset,
             ),
@@ -1918,7 +1918,7 @@ abstract class AbstractScanner implements Scanner {
         }
         prependErrorToken(
           new UnterminatedToken(
-            messageUnterminatedComment,
+            codeUnterminatedComment,
             tokenStart,
             stringOffset,
           ),
@@ -2231,7 +2231,7 @@ abstract class AbstractScanner implements Scanner {
       );
       prependErrorToken(
         new UnterminatedToken(
-          messageUnexpectedDollarInString,
+          codeUnexpectedDollarInString,
           tokenStart,
           stringOffset,
         ),

pkg/_fe_analyzer_shared/lib/src/scanner/error_token.dart

@@ -8,7 +8,7 @@ import '../messages/codes.dart'
     show
         Code,
         Message,
-        messageEncoding,
+        codeEncoding,
         codeAsciiControlCharacter,
         codeNonAsciiIdentifier,
         codeNonAsciiWhitespace,
@@ -112,7 +112,7 @@ class EncodingErrorToken extends ErrorToken {
   String toString() => "EncodingErrorToken()";
 
   @override
-  Message get assertionMessage => messageEncoding;
+  Message get assertionMessage => codeEncoding;
 }
 
 /// Represents a non-ASCII character outside a string or comment.

pkg/_js_interop_checks/lib/js_interop_checks.dart

@@ -12,26 +12,26 @@ import 'package:front_end/src/api_prototype/codes.dart'
     show
         Message,
         LocatedMessage,
-        messageDartFfiLibraryInDart2Wasm,
-        messageJsInteropDartJsInteropAnnotationForStaticInteropOnly,
-        messageJsInteropEnclosingClassJSAnnotation,
-        messageJsInteropEnclosingClassJSAnnotationContext,
-        messageJsInteropExtensionTypeMemberNotInterop,
-        messageJsInteropExtensionTypeUsedWithWrongJsAnnotation,
-        messageJsInteropExternalExtensionMemberOnTypeInvalid,
-        messageJsInteropExternalExtensionMemberWithStaticDisallowed,
-        messageJsInteropExternalMemberNotJSAnnotated,
-        messageJsInteropFunctionToJSNamedParameters,
-        messageJsInteropFunctionToJSTypeParameters,
-        messageJsInteropInvalidStaticClassMemberName,
-        messageJsInteropNamedParameters,
-        messageJsInteropNonExternalConstructor,
-        messageJsInteropNonExternalMember,
-        messageJsInteropOperatorCannotBeRenamed,
-        messageJsInteropOperatorsNotSupported,
-        messageJsInteropStaticInteropGenerativeConstructor,
-        messageJsInteropStaticInteropParameterInitializersAreIgnored,
-        messageJsInteropStaticInteropSyntheticConstructor,
+        codeDartFfiLibraryInDart2Wasm,
+        codeJsInteropDartJsInteropAnnotationForStaticInteropOnly,
+        codeJsInteropEnclosingClassJSAnnotation,
+        codeJsInteropEnclosingClassJSAnnotationContext,
+        codeJsInteropExtensionTypeMemberNotInterop,
+        codeJsInteropExtensionTypeUsedWithWrongJsAnnotation,
+        codeJsInteropExternalExtensionMemberOnTypeInvalid,
+        codeJsInteropExternalExtensionMemberWithStaticDisallowed,
+        codeJsInteropExternalMemberNotJSAnnotated,
+        codeJsInteropFunctionToJSNamedParameters,
+        codeJsInteropFunctionToJSTypeParameters,
+        codeJsInteropInvalidStaticClassMemberName,
+        codeJsInteropNamedParameters,
+        codeJsInteropNonExternalConstructor,
+        codeJsInteropNonExternalMember,
+        codeJsInteropOperatorCannotBeRenamed,
+        codeJsInteropOperatorsNotSupported,
+        codeJsInteropStaticInteropGenerativeConstructor,
+        codeJsInteropStaticInteropParameterInitializersAreIgnored,
+        codeJsInteropStaticInteropSyntheticConstructor,
         codeJsInteropDartClassExtendsJSClass,
         codeJsInteropDisallowedInteropLibraryInDart2Wasm,
         codeJsInteropJSClassExtendsDartClass,
@@ -229,7 +229,7 @@ class JsInteropChecks extends RecursiveVisitor {
   void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
     if (hasPackageJSAnnotation(node)) {
       _reporter.report(
-        messageJsInteropExtensionTypeUsedWithWrongJsAnnotation,
+        codeJsInteropExtensionTypeUsedWithWrongJsAnnotation,
         node.fileOffset,
         node.name.length,
         node.fileUri,
@@ -323,7 +323,7 @@ class JsInteropChecks extends RecursiveVisitor {
       // For classes, `dart:js_interop`'s `@JS` can only be used with
       // `@staticInterop`.
       if (hasDartJSInteropAnnotation(node)) {
-        report(messageJsInteropDartJsInteropAnnotationForStaticInteropOnly);
+        report(codeJsInteropDartJsInteropAnnotationForStaticInteropOnly);
       }
       if (superclass != null && hasStaticInteropAnnotation(superclass)) {
         report(
@@ -408,7 +408,7 @@ class JsInteropChecks extends RecursiveVisitor {
         !node.isStatic) {
       // If not one of few exceptions, member is not allowed to exclude
       // `external` inside of a JS interop class.
-      report(messageJsInteropNonExternalMember);
+      report(codeJsInteropNonExternalMember);
     }
 
     if (!_isJSInteropMember(node)) {
@@ -440,7 +440,7 @@ class JsInteropChecks extends RecursiveVisitor {
       if (node.isStatic &&
           node.enclosingClass != null &&
           getJSName(node).contains('.')) {
-        report(messageJsInteropInvalidStaticClassMemberName);
+        report(codeJsInteropInvalidStaticClassMemberName);
       }
 
       if (_classHasStaticInteropAnnotation ||
@@ -459,9 +459,7 @@ class JsInteropChecks extends RecursiveVisitor {
             // We do not support external extension members with the 'static'
             // keyword currently.
             if (extensionIndex.getExtensionDescriptor(node)!.isStatic) {
-              report(
-                messageJsInteropExternalExtensionMemberWithStaticDisallowed,
-              );
+              report(codeJsInteropExternalExtensionMemberWithStaticDisallowed);
             }
           }
         } else {
@@ -535,11 +533,11 @@ class JsInteropChecks extends RecursiveVisitor {
     if (!node.isSynthetic) {
       if (_classHasJSAnnotation && !node.isExternal) {
         // Non-synthetic constructors must be annotated with `external`.
-        report(messageJsInteropNonExternalConstructor);
+        report(codeJsInteropNonExternalConstructor);
       }
       if (_classHasStaticInteropAnnotation) {
         // Can only have factory constructors on @staticInterop classes.
-        report(messageJsInteropStaticInteropGenerativeConstructor);
+        report(codeJsInteropStaticInteropGenerativeConstructor);
       }
     }
 
@@ -561,7 +559,7 @@ class JsInteropChecks extends RecursiveVisitor {
         !_inTearoff &&
         hasStaticInteropAnnotation(constructor.enclosingClass)) {
       _reporter.report(
-        messageJsInteropStaticInteropSyntheticConstructor,
+        codeJsInteropStaticInteropSyntheticConstructor,
         node.fileOffset,
         node.name.text.length,
         node.location?.file,
@@ -641,7 +639,7 @@ class JsInteropChecks extends RecursiveVisitor {
             );
         if (allowedToImport) return;
         final message = dependencyUriString == 'dart:ffi'
-            ? messageDartFfiLibraryInDart2Wasm
+            ? codeDartFfiLibraryInDart2Wasm
             : codeJsInteropDisallowedInteropLibraryInDart2Wasm.withArguments(
                 dependencyUriString,
               );
@@ -742,7 +740,7 @@ class JsInteropChecks extends RecursiveVisitor {
         final annotatable = extensionIndex.getExtensionAnnotatable(member);
         if (annotatable == null) {
           _reporter.report(
-            messageJsInteropExternalExtensionMemberOnTypeInvalid,
+            codeJsInteropExternalExtensionMemberOnTypeInvalid,
             member.fileOffset,
             member.name.text.length,
             member.fileUri,
@@ -752,7 +750,7 @@ class JsInteropChecks extends RecursiveVisitor {
         final extensionType = extensionIndex.getExtensionType(member);
         if (extensionType == null) {
           _reporter.report(
-            messageJsInteropExtensionTypeMemberNotInterop,
+            codeJsInteropExtensionTypeMemberNotInterop,
             member.fileOffset,
             member.name.text.length,
             member.fileUri,
@@ -763,7 +761,7 @@ class JsInteropChecks extends RecursiveVisitor {
         // if inside a non-JS interop class. Should not report an error in this
         // case, since a different error will already be produced.
         _reporter.report(
-          messageJsInteropExternalMemberNotJSAnnotated,
+          codeJsInteropExternalMemberNotJSAnnotated,
           member.fileOffset,
           member.name.text.length,
           member.fileUri,
@@ -842,7 +840,7 @@ class JsInteropChecks extends RecursiveVisitor {
       // Use of a synthetic generative constructor on @staticInterop class is
       // disallowed.
       _reporter.report(
-        messageJsInteropStaticInteropSyntheticConstructor,
+        codeJsInteropStaticInteropSyntheticConstructor,
         context.fileOffset,
         1,
         context.location!.file,
@@ -870,10 +868,10 @@ class JsInteropChecks extends RecursiveVisitor {
       );
     } else {
       if (functionType.typeParameters.isNotEmpty) {
-        report(messageJsInteropFunctionToJSTypeParameters);
+        report(codeJsInteropFunctionToJSTypeParameters);
       }
       if (functionType.namedParameters.isNotEmpty) {
-        report(messageJsInteropFunctionToJSNamedParameters);
+        report(codeJsInteropFunctionToJSNamedParameters);
       }
       _reportFunctionToJSInvocationIfNotAllowedFunctionType(functionType, node);
     }
@@ -890,12 +888,12 @@ class JsInteropChecks extends RecursiveVisitor {
       // If in a class that is not JS interop, this member is not allowed to be
       // JS interop.
       _reporter.report(
-        messageJsInteropEnclosingClassJSAnnotation,
+        codeJsInteropEnclosingClassJSAnnotation,
         member.fileOffset,
         member.name.text.length,
         member.fileUri,
         context: <LocatedMessage>[
-          messageJsInteropEnclosingClassJSAnnotationContext.withLocation(
+          codeJsInteropEnclosingClassJSAnnotationContext.withLocation(
             enclosingClass.fileUri,
             enclosingClass.fileOffset,
             enclosingClass.name.length,
@@ -927,7 +925,7 @@ class JsInteropChecks extends RecursiveVisitor {
     }
     if (isInvalidOperator) {
       _reporter.report(
-        messageJsInteropOperatorsNotSupported,
+        codeJsInteropOperatorsNotSupported,
         node.fileOffset,
         node.name.text.length,
         node.fileUri,
@@ -935,7 +933,7 @@ class JsInteropChecks extends RecursiveVisitor {
     }
     if (operatorHasRenaming) {
       _reporter.report(
-        messageJsInteropOperatorCannotBeRenamed,
+        codeJsInteropOperatorCannotBeRenamed,
         node.fileOffset,
         node.name.text.length,
         node.fileUri,
@@ -968,7 +966,7 @@ class JsInteropChecks extends RecursiveVisitor {
     if (functionNode.namedParameters.isNotEmpty) {
       final firstNamedParam = functionNode.namedParameters[0];
       _reporter.report(
-        messageJsInteropNamedParameters,
+        codeJsInteropNamedParameters,
         firstNamedParam.fileOffset,
         firstNamedParam.name!.length,
         firstNamedParam.location!.file,
@@ -985,7 +983,7 @@ class JsInteropChecks extends RecursiveVisitor {
     ]) {
       if (param.hasDeclaredInitializer) {
         _reporter.report(
-          messageJsInteropStaticInteropParameterInitializersAreIgnored,
+          codeJsInteropStaticInteropParameterInitializersAreIgnored,
           param.fileOffset,
           param.name!.length,
           param.location!.file,

pkg/_js_interop_checks/lib/src/transformations/shared_interop_transformer.dart

@@ -9,7 +9,7 @@ import 'package:_js_interop_checks/js_interop_checks.dart'
 import 'package:_js_interop_checks/src/js_interop.dart' as js_interop;
 import 'package:front_end/src/api_prototype/codes.dart'
     show
-        messageJsInteropIsATearoff,
+        codeJsInteropIsATearoff,
         codeJsInteropExportClassNotMarkedExportable,
         codeJsInteropExportInvalidInteropTypeArgument,
         codeJsInteropExportInvalidTypeArgument,
@@ -205,7 +205,7 @@ class SharedInteropTransformer extends Transformer {
     } else if (target == _isATearoff) {
       // Calling the generated tear-off is still bad, however.
       _diagnosticReporter.report(
-        messageJsInteropIsATearoff,
+        codeJsInteropIsATearoff,
         invocation.fileOffset,
         invocation.name.text.length,
         invocation.location?.file,

pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -8,24 +8,24 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart'
         Message,
         MessageCode,
         codeBuiltInIdentifierInDeclaration,
-        messageAbstractLateField,
-        messageAbstractStaticField,
-        messageConstConstructorWithBody,
-        messageConstFactory,
-        messageConstructorWithTypeParameters,
-        messageDirectiveAfterDeclaration,
-        messageExpectedStatement,
-        messageExternalLateField,
-        messageFieldInitializerOutsideConstructor,
-        messageIllegalAssignmentToNonAssignable,
-        messageInterpolationInUri,
-        messageInvalidInitializer,
-        messageInvalidSuperInInitializer,
-        messageInvalidThisInInitializer,
-        messageMissingAssignableSelector,
-        messageNativeClauseShouldBeAnnotation,
-        messageOperatorWithTypeParameters,
-        messagePositionalAfterNamedArgument,
+        codeAbstractLateField,
+        codeAbstractStaticField,
+        codeConstConstructorWithBody,
+        codeConstFactory,
+        codeConstructorWithTypeParameters,
+        codeDirectiveAfterDeclaration,
+        codeExpectedStatement,
+        codeExternalLateField,
+        codeFieldInitializerOutsideConstructor,
+        codeIllegalAssignmentToNonAssignable,
+        codeInterpolationInUri,
+        codeInvalidInitializer,
+        codeInvalidSuperInInitializer,
+        codeInvalidThisInInitializer,
+        codeMissingAssignableSelector,
+        codeNativeClauseShouldBeAnnotation,
+        codeOperatorWithTypeParameters,
+        codePositionalAfterNamedArgument,
         codeDuplicateLabelInSwitchStatement,
         codeExpectedIdentifier,
         codeExperimentNotEnabled,
@@ -226,7 +226,7 @@ class AstBuilder extends StackListener {
               'NON_PART_OF_DIRECTIVE_IN_PART',
             ) ??
             false)) {
-      message = messageDirectiveAfterDeclaration;
+      message = codeDirectiveAfterDeclaration;
     }
     diagnosticReporter.reportMessage(message, charOffset, length);
   }
@@ -791,7 +791,7 @@ class AstBuilder extends StackListener {
       // TODO(danrubel): Consider generating this error in the parser
       // This error is also reported in the body builder
       handleRecoverableError(
-        messageInvalidSuperInInitializer,
+        codeInvalidSuperInInitializer,
         target.superKeyword,
         target.superKeyword,
       );
@@ -806,7 +806,7 @@ class AstBuilder extends StackListener {
       // TODO(danrubel): Consider generating this error in the parser
       // This error is also reported in the body builder
       handleRecoverableError(
-        messageInvalidThisInInitializer,
+        codeInvalidThisInInitializer,
         target.thisKeyword,
         target.thisKeyword,
       );
@@ -828,7 +828,7 @@ class AstBuilder extends StackListener {
         if (parameter is FieldFormalParameterImpl) {
           // This error is reported in the BodyBuilder.endFormalParameter.
           handleRecoverableError(
-            messageFieldInitializerOutsideConstructor,
+            codeFieldInitializerOutsideConstructor,
             parameter.thisKeyword,
             parameter.thisKeyword,
           );
@@ -967,7 +967,7 @@ class AstBuilder extends StackListener {
         } else if (hasSeenNamedArgument) {
           // Positional argument after named argument.
           handleRecoverableError(
-            messagePositionalAfterNamedArgument,
+            codePositionalAfterNamedArgument,
             expression.beginToken,
             expression.endToken,
           );
@@ -1298,14 +1298,14 @@ class AstBuilder extends StackListener {
     if (abstractToken != null) {
       if (staticToken != null) {
         handleRecoverableError(
-          messageAbstractStaticField,
+          codeAbstractStaticField,
           abstractToken,
           abstractToken,
         );
       }
       if (lateToken != null) {
         handleRecoverableError(
-          messageAbstractLateField,
+          codeAbstractLateField,
           abstractToken,
           abstractToken,
         );
@@ -1314,7 +1314,7 @@ class AstBuilder extends StackListener {
     if (externalToken != null) {
       if (lateToken != null) {
         handleRecoverableError(
-          messageExternalLateField,
+          codeExternalLateField,
           externalToken,
           externalToken,
         );
@@ -1386,7 +1386,7 @@ class AstBuilder extends StackListener {
       nameId = name.name;
       if (typeParameters != null) {
         handleRecoverableError(
-          messageOperatorWithTypeParameters,
+          codeOperatorWithTypeParameters,
           typeParameters.beginToken,
           typeParameters.endToken,
         );
@@ -1520,7 +1520,7 @@ class AstBuilder extends StackListener {
         if (child is InterpolationExpressionImpl) {
           // This error is reported in OutlineBuilder.endLiteralString
           handleRecoverableError(
-            messageInterpolationInUri,
+            codeInterpolationInUri,
             child.beginToken,
             child.endToken,
           );
@@ -2464,7 +2464,7 @@ class AstBuilder extends StackListener {
         initializers.add(initializer);
       } else {
         handleRecoverableError(
-          messageInvalidInitializer,
+          codeInvalidInitializer,
           initializerObject is AstNodeImpl
               ? initializerObject.beginToken
               : colon,
@@ -3563,7 +3563,7 @@ class AstBuilder extends StackListener {
     if (externalToken != null) {
       if (lateToken != null) {
         handleRecoverableError(
-          messageExternalLateField,
+          codeExternalLateField,
           externalToken,
           externalToken,
         );
@@ -3993,7 +3993,7 @@ class AstBuilder extends StackListener {
     if (!lhs.isAssignable) {
       // TODO(danrubel): Update the BodyBuilder to report this error.
       handleRecoverableError(
-        messageMissingAssignableSelector,
+        codeMissingAssignableSelector,
         lhs.beginToken,
         lhs.endToken,
       );
@@ -4232,7 +4232,7 @@ class AstBuilder extends StackListener {
   void handleConstFactory(Token constKeyword) {
     debugEvent("ConstFactory");
     // TODO(kallentu): Removal of const factory error for const function feature
-    handleRecoverableError(messageConstFactory, constKeyword, constKeyword);
+    handleRecoverableError(codeConstFactory, constKeyword, constKeyword);
   }
 
   @override
@@ -4549,7 +4549,7 @@ class AstBuilder extends StackListener {
         expression.token.keyword?.isBuiltInOrPseudo == false) {
       // This error is also reported by the body builder.
       handleRecoverableError(
-        messageExpectedStatement,
+        codeExpectedStatement,
         expression.beginToken,
         expression.endToken,
       );
@@ -4558,7 +4558,7 @@ class AstBuilder extends StackListener {
       if (!expression.leftHandSide.isAssignable) {
         // This error is also reported by the body builder.
         handleRecoverableError(
-          messageIllegalAssignmentToNonAssignable,
+          codeIllegalAssignmentToNonAssignable,
           expression.leftHandSide.beginToken,
           expression.leftHandSide.endToken,
         );
@@ -5614,7 +5614,7 @@ class AstBuilder extends StackListener {
     Token endToken,
   ) {
     // TODO(danrubel): Ignore this error until we deprecate `native` support.
-    if (message == messageNativeClauseShouldBeAnnotation && allowNativeClause) {
+    if (message == codeNativeClauseShouldBeAnnotation && allowNativeClause) {
       return;
     } else if (message.code == codeBuiltInIdentifierInDeclaration) {
       // Allow e.g. 'class Function' in sdk.
@@ -5896,7 +5896,7 @@ class AstBuilder extends StackListener {
     if (!expression.isAssignable) {
       // This error is also reported by the body builder.
       handleRecoverableError(
-        messageIllegalAssignmentToNonAssignable,
+        codeIllegalAssignmentToNonAssignable,
         operator,
         operator,
       );
@@ -5913,7 +5913,7 @@ class AstBuilder extends StackListener {
     if (!expression.isAssignable) {
       // This error is also reported by the body builder.
       handleRecoverableError(
-        messageMissingAssignableSelector,
+        codeMissingAssignableSelector,
         expression.endToken,
         expression.endToken,
       );
@@ -6059,7 +6059,7 @@ class AstBuilder extends StackListener {
     if (expression is SuperExpressionImpl) {
       // This error is also reported by the body builder.
       handleRecoverableError(
-        messageMissingAssignableSelector,
+        codeMissingAssignableSelector,
         expression.beginToken,
         expression.endToken,
       );
@@ -6120,7 +6120,7 @@ class AstBuilder extends StackListener {
     if (typeParameters != null) {
       // Outline builder also reports this error message.
       handleRecoverableError(
-        messageConstructorWithTypeParameters,
+        codeConstructorWithTypeParameters,
         typeParameters.beginToken,
         typeParameters.endToken,
       );
@@ -6131,7 +6131,7 @@ class AstBuilder extends StackListener {
       Token bodyToken = body.beginToken;
       // Token bodyToken = body.beginToken ?? modifiers.constKeyword;
       handleRecoverableError(
-        messageConstConstructorWithBody,
+        codeConstConstructorWithBody,
         bodyToken,
         bodyToken,
       );
@@ -6204,7 +6204,7 @@ class AstBuilder extends StackListener {
     if (typeParameters != null) {
       // TODO(danrubel): Update OutlineBuilder to report this error message.
       handleRecoverableError(
-        messageConstructorWithTypeParameters,
+        codeConstructorWithTypeParameters,
         typeParameters.beginToken,
         typeParameters.endToken,
       );

pkg/compiler/test/end_to_end/user_crash_test.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 import 'package:expect/async_helper.dart';
 import 'package:expect/expect.dart';
 import 'package:front_end/src/api_prototype/codes.dart'
-    show codeCantReadFile, messageMissingMain;
+    show codeCantReadFile, codeMissingMain;
 import 'package:compiler/compiler_api.dart' as api;
 import 'package:compiler/src/util/memory_compiler.dart';
 
@@ -30,7 +30,7 @@ main() {
     var cantReadFile = codeCantReadFile.withArguments(entryPoint, EXCEPTION);
     List<String> expectedLines = [
       "Error: ${cantReadFile.problemMessage}",
-      "Error: ${messageMissingMain.problemMessage}",
+      "Error: ${codeMissingMain.problemMessage}",
     ];
     test(
       'Throw in input provider',

pkg/dart2wasm/lib/target.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:_fe_analyzer_shared/src/messages/codes.dart'
-    show Message, LocatedMessage, messageWasmImportOrExportInUserCode;
+    show Message, LocatedMessage, codeWasmImportOrExportInUserCode;
 import 'package:_js_interop_checks/js_interop_checks.dart';
 import 'package:_js_interop_checks/src/js_interop.dart' as jsInteropHelper;
 import 'package:_js_interop_checks/src/transformations/shared_interop_transformer.dart';
@@ -599,7 +599,7 @@ void _checkWasmImportExportPragmas(List<Library> libraries, CoreTypes coreTypes,
             if (pragmaName.value == 'wasm:import' ||
                 pragmaName.value == 'wasm:export') {
               diagnosticReporter.report(
-                messageWasmImportOrExportInUserCode,
+                codeWasmImportOrExportInUserCode,
                 annotation.fileOffset,
                 0,
                 library.fileUri,

pkg/front_end/lib/src/api_prototype/kernel_generator.dart

@@ -8,7 +8,7 @@ library front_end.kernel_generator;
 import 'dart:typed_data';
 
 import 'package:_fe_analyzer_shared/src/messages/codes.dart'
-    show messageMissingMain, noLength;
+    show codeMissingMain, noLength;
 import 'package:_fe_analyzer_shared/src/messages/severity.dart'
     show CfeSeverity;
 import 'package:kernel/ast.dart' show Component;
@@ -72,9 +72,8 @@ Future<CompilerResult?> kernelForProgramInternal(
     if (component == null) return null;
 
     if (requireMain && component.mainMethod == null) {
-      context.options.report(
-          context,
-          messageMissingMain.withLocation(source, -1, noLength),
+      context.options.report(context,
+          codeMissingMain.withLocation(source, -1, noLength),
           CfeSeverity.error);
       return null;
     }

pkg/front_end/lib/src/api_unstable/dart2js.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:_fe_analyzer_shared/src/messages/codes.dart'
-    show messageMissingMain;
+    show codeMissingMain;
 import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart'
     show DiagnosticMessageHandler;
 import 'package:_fe_analyzer_shared/src/messages/severity.dart'
@@ -164,9 +164,8 @@ Future<Component?> compile(
     Component? component = compilerResult.component;
     if (component == null) return null;
     if (component.mainMethod == null) {
-      context.options.report(
-          context,
-          messageMissingMain.withLocation(inputs.single, -1, 0),
+      context.options.report(context,
+          codeMissingMain.withLocation(inputs.single, -1, 0),
           CfeSeverity.error);
       return null;
     }

pkg/front_end/lib/src/api_unstable/vm.dart

@@ -44,34 +44,34 @@ export '../base/processed_options.dart' show ProcessedOptions;
 export '../codes/cfe_codes.dart'
     show
         LocatedMessage,
-        messageFfiAbiSpecificIntegerInvalid,
-        messageFfiAbiSpecificIntegerMappingInvalid,
-        messageFfiAddressOfMustBeNative,
-        messageFfiCreateOfStructOrUnion,
-        messageFfiDeeplyImmutableClassesMustBeFinalOrSealed,
-        messageFfiDeeplyImmutableFieldsModifiers,
-        messageFfiDeeplyImmutableFieldsMustBeDeeplyImmutable,
-        messageFfiDeeplyImmutableSubtypesMustBeDeeplyImmutable,
-        messageFfiDeeplyImmutableSupertypeMustBeDeeplyImmutable,
-        messageFfiDefaultAssetDuplicate,
-        messageFfiExceptionalReturnNull,
-        messageFfiExpectedConstant,
-        messageFfiLeafCallMustNotReturnHandle,
-        messageFfiLeafCallMustNotTakeHandle,
-        messageFfiNativeDuplicateAnnotations,
-        messageFfiNativeFieldMissingType,
-        messageFfiNativeFieldMustBeStatic,
-        messageFfiNativeFieldType,
-        messageFfiNativeMustBeExternal,
-        messageFfiNativeOnlyNativeFieldWrapperClassCanBePointer,
-        messageFfiPackedAnnotationAlignment,
-        messageNonPositiveArrayDimensions,
-        messageWeakReferenceMismatchReturnAndArgumentTypes,
-        messageWeakReferenceNotOneArgument,
-        messageWeakReferenceNotStatic,
-        messageWeakReferenceReturnTypeNotNullable,
-        messageWeakReferenceTargetHasParameters,
-        messageWeakReferenceTargetNotStaticTearoff,
+        codeFfiAbiSpecificIntegerInvalid,
+        codeFfiAbiSpecificIntegerMappingInvalid,
+        codeFfiAddressOfMustBeNative,
+        codeFfiCreateOfStructOrUnion,
+        codeFfiDeeplyImmutableClassesMustBeFinalOrSealed,
+        codeFfiDeeplyImmutableFieldsModifiers,
+        codeFfiDeeplyImmutableFieldsMustBeDeeplyImmutable,
+        codeFfiDeeplyImmutableSubtypesMustBeDeeplyImmutable,
+        codeFfiDeeplyImmutableSupertypeMustBeDeeplyImmutable,
+        codeFfiDefaultAssetDuplicate,
+        codeFfiExceptionalReturnNull,
+        codeFfiExpectedConstant,
+        codeFfiLeafCallMustNotReturnHandle,
+        codeFfiLeafCallMustNotTakeHandle,
+        codeFfiNativeDuplicateAnnotations,
+        codeFfiNativeFieldMissingType,
+        codeFfiNativeFieldMustBeStatic,
+        codeFfiNativeFieldType,
+        codeFfiNativeMustBeExternal,
+        codeFfiNativeOnlyNativeFieldWrapperClassCanBePointer,
+        codeFfiPackedAnnotationAlignment,
+        codeNonPositiveArrayDimensions,
+        codeWeakReferenceMismatchReturnAndArgumentTypes,
+        codeWeakReferenceNotOneArgument,
+        codeWeakReferenceNotStatic,
+        codeWeakReferenceReturnTypeNotNullable,
+        codeWeakReferenceTargetHasParameters,
+        codeWeakReferenceTargetNotStaticTearoff,
         noLength,
         codeCantHaveNamedParameters,
         codeCantHaveOptionalParameters,

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

@@ -32,10 +32,10 @@ import '../codes/cfe_codes.dart'
         LocatedMessage,
         Message,
         PlainAndColorizedString,
-        messageCantInferPackagesFromManyInputs,
-        messageCantInferPackagesFromPackageUri,
-        messageInternalProblemProvidedBothCompileSdkAndSdkSummary,
-        messageMissingInput,
+        codeCantInferPackagesFromManyInputs,
+        codeCantInferPackagesFromPackageUri,
+        codeInternalProblemProvidedBothCompileSdkAndSdkSummary,
+        codeMissingInput,
         noLength,
         codeCannotReadSdkSpecification,
         codeCantReadFile,
@@ -363,7 +363,7 @@ class ProcessedOptions {
 
     if (errorOnMissingInput && inputs.isEmpty) {
       // Coverage-ignore-block(suite): Not run.
-      reportWithoutLocation(messageMissingInput, CfeSeverity.error);
+      reportWithoutLocation(codeMissingInput, CfeSeverity.error);
       return false;
     }
 
@@ -387,7 +387,7 @@ class ProcessedOptions {
     if (compileSdk && summary != null) {
       // Coverage-ignore-block(suite): Not run.
       reportWithoutLocation(
-          messageInternalProblemProvidedBothCompileSdkAndSdkSummary,
+          codeInternalProblemProvidedBothCompileSdkAndSdkSummary,
           CfeSeverity.internalProblem);
       return false;
     }
@@ -617,7 +617,7 @@ class ProcessedOptions {
       // TODO(sigmund): consider not reporting an error if we would infer
       // the same `package_config.json` file from all of the inputs.
       reportWithoutLocation(
-          messageCantInferPackagesFromManyInputs, CfeSeverity.error);
+          codeCantInferPackagesFromManyInputs, CfeSeverity.error);
       _packageConfigAndUri = _PackageConfigAndUri.empty;
       return _packages!;
     }
@@ -626,8 +626,7 @@ class ProcessedOptions {
 
     if (input.isScheme('package')) {
       reportNoSourceLine(
-          messageCantInferPackagesFromPackageUri.withLocation(
-              input, -1, noLength),
+          codeCantInferPackagesFromPackageUri.withLocation(input, -1, noLength),
           CfeSeverity.error);
       _packageConfigAndUri = _PackageConfigAndUri.empty;
       return _packages!;

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

@@ -15,7 +15,7 @@ import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/src/bounds_checks.dart' show VarianceCalculationValue;
 import 'package:kernel/src/unaliasing.dart';
 
-import '../codes/cfe_codes.dart' show messageSupertypeIsFunction, noLength;
+import '../codes/cfe_codes.dart' show codeSupertypeIsFunction, noLength;
 import '../kernel/implicit_field_type.dart';
 import '../kernel/type_algorithms.dart';
 import '../source/source_library_builder.dart';
@@ -200,8 +200,7 @@ abstract class FunctionTypeBuilderImpl extends FunctionTypeBuilder {
 
   @override
   Supertype? buildSupertype(LibraryBuilder library, TypeUse typeUse) {
-    library.addProblem(
-        messageSupertypeIsFunction, charOffset, noLength, fileUri);
+    library.addProblem(codeSupertypeIsFunction, charOffset, noLength, fileUri);
     return null;
   }
 

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

@@ -16,14 +16,14 @@ import '../base/messages.dart'
         ProblemReporting,
         CfeSeverity,
         Template,
-        messageClassImplementsDeferredClass,
-        messageExtendsDeferredClass,
-        messageExtensionTypeImplementsDeferred,
-        messageMixinDeferredMixin,
-        messageMixinSuperClassConstraintDeferredClass,
-        messageNotATypeContext,
-        messageTypeVariableInStaticContext,
-        messageTypedefCause,
+        codeClassImplementsDeferredClass,
+        codeExtendsDeferredClass,
+        codeExtensionTypeImplementsDeferred,
+        codeMixinDeferredMixin,
+        codeMixinSuperClassConstraintDeferredClass,
+        codeNotATypeContext,
+        codeTypeVariableInStaticContext,
+        codeTypedefCause,
         noLength,
         codeExtendingRestricted,
         codeNotAPrefixInTypeAnnotation,
@@ -281,7 +281,7 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
       } else {
         template = codeNotAType;
         context = <LocatedMessage>[
-          messageNotATypeContext.withLocation(
+          codeNotATypeContext.withLocation(
               member.fileUri!, member.fileOffset, nameLength)
         ];
         message = template.withArguments(nameText);
@@ -343,7 +343,7 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
           case InstanceTypeParameterAccessState.Disallowed:
             int nameOffset = typeName.nameOffset;
             int nameLength = typeName.nameLength;
-            Message message = messageTypeVariableInStaticContext;
+            Message message = codeTypeVariableInStaticContext;
             problemReporting.addProblem(
                 message, nameOffset, nameLength, fileUri);
             _declaration = buildInvalidTypeDeclarationBuilder(
@@ -352,7 +352,7 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
           case InstanceTypeParameterAccessState.Invalid:
             int nameOffset = typeName.nameOffset;
             int nameLength = typeName.nameLength;
-            Message message = messageTypeVariableInStaticContext;
+            Message message = codeTypeVariableInStaticContext;
             _declaration = buildInvalidTypeDeclarationBuilder(
                 message.withLocation(fileUri!, nameOffset, nameLength));
             return;
@@ -426,7 +426,7 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
           codeSupertypeIsIllegalAliased.withArguments(fullNameForErrors, type);
     }
     library.addProblem(message, charOffset!, noLength, fileUri, context: [
-      messageTypedefCause.withLocation(
+      codeTypedefCause.withLocation(
           aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
     ]);
     return null;
@@ -437,35 +437,35 @@ abstract class NamedTypeBuilderImpl extends NamedTypeBuilder {
       switch (typeUse) {
         case TypeUse.classExtendsType:
           libraryBuilder.addProblem(
-              messageExtendsDeferredClass,
+              codeExtendsDeferredClass,
               typeName.fullNameOffset,
               typeName.fullNameLength,
               fileUri ?? // Coverage-ignore(suite): Not run.
                   libraryBuilder.fileUri);
         case TypeUse.classImplementsType:
           libraryBuilder.addProblem(
-              messageClassImplementsDeferredClass,
+              codeClassImplementsDeferredClass,
               typeName.fullNameOffset,
               typeName.fullNameLength,
               fileUri ?? // Coverage-ignore(suite): Not run.
                   libraryBuilder.fileUri);
         case TypeUse.mixinOnType:
           libraryBuilder.addProblem(
-              messageMixinSuperClassConstraintDeferredClass,
+              codeMixinSuperClassConstraintDeferredClass,
               typeName.fullNameOffset,
               typeName.fullNameLength,
               fileUri ?? // Coverage-ignore(suite): Not run.
                   libraryBuilder.fileUri);
         case TypeUse.extensionTypeImplementsType:
           libraryBuilder.addProblem(
-              messageExtensionTypeImplementsDeferred,
+              codeExtensionTypeImplementsDeferred,
               typeName.fullNameOffset,
               typeName.fullNameLength,
               fileUri ?? // Coverage-ignore(suite): Not run.
                   libraryBuilder.fileUri);
         case TypeUse.classWithType:
           libraryBuilder.addProblem(
-              messageMixinDeferredMixin,
+              codeMixinDeferredMixin,
               typeName.fullNameOffset,
               typeName.fullNameLength,
               fileUri ?? // Coverage-ignore(suite): Not run.

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

@@ -17,10 +17,10 @@ import 'package:kernel/src/unaliasing.dart';
 
 import '../codes/cfe_codes.dart'
     show
-        messageNamedFieldClashesWithPositionalFieldInRecord,
-        messageObjectMemberNameUsedForRecordField,
-        messageRecordFieldsCantBePrivate,
-        messageSupertypeIsFunction,
+        codeNamedFieldClashesWithPositionalFieldInRecord,
+        codeObjectMemberNameUsedForRecordField,
+        codeRecordFieldsCantBePrivate,
+        codeSupertypeIsFunction,
         noLength,
         codeDuplicatedRecordTypeFieldName,
         codeDuplicatedRecordTypeFieldNameContext;
@@ -171,13 +171,13 @@ abstract class RecordTypeBuilderImpl extends RecordTypeBuilder {
             continue;
           }
           if (fieldName.startsWith("_")) {
-            library.addProblem(messageRecordFieldsCantBePrivate,
-                field.charOffset, fieldName.length, fileUri);
+            library.addProblem(codeRecordFieldsCantBePrivate, field.charOffset,
+                fieldName.length, fileUri);
             hasErrors = true;
             continue;
           }
           if (forbiddenObjectMemberNames.contains(fieldName)) {
-            library.addProblem(messageObjectMemberNameUsedForRecordField,
+            library.addProblem(codeObjectMemberNameUsedForRecordField,
                 field.charOffset, fieldName.length, fileUri);
             hasErrors = true;
             continue;
@@ -219,13 +219,13 @@ abstract class RecordTypeBuilderImpl extends RecordTypeBuilder {
           continue;
         }
         if (forbiddenObjectMemberNames.contains(name)) {
-          library.addProblem(messageObjectMemberNameUsedForRecordField,
+          library.addProblem(codeObjectMemberNameUsedForRecordField,
               field.charOffset, name.length, fileUri);
           hasErrors = true;
           continue;
         }
         if (name.startsWith("_")) {
-          library.addProblem(messageRecordFieldsCantBePrivate, field.charOffset,
+          library.addProblem(codeRecordFieldsCantBePrivate, field.charOffset,
               name.length, fileUri);
           hasErrors = true;
           continue;
@@ -233,11 +233,8 @@ abstract class RecordTypeBuilderImpl extends RecordTypeBuilder {
         if (tryParseRecordPositionalGetterName(
                 name, positionalFields?.length ?? 0) !=
             null) {
-          library.addProblem(
-              messageNamedFieldClashesWithPositionalFieldInRecord,
-              field.charOffset,
-              name.length,
-              fileUri);
+          library.addProblem(codeNamedFieldClashesWithPositionalFieldInRecord,
+              field.charOffset, name.length, fileUri);
           hasErrors = true;
           continue;
         }
@@ -284,8 +281,7 @@ abstract class RecordTypeBuilderImpl extends RecordTypeBuilder {
   @override
   // Coverage-ignore(suite): Not run.
   Supertype? buildSupertype(LibraryBuilder library, TypeUse typeUse) {
-    library.addProblem(
-        messageSupertypeIsFunction, charOffset, noLength, fileUri);
+    library.addProblem(codeSupertypeIsFunction, charOffset, noLength, fileUri);
     return null;
   }
 

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

@@ -376,12 +376,12 @@ abstract class TypeAliasBuilderImpl extends TypeDeclarationBuilderImpl
           }
           if (found) {
             libraryBuilder.addProblem(
-                messageTypedefTypeParameterNotConstructor,
+                codeTypedefTypeParameterNotConstructor,
                 usedAsClassCharOffset ?? TreeNode.noOffset,
                 noLength,
                 usedAsClassFileUri,
                 context: [
-                  messageTypedefTypeParameterNotConstructorCause.withLocation(
+                  codeTypedefTypeParameterNotConstructorCause.withLocation(
                       current.fileUri!, current.fileOffset, noLength),
                 ]);
             return this;

pkg/front_end/lib/src/dill/dill_loader.dart

@@ -19,7 +19,7 @@ import '../base/messages.dart'
         noLength,
         SummaryTemplate,
         Template,
-        messagePlatformPrivateLibraryAccess,
+        codePlatformPrivateLibraryAccess,
         codeInternalProblemContextSeverity;
 import '../base/problems.dart' show internalProblem;
 import '../base/ticker.dart' show Ticker;
@@ -137,7 +137,7 @@ class DillLoader extends Loader {
           !target.backendTarget
               .allowPlatformPrivateLibraryAccess(accessor.importUri, uri)) {
         // Coverage-ignore-block(suite): Not run.
-        accessor.addProblem(messagePlatformPrivateLibraryAccess, charOffset,
+        accessor.addProblem(codePlatformPrivateLibraryAccess, charOffset,
             noLength, accessor.fileUri);
       }
     }

pkg/front_end/lib/src/fragment/factory/encoding.dart

@@ -352,7 +352,7 @@ class FactoryEncoding implements InferredTypeListener {
             // cases of handling of type arguments after constructor
             // names.
             libraryBuilder.addProblem(
-                messageConstructorWithTypeArguments,
+                codeConstructorWithTypeArguments,
                 redirectionTargetName.nameOffset,
                 redirectionTargetName.nameLength,
                 _fragment.fileUri);
@@ -400,7 +400,7 @@ class FactoryEncoding implements InferredTypeListener {
           targetNode.enclosingClass.isEnum) {
         _addProblemForRedirectingFactory(
             libraryBuilder: libraryBuilder,
-            message: messageEnumFactoryRedirectsToConstructor,
+            message: codeEnumFactoryRedirectsToConstructor,
             fileOffset: redirectionTarget.charOffset,
             length: noLength,
             fileUri: redirectionTarget.fileUri);
@@ -442,7 +442,7 @@ class FactoryEncoding implements InferredTypeListener {
     // Ensure that constant factories only have constant targets/bodies.
     if (_fragment.modifiers.isConst && !target.isConst) {
       // Coverage-ignore-block(suite): Not run.
-      libraryBuilder.addProblem(messageConstFactoryRedirectionToNonConst,
+      libraryBuilder.addProblem(codeConstFactoryRedirectionToNonConst,
           _fragment.fullNameOffset, noLength, _fragment.fileUri);
     }
 
@@ -851,7 +851,7 @@ class ExtensionFactoryEncodingStrategy implements FactoryEncodingStrategy {
     TypeBuilder returnType = new NamedTypeBuilderImpl.forInvalidType(
         fullName,
         const NullabilityBuilder.omitted(),
-        messageExtensionDeclaresConstructor.withLocation(
+        codeExtensionDeclaresConstructor.withLocation(
             fileUri, fullNameOffset, fullNameLength));
     return (typeParameters, returnType);
   }

pkg/front_end/lib/src/fragment/field/declaration.dart

@@ -273,7 +273,7 @@ class RegularFieldDeclaration
         // Coverage-ignore(suite): Not run.
         !_fragment.modifiers.isFinal) {
       internalProblem(
-          messageInternalProblemAlreadyInitialized, nameOffset, fileUri);
+          codeInternalProblemAlreadyInitialized, nameOffset, fileUri);
     }
     _encoding.createBodies(coreTypes, initializer);
   }

pkg/front_end/lib/src/kernel/body_builder.dart

@@ -88,7 +88,7 @@ import '../codes/cfe_codes.dart'
         LocatedMessage,
         Message,
         Template,
-        messageNamedFieldClashesWithPositionalFieldInRecord,
+        codeNamedFieldClashesWithPositionalFieldInRecord,
         noLength,
         codeDuplicatedRecordLiteralFieldName,
         codeDuplicatedRecordLiteralFieldNameContext,
@@ -641,8 +641,7 @@ class BodyBuilder extends StackListenerImpl
     } else if (node is Expression) {
       return node;
     } else if (node is SuperInitializer) {
-      return buildProblem(
-          cfe.messageSuperAsExpression, node.fileOffset, noLength);
+      return buildProblem(cfe.codeSuperAsExpression, node.fileOffset, noLength);
     } else {
       return unhandled("${node.runtimeType}", "toValue", -1, uri);
     }
@@ -711,7 +710,7 @@ class BodyBuilder extends StackListenerImpl
         forest.createExpressionStatement(
             element.charOffset,
             ParserErrorGenerator.buildProblemExpression(
-                this, cfe.messageSyntheticToken, element.charOffset))
+                this, cfe.codeSyntheticToken, element.charOffset))
       ])
         ..fileOffset = element.charOffset;
     } else {
@@ -903,8 +902,8 @@ class BodyBuilder extends StackListenerImpl
               // Coverage-ignore(suite): Not run.
               expression is ParenthesizedExpressionGenerator)) {
         Expression value = toValue(expression);
-        push(wrapInProblem(value, cfe.messageExpressionNotMetadata,
-            value.fileOffset, noLength));
+        push(wrapInProblem(
+            value, cfe.codeExpressionNotMetadata, value.fileOffset, noLength));
       } else {
         push(toValue(expression));
       }
@@ -1043,7 +1042,7 @@ class BodyBuilder extends StackListenerImpl
               initializers = <Initializer>[
                 buildInvalidInitializer(
                     buildProblem(
-                        cfe.messageExternalConstructorWithFieldInitializers,
+                        cfe.codeExternalConstructorWithFieldInitializers,
                         formal.fileOffset,
                         formal.name.length),
                     formal.fileOffset)
@@ -1136,8 +1135,8 @@ class BodyBuilder extends StackListenerImpl
     } else {
       Expression value = toValue(node);
       if (!forest.isThrow(node)) {
-        value = wrapInProblem(value, cfe.messageExpectedAnInitializer,
-            value.fileOffset, noLength);
+        value = wrapInProblem(
+            value, cfe.codeExpectedAnInitializer, value.fileOffset, noLength);
       }
       initializers = <Initializer>[
         // TODO(johnniwinther): This should probably be [value] instead of
@@ -1300,8 +1299,8 @@ class BodyBuilder extends StackListenerImpl
               noLocation,
               // This error is added after type inference is done, so we
               // don't need to wrap errors in SyntheticExpressionJudgment.
-              buildProblem(cfe.messageSetterWithWrongNumberOfFormals,
-                  charOffset, noLength)),
+              buildProblem(cfe.codeSetterWithWrongNumberOfFormals, charOffset,
+                  noLength)),
           body,
         ]);
       }
@@ -1314,7 +1313,7 @@ class BodyBuilder extends StackListenerImpl
       if (_context.isExternalFunction || isNoSuchMethodForwarder) {
         body = new Block(<Statement>[
           new ExpressionStatement(buildProblem(
-              cfe.messageExternalMethodWithBody, body.fileOffset, noLength))
+              cfe.codeExternalMethodWithBody, body.fileOffset, noLength))
             ..fileOffset = body.fileOffset,
           body,
         ])
@@ -1341,26 +1340,26 @@ class BodyBuilder extends StackListenerImpl
       case AsyncMarker.Async:
         DartType futureBottomType = libraryBuilder.loader.futureOfBottom;
         if (!typeEnvironment.isSubtypeOf(futureBottomType, returnType)) {
-          problem = cfe.messageIllegalAsyncReturnType;
+          problem = cfe.codeIllegalAsyncReturnType;
         }
         break;
 
       case AsyncMarker.AsyncStar:
         DartType streamBottomType = libraryBuilder.loader.streamOfBottom;
         if (returnType is VoidType) {
-          problem = cfe.messageIllegalAsyncGeneratorVoidReturnType;
+          problem = cfe.codeIllegalAsyncGeneratorVoidReturnType;
         } else if (!typeEnvironment.isSubtypeOf(streamBottomType, returnType)) {
-          problem = cfe.messageIllegalAsyncGeneratorReturnType;
+          problem = cfe.codeIllegalAsyncGeneratorReturnType;
         }
         break;
 
       case AsyncMarker.SyncStar:
         DartType iterableBottomType = libraryBuilder.loader.iterableOfBottom;
         if (returnType is VoidType) {
-          problem = cfe.messageIllegalSyncGeneratorVoidReturnType;
+          problem = cfe.codeIllegalSyncGeneratorVoidReturnType;
         } else if (!typeEnvironment.isSubtypeOf(
             iterableBottomType, returnType)) {
-          problem = cfe.messageIllegalSyncGeneratorReturnType;
+          problem = cfe.codeIllegalSyncGeneratorReturnType;
         }
         break;
 
@@ -1645,7 +1644,7 @@ class BodyBuilder extends StackListenerImpl
     if (!eof.isEof) {
       expression = wrapInLocatedProblem(
           expression,
-          cfe.messageExpectedOneExpression
+          cfe.codeExpectedOneExpression
               .withLocation(uri, eof.charOffset, eof.length));
     }
 
@@ -1861,7 +1860,7 @@ class BodyBuilder extends StackListenerImpl
       if (last is SuperInitializer) {
         if (_context.isEnumClass) {
           initializers[initializers.length - 1] = buildInvalidInitializer(
-              buildProblem(cfe.messageEnumConstructorSuperInitializer,
+              buildProblem(cfe.codeEnumConstructorSuperInitializer,
                   last.fileOffset, noLength))
             ..parent = last.parent;
         } else if (libraryFeatures.superParameters.isEnabled) {
@@ -1869,10 +1868,10 @@ class BodyBuilder extends StackListenerImpl
 
           if (positionalSuperParametersAsArguments != null) {
             if (arguments.positional.isNotEmpty) {
-              addProblem(cfe.messagePositionalSuperParametersAndArguments,
+              addProblem(cfe.codePositionalSuperParametersAndArguments,
                   arguments.fileOffset, noLength,
                   context: <LocatedMessage>[
-                    cfe.messageSuperInitializerParameter.withLocation(
+                    cfe.codeSuperInitializerParameter.withLocation(
                         uri,
                         (positionalSuperParametersAsArguments.first
                                 as VariableGet)
@@ -1932,7 +1931,7 @@ class BodyBuilder extends StackListenerImpl
     if (asyncModifier != AsyncMarker.Sync) {
       _context.addInitializer(
           buildInvalidInitializer(buildProblem(
-              cfe.messageConstructorNotSync, body!.fileOffset, noLength)),
+              cfe.codeConstructorNotSync, body!.fileOffset, noLength)),
           this,
           inferenceResult: null);
     }
@@ -2080,7 +2079,7 @@ class BodyBuilder extends StackListenerImpl
           if (positionalSuperParametersIssueOffsets != null) {
             for (int issueOffset in positionalSuperParametersIssueOffsets) {
               Expression errorMessageExpression = buildProblem(
-                  cfe.messageMissingPositionalSuperConstructorParameter,
+                  cfe.codeMissingPositionalSuperConstructorParameter,
                   issueOffset,
                   noLength);
               errorMessageInitializer ??=
@@ -2090,7 +2089,7 @@ class BodyBuilder extends StackListenerImpl
           if (namedSuperParametersIssueOffsets != null) {
             for (int issueOffset in namedSuperParametersIssueOffsets) {
               Expression errorMessageExpression = buildProblem(
-                  cfe.messageMissingNamedSuperConstructorParameter,
+                  cfe.codeMissingNamedSuperConstructorParameter,
                   issueOffset,
                   noLength);
               errorMessageInitializer ??=
@@ -2185,8 +2184,8 @@ class BodyBuilder extends StackListenerImpl
           if (!libraryFeatures.namedArgumentsAnywhere.isEnabled) {
             arguments[i] = new NamedExpression(
                 "#$i",
-                buildProblem(cfe.messageExpectedNamedArgument,
-                    argument.fileOffset, noLength))
+                buildProblem(cfe.codeExpectedNamedArgument, argument.fileOffset,
+                    noLength))
               ..fileOffset = beginToken.charOffset;
           }
         }
@@ -2380,8 +2379,7 @@ class BodyBuilder extends StackListenerImpl
               receiver.declaration is TypeAliasBuilder));
     }
     if (receiver is ParserRecovery || arguments is ParserRecovery) {
-      push(new ParserErrorGenerator(
-          this, beginToken, cfe.messageSyntheticToken));
+      push(new ParserErrorGenerator(this, beginToken, cfe.codeSyntheticToken));
     } else if (receiver is Identifier) {
       Name name = new Name(receiver.name, libraryBuilder.nameOrigin);
       if (arguments == null) {
@@ -3027,7 +3025,7 @@ class BodyBuilder extends StackListenerImpl
         } else {
           length = name.length;
         }
-        contextMessage = cfe.messageCandidateFound;
+        contextMessage = cfe.codeCandidateFound;
       }
       context = [contextMessage.withLocation(uri, offset, length)];
     }
@@ -3180,7 +3178,7 @@ class BodyBuilder extends StackListenerImpl
           !context.allowedInConstantExpression) {
         // Coverage-ignore-block(suite): Not run.
         addProblem(
-            cfe.messageNotAConstantExpression, token.charOffset, token.length);
+            cfe.codeNotAConstantExpression, token.charOffset, token.length);
       }
       if (token.isSynthetic) {
         push(new ParserRecovery(offsetForToken(token)));
@@ -3256,8 +3254,7 @@ class BodyBuilder extends StackListenerImpl
       PrefixBuilder? prefix,
       Token? prefixToken}) {
     if (nameToken.isSynthetic) {
-      return new ParserErrorGenerator(
-          this, nameToken, cfe.messageSyntheticToken);
+      return new ParserErrorGenerator(this, nameToken, cfe.codeSyntheticToken);
     }
     if (lookupResult != null && lookupResult.isInvalidLookup) {
       return new DuplicateDeclarationGenerator(this, nameToken, lookupResult,
@@ -3302,7 +3299,7 @@ class BodyBuilder extends StackListenerImpl
       if (hasThisAccess) {
         if (mustBeConst) {
           return new IncompleteErrorGenerator(
-              this, nameToken, cfe.messageNotAConstantExpression);
+              this, nameToken, cfe.codeNotAConstantExpression);
         }
         // This is an implicit access on 'this'.
         return new ThisPropertyAccessGenerator(this, nameToken, memberName,
@@ -3332,7 +3329,7 @@ class BodyBuilder extends StackListenerImpl
             !(_context.isConstructor && inFieldInitializer) &&
             !libraryFeatures.constFunctions.isEnabled) {
           return new IncompleteErrorGenerator(
-              this, nameToken, cfe.messageNotAConstantExpression);
+              this, nameToken, cfe.codeNotAConstantExpression);
         }
         VariableDeclaration variable = getable.variable!;
         // TODO(johnniwinther): The handling of for-in variables should be
@@ -3382,7 +3379,7 @@ class BodyBuilder extends StackListenerImpl
 
         if (mustBeConst && !libraryFeatures.constFunctions.isEnabled) {
           return new IncompleteErrorGenerator(
-              this, nameToken, cfe.messageNotAConstantExpression);
+              this, nameToken, cfe.codeNotAConstantExpression);
         }
 
         Name memberName = new Name(name, libraryBuilder.nameOrigin);
@@ -3444,7 +3441,7 @@ class BodyBuilder extends StackListenerImpl
             !(getable is MethodBuilder && getable.isRegularMethod) &&
             !libraryFeatures.constFunctions.isEnabled) {
           return new IncompleteErrorGenerator(
-              this, nameToken, cfe.messageNotAConstantExpression);
+              this, nameToken, cfe.codeNotAConstantExpression);
         }
         return new StaticAccessGenerator.fromBuilder(
             this, name, nameToken, getable, setable as MemberBuilder?);
@@ -3727,7 +3724,7 @@ class BodyBuilder extends StackListenerImpl
     Expression? expression = hasExpression ? popForValue() : null;
     if (expression != null && inConstructor) {
       push(buildProblemStatement(
-          cfe.messageConstructorWithReturnType, beginToken.charOffset));
+          cfe.codeConstructorWithReturnType, beginToken.charOffset));
     } else {
       push(forest.createReturnStatement(offsetForToken(beginToken), expression,
           isArrow: !identical(beginToken.lexeme, "return")));
@@ -3930,11 +3927,9 @@ class BodyBuilder extends StackListenerImpl
     constantContext = _context.constantContext;
     inLateFieldInitializer = _context.isLateField;
     if (_context.isAbstractField) {
-      addProblem(
-          cfe.messageAbstractFieldInitializer, token.charOffset, noLength);
+      addProblem(cfe.codeAbstractFieldInitializer, token.charOffset, noLength);
     } else if (_context.isExternalField) {
-      addProblem(
-          cfe.messageExternalFieldInitializer, token.charOffset, noLength);
+      addProblem(cfe.codeExternalFieldInitializer, token.charOffset, noLength);
     }
   }
 
@@ -4112,7 +4107,7 @@ class BodyBuilder extends StackListenerImpl
     Object? generator = pop();
     if (generator is! Generator) {
       push(buildProblem(
-          cfe.messageNotAnLvalue, offsetForToken(token), lengthForToken(token),
+          cfe.codeNotAnLvalue, offsetForToken(token), lengthForToken(token),
           errorHasBeenReported: generator is InvalidExpression));
     } else {
       push(new DelayedAssignment(
@@ -4483,7 +4478,7 @@ class BodyBuilder extends StackListenerImpl
     }
     if (variableOrExpression is ParserRecovery) {
       problemInLoopOrSwitch ??= buildProblemStatement(
-          cfe.messageSyntheticToken, variableOrExpression.charOffset,
+          cfe.codeSyntheticToken, variableOrExpression.charOffset,
           errorHasBeenReported: true);
     }
     exitLoopOrSwitch(result);
@@ -4495,8 +4490,8 @@ class BodyBuilder extends StackListenerImpl
     int fileOffset = offsetForToken(keyword);
     Expression value = popForValue();
     if (inLateLocalInitializer) {
-      push(buildProblem(cfe.messageAwaitInLateLocalInitializer, fileOffset,
-          keyword.charCount));
+      push(buildProblem(
+          cfe.codeAwaitInLateLocalInitializer, fileOffset, keyword.charCount));
     } else {
       push(forest.createAwaitExpression(fileOffset, value));
     }
@@ -4539,8 +4534,8 @@ class BodyBuilder extends StackListenerImpl
     ]));
 
     if (constantContext == ConstantContext.required && constKeyword == null) {
-      addProblem(cfe.messageMissingExplicitConst, offsetForToken(leftBracket),
-          noLength);
+      addProblem(
+          cfe.codeMissingExplicitConst, offsetForToken(leftBracket), noLength);
     }
 
     List<Expression> expressions = popListForValue(count);
@@ -4551,7 +4546,7 @@ class BodyBuilder extends StackListenerImpl
     if (typeArguments != null) {
       if (typeArguments.length > 1) {
         addProblem(
-            cfe.messageListLiteralTooManyTypeArguments,
+            cfe.codeListLiteralTooManyTypeArguments,
             offsetForToken(leftBracket),
             lengthOfSpan(leftBracket, leftBracket.endGroup));
         typeArgument = const InvalidType();
@@ -4603,7 +4598,7 @@ class BodyBuilder extends StackListenerImpl
     if (typeArguments != null) {
       if (typeArguments.length > 1) {
         addProblem(
-            cfe.messageListPatternTooManyTypeArguments,
+            cfe.codeListPatternTooManyTypeArguments,
             offsetForToken(leftBracket),
             lengthOfSpan(leftBracket, leftBracket.endGroup));
         typeArgument = const InvalidType();
@@ -4655,13 +4650,13 @@ class BodyBuilder extends StackListenerImpl
         if (element is NamedExpression) {
           if (forbiddenObjectMemberNames.contains(element.name)) {
             libraryBuilder.addProblem(
-                cfe.messageObjectMemberNameUsedForRecordField,
+                cfe.codeObjectMemberNameUsedForRecordField,
                 element.fileOffset,
                 element.name.length,
                 uri);
           }
           if (element.name.startsWith("_")) {
-            libraryBuilder.addProblem(cfe.messageRecordFieldsCantBePrivate,
+            libraryBuilder.addProblem(cfe.codeRecordFieldsCantBePrivate,
                 element.fileOffset, element.name.length, uri);
           }
           namedElements ??= {};
@@ -4696,7 +4691,7 @@ class BodyBuilder extends StackListenerImpl
                   element.name, positional.length) !=
               null) {
             libraryBuilder.addProblem(
-                messageNamedFieldClashesWithPositionalFieldInRecord,
+                codeNamedFieldClashesWithPositionalFieldInRecord,
                 element.fileOffset,
                 element.name.length,
                 uri);
@@ -4798,7 +4793,7 @@ class BodyBuilder extends StackListenerImpl
 
     if (constantContext == ConstantContext.required && constKeyword == null) {
       addProblem(
-          cfe.messageMissingExplicitConst, offsetForToken(leftBrace), noLength);
+          cfe.codeMissingExplicitConst, offsetForToken(leftBrace), noLength);
     }
 
     List<dynamic> setOrMapEntries =
@@ -4912,8 +4907,8 @@ class BodyBuilder extends StackListenerImpl
       if (typeArguments.length != 2) {
         keyType = const InvalidType();
         valueType = const InvalidType();
-        addProblem(cfe.messageMapPatternTypeArgumentMismatch,
-            leftBrace.charOffset, noLength);
+        addProblem(cfe.codeMapPatternTypeArgumentMismatch, leftBrace.charOffset,
+            noLength);
       } else {
         keyType = buildDartType(typeArguments[0], TypeUse.literalTypeArgument,
             allowPotentiallyConstantType: false);
@@ -5038,8 +5033,7 @@ class BodyBuilder extends StackListenerImpl
     if (identifierCount == 1) {
       Object? part = pop();
       if (part is ParserRecovery) {
-        push(new ParserErrorGenerator(
-            this, hashToken, cfe.messageSyntheticToken));
+        push(new ParserErrorGenerator(this, hashToken, cfe.codeSyntheticToken));
       } else {
         push(forest.createSymbolLiteral(
             offsetForToken(hashToken), symbolPartToString(part)));
@@ -5049,8 +5043,7 @@ class BodyBuilder extends StackListenerImpl
           .popNonNullable(stack, identifierCount, dummyIdentifier);
       if (parts == null) {
         // Coverage-ignore-block(suite): Not run.
-        push(new ParserErrorGenerator(
-            this, hashToken, cfe.messageSyntheticToken));
+        push(new ParserErrorGenerator(this, hashToken, cfe.codeSyntheticToken));
         return;
       }
       String value = symbolPartToString(parts.first);
@@ -5474,7 +5467,7 @@ class BodyBuilder extends StackListenerImpl
 
     if (thisKeyword != null) {
       if (!inConstructor) {
-        handleRecoverableError(cfe.messageFieldInitializerOutsideConstructor,
+        handleRecoverableError(cfe.codeFieldInitializerOutsideConstructor,
             thisKeyword, thisKeyword);
         thisKeyword = null;
       }
@@ -5482,7 +5475,7 @@ class BodyBuilder extends StackListenerImpl
     if (superKeyword != null) {
       if (!inConstructor) {
         handleRecoverableError(
-            cfe.messageSuperParameterInitializerOutsideConstructor,
+            cfe.codeSuperParameterInitializerOutsideConstructor,
             superKeyword,
             superKeyword);
         superKeyword = null;
@@ -5667,7 +5660,7 @@ class BodyBuilder extends StackListenerImpl
             kind == FormalParameterKind.requiredNamed) &&
         equals.lexeme == ':' &&
         libraryBuilder.languageVersion.major >= 3) {
-      addProblem(cfe.messageObsoleteColonForDefaultValue, equals.charOffset,
+      addProblem(cfe.codeObsoleteColonForDefaultValue, equals.charOffset,
           equals.charCount);
     }
   }
@@ -5834,7 +5827,7 @@ class BodyBuilder extends StackListenerImpl
             FormalParameterBuilder parameter = catchParameters.parameters![i];
             compileTimeErrors ??= <Statement>[];
             compileTimeErrors.add(buildProblemStatement(
-                cfe.messageCatchSyntaxExtraParameters, parameter.fileOffset,
+                cfe.codeCatchSyntaxExtraParameters, parameter.fileOffset,
                 length: parameter.name.length));
           }
         }
@@ -5976,7 +5969,7 @@ class BodyBuilder extends StackListenerImpl
     } else {
       Expression value = toValue(generator);
       push(wrapInProblem(
-          value, cfe.messageNotAnLvalue, value.fileOffset, noLength));
+          value, cfe.codeNotAnLvalue, value.fileOffset, noLength));
     }
   }
 
@@ -5990,7 +5983,7 @@ class BodyBuilder extends StackListenerImpl
     } else {
       Expression value = toValue(generator);
       push(wrapInProblem(
-          value, cfe.messageNotAnLvalue, value.fileOffset, noLength));
+          value, cfe.codeNotAnLvalue, value.fileOffset, noLength));
     }
   }
 
@@ -6074,7 +6067,7 @@ class BodyBuilder extends StackListenerImpl
             type = qualifier;
             if (typeArguments != null) {
               // TODO(ahe): Point to the type arguments instead.
-              addProblem(cfe.messageConstructorWithTypeArguments,
+              addProblem(cfe.codeConstructorWithTypeArguments,
                   identifier.nameOffset, identifier.name.length);
             }
           } else {
@@ -6157,11 +6150,11 @@ class BodyBuilder extends StackListenerImpl
     if (target is Constructor) {
       if (constantContext == ConstantContext.required &&
           constness == Constness.implicit) {
-        addProblem(cfe.messageMissingExplicitConst, charOffset, charLength);
+        addProblem(cfe.codeMissingExplicitConst, charOffset, charLength);
       }
       if (isConst && !target.isConst) {
         return buildProblem(
-            cfe.messageNonConstConstructor, charOffset, charLength);
+            cfe.codeNonConstConstructor, charOffset, charLength);
       }
       ConstructorInvocation node;
       if (typeAliasBuilder == null) {
@@ -6184,7 +6177,7 @@ class BodyBuilder extends StackListenerImpl
         if (constantContext == ConstantContext.required &&
             constness == Constness.implicit) {
           // Coverage-ignore-block(suite): Not run.
-          addProblem(cfe.messageMissingExplicitConst, charOffset, charLength);
+          addProblem(cfe.codeMissingExplicitConst, charOffset, charLength);
         }
         if (isConst && !procedure.isConst) {
           if (procedure.isExtensionTypeMember) {
@@ -6192,10 +6185,10 @@ class BodyBuilder extends StackListenerImpl
             // extension type declarations are encoded as procedures so we use
             // the message for non-const constructors here.
             return buildProblem(
-                cfe.messageNonConstConstructor, charOffset, charLength);
+                cfe.codeNonConstConstructor, charOffset, charLength);
           } else {
             return buildProblem(
-                cfe.messageNonConstFactory, charOffset, charLength);
+                cfe.codeNonConstFactory, charOffset, charLength);
           }
         }
         StaticInvocation node;
@@ -6462,7 +6455,7 @@ class BodyBuilder extends StackListenerImpl
     List<TypeBuilder>? typeArguments = pop() as List<TypeBuilder>?;
     if (inMetadata && typeArguments != null) {
       if (!libraryFeatures.genericMetadata.isEnabled) {
-        handleRecoverableError(cfe.messageMetadataTypeArguments,
+        handleRecoverableError(cfe.codeMetadataTypeArguments,
             nameLastToken.next!, nameLastToken.next!);
       }
     }
@@ -6472,16 +6465,14 @@ class BodyBuilder extends StackListenerImpl
     ConstantContext savedConstantContext = pop() as ConstantContext;
 
     if (arguments is! Arguments) {
-      push(
-          new ParserErrorGenerator(this, nameToken, cfe.messageSyntheticToken));
+      push(new ParserErrorGenerator(this, nameToken, cfe.codeSyntheticToken));
       arguments = forest.createArguments(offset, []);
     } else if (type is Generator) {
       push(type.invokeConstructor(
           typeArguments, name, arguments, nameToken, nameLastToken, constness,
           inImplicitCreationContext: inImplicitCreationContext));
     } else if (type is ParserRecovery) {
-      push(
-          new ParserErrorGenerator(this, nameToken, cfe.messageSyntheticToken));
+      push(new ParserErrorGenerator(this, nameToken, cfe.codeSyntheticToken));
     } else if (type is InvalidExpression) {
       // Coverage-ignore-block(suite): Not run.
       push(type);
@@ -6526,7 +6517,7 @@ class BodyBuilder extends StackListenerImpl
                     isTearOffLowering(receiver.target)) ||
             receiver is ConstructorTearOff ||
             receiver is RedirectingFactoryTearOff) {
-          return buildProblem(cfe.messageConstructorTearOffWithTypeArguments,
+          return buildProblem(cfe.codeConstructorTearOffWithTypeArguments,
               instantiationOffset, noLength);
         }
         receiver = forest.createInstantiation(
@@ -6577,12 +6568,12 @@ class BodyBuilder extends StackListenerImpl
       required UnresolvedKind unresolvedKind}) {
     if (arguments == null) {
       // Coverage-ignore-block(suite): Not run.
-      return buildProblem(cfe.messageMissingArgumentList, nameToken.charOffset,
-          nameToken.length);
+      return buildProblem(
+          cfe.codeMissingArgumentList, nameToken.charOffset, nameToken.length);
     }
     if (name.isNotEmpty && arguments.types.isNotEmpty) {
       // TODO(ahe): Point to the type arguments instead.
-      addProblem(cfe.messageConstructorWithTypeArguments, nameToken.charOffset,
+      addProblem(cfe.codeConstructorWithTypeArguments, nameToken.charOffset,
           nameToken.length);
     }
 
@@ -6899,8 +6890,8 @@ class BodyBuilder extends StackListenerImpl
             !(libraryFeatures.enhancedEnums.isEnabled &&
                 target is Procedure &&
                 target.kind == ProcedureKind.Factory)) {
-          return buildProblem(cfe.messageEnumInstantiation,
-              nameToken.charOffset, nameToken.length);
+          return buildProblem(cfe.codeEnumInstantiation, nameToken.charOffset,
+              nameToken.length);
         }
         if (target is Constructor ||
             (target is Procedure && target.kind == ProcedureKind.Factory)) {
@@ -6976,8 +6967,7 @@ class BodyBuilder extends StackListenerImpl
   void handleConstFactory(Token constKeyword) {
     debugEvent("ConstFactory");
     if (!libraryFeatures.constFunctions.isEnabled) {
-      handleRecoverableError(
-          cfe.messageConstFactory, constKeyword, constKeyword);
+      handleRecoverableError(cfe.codeConstFactory, constKeyword, constKeyword);
     }
   }
 
@@ -7160,7 +7150,7 @@ class BodyBuilder extends StackListenerImpl
           int offset = elseEntry.fileOffset;
           node = new MapLiteralEntry(
               buildProblem(
-                  cfe.messageCantDisambiguateAmbiguousInformation, offset, 1),
+                  cfe.codeCantDisambiguateAmbiguousInformation, offset, 1),
               new NullLiteral())
             ..fileOffset = offsetForToken(ifToken);
         }
@@ -7197,7 +7187,7 @@ class BodyBuilder extends StackListenerImpl
           int offset = thenEntry.fileOffset;
           node = new MapLiteralEntry(
               buildProblem(
-                  cfe.messageCantDisambiguateAmbiguousInformation, offset, 1),
+                  cfe.codeCantDisambiguateAmbiguousInformation, offset, 1),
               new NullLiteral())
             ..fileOffset = offsetForToken(ifToken);
         }
@@ -7277,7 +7267,7 @@ class BodyBuilder extends StackListenerImpl
       if (thisVariable != null && !inConstructorInitializer) {
         if (constantContext != ConstantContext.none) {
           push(new IncompleteErrorGenerator(
-              this, token, cfe.messageThisAsIdentifier));
+              this, token, cfe.codeThisAsIdentifier));
         } else {
           push(_createReadOnlyVariableAccess(thisVariable!, token,
               offsetForToken(token), 'this', ReadOnlyAccessKind.ExtensionThis));
@@ -7287,14 +7277,13 @@ class BodyBuilder extends StackListenerImpl
               _context.isExtensionTypeDeclaration)) {
         // In an extension (type) where we don't (here) have a "this" variable.
         push(new IncompleteErrorGenerator(
-            this, token, cfe.messageThisAsIdentifier));
+            this, token, cfe.codeThisAsIdentifier));
       } else {
         push(new ThisAccessGenerator(this, token, inInitializerLeftHandSide,
             inFieldInitializer, inLateFieldInitializer));
       }
     } else {
-      push(new IncompleteErrorGenerator(
-          this, token, cfe.messageThisAsIdentifier));
+      push(new IncompleteErrorGenerator(this, token, cfe.codeThisAsIdentifier));
     }
   }
 
@@ -7309,8 +7298,8 @@ class BodyBuilder extends StackListenerImpl
           inFieldInitializer, inLateFieldInitializer,
           isSuper: true));
     } else {
-      push(new IncompleteErrorGenerator(
-          this, token, cfe.messageSuperAsIdentifier));
+      push(
+          new IncompleteErrorGenerator(this, token, cfe.codeSuperAsIdentifier));
     }
   }
 
@@ -7326,7 +7315,7 @@ class BodyBuilder extends StackListenerImpl
       return;
     }
     push(new IncompleteErrorGenerator(
-        this, augmentToken, cfe.messageInvalidAugmentSuper));
+        this, augmentToken, cfe.codeInvalidAugmentSuper));
   }
 
   @override
@@ -7519,7 +7508,7 @@ class BodyBuilder extends StackListenerImpl
         exitLocalScope();
         push(new BlockExpression(
             forest.createBlock(declaration.fileOffset, noLocation, [statement]),
-            buildProblem(cfe.messageNamedFunctionExpression,
+            buildProblem(cfe.codeNamedFunctionExpression,
                 declaration.fileOffset, noLength,
                 // Error has already been reported by the parser.
                 errorHasBeenReported: true))
@@ -7578,8 +7567,8 @@ class BodyBuilder extends StackListenerImpl
 
     Expression result;
     if (constantContext != ConstantContext.none) {
-      result = buildProblem(cfe.messageNotAConstantExpression,
-          formals.charOffset, formals.length);
+      result = buildProblem(
+          cfe.codeNotAConstantExpression, formals.charOffset, formals.length);
     } else {
       result = new FunctionExpression(function)
         ..fileOffset = offsetForToken(beginToken);
@@ -7772,7 +7761,7 @@ class BodyBuilder extends StackListenerImpl
       elements.explicitVariableDeclaration = lvalue;
       if (lvalue.isConst) {
         elements.expressionProblem = buildProblem(
-            cfe.messageForInLoopWithConstVariable,
+            cfe.codeForInLoopWithConstVariable,
             lvalue.fileOffset,
             lvalue.name!.length);
         // As a recovery step, remove the const flag, to not confuse the
@@ -7819,12 +7808,12 @@ class BodyBuilder extends StackListenerImpl
         // Coverage-ignore-block(suite): Not run.
         elements.expressionProblem = lvalue;
       } else if (lvalue is ParserRecovery) {
-        elements.expressionProblem = buildProblem(
-            cfe.messageSyntheticToken, lvalue.charOffset, noLength);
+        elements.expressionProblem =
+            buildProblem(cfe.codeSyntheticToken, lvalue.charOffset, noLength);
       } else {
         Message message = forest.isVariablesDeclaration(lvalue)
-            ? cfe.messageForInLoopExactlyOneVariable
-            : cfe.messageForInLoopNotAssignable;
+            ? cfe.codeForInLoopExactlyOneVariable
+            : cfe.codeForInLoopNotAssignable;
         Token token = forToken.next!.next!;
         elements.expressionProblem =
             buildProblem(message, offsetForToken(token), lengthForToken(token));
@@ -7968,10 +7957,8 @@ class BodyBuilder extends StackListenerImpl
     // TODO(johnniwinther): Split the handling of breaks and continue.
     if (target.breakTarget.hasUsers || target.continueTarget.hasUsers) {
       if (forest.isVariablesDeclaration(statement)) {
-        internalProblem(
-            cfe.messageInternalProblemLabelUsageInVariablesDeclaration,
-            statement.fileOffset,
-            uri);
+        internalProblem(cfe.codeInternalProblemLabelUsageInVariablesDeclaration,
+            statement.fileOffset, uri);
       }
       if (statement is! LabeledStatement) {
         statement = forest.createLabeledStatement(statement);
@@ -7994,7 +7981,7 @@ class BodyBuilder extends StackListenerImpl
             }
           } else {
             push(buildProblemStatement(
-                cfe.messageContinueLabelInvalid, continueStatement.fileOffset,
+                cfe.codeContinueLabelInvalid, continueStatement.fileOffset,
                 length: 8));
             return;
           }
@@ -8011,7 +7998,7 @@ class BodyBuilder extends StackListenerImpl
       push(forest.createRethrowStatement(
           offsetForToken(rethrowToken), offsetForToken(endToken)));
     } else {
-      push(new ExpressionStatement(buildProblem(cfe.messageRethrowNotCatch,
+      push(new ExpressionStatement(buildProblem(cfe.codeRethrowNotCatch,
           offsetForToken(rethrowToken), lengthForToken(rethrowToken)))
         ..fileOffset = offsetForToken(rethrowToken));
     }
@@ -8145,7 +8132,7 @@ class BodyBuilder extends StackListenerImpl
         // The parser has already reported an error indicating that assert
         // cannot be used in an expression.
         push(buildProblem(
-            cfe.messageAssertAsExpression, fileOffset, assertKeyword.length));
+            cfe.codeAssertAsExpression, fileOffset, assertKeyword.length));
         break;
 
       case Assert.Initializer:
@@ -8822,7 +8809,7 @@ class BodyBuilder extends StackListenerImpl
     }
     if (target == null && name == null) {
       push(problemInLoopOrSwitch = buildProblemStatement(
-          cfe.messageBreakOutsideOfLoop, breakKeyword.charOffset));
+          cfe.codeBreakOutsideOfLoop, breakKeyword.charOffset));
     } else if (target == null || !target.isBreakTarget) {
       Token labelToken = breakKeyword.next!;
       push(problemInLoopOrSwitch = buildProblemStatement(
@@ -8852,8 +8839,8 @@ class BodyBuilder extends StackListenerImpl
           length: lengthOfSpan(keyword, keyword.next));
     } else {
       Message message = isBreak
-          ? cfe.messageAnonymousBreakTargetOutsideFunction
-          : cfe.messageAnonymousContinueTargetOutsideFunction;
+          ? cfe.codeAnonymousBreakTargetOutsideFunction
+          : cfe.codeAnonymousContinueTargetOutsideFunction;
       problem = buildProblemStatement(message, offsetForToken(keyword),
           length: lengthForToken(keyword));
     }
@@ -8893,7 +8880,7 @@ class BodyBuilder extends StackListenerImpl
     }
     if (target == null) {
       push(problemInLoopOrSwitch = buildProblemStatement(
-          cfe.messageContinueWithoutLabelInCase, continueKeyword.charOffset,
+          cfe.codeContinueWithoutLabelInCase, continueKeyword.charOffset,
           length: continueKeyword.length));
     } else if (!target.isContinueTarget) {
       Token labelToken = continueKeyword.next!;
@@ -8960,7 +8947,7 @@ class BodyBuilder extends StackListenerImpl
       switch (variable) {
         case StructuralParameterBuilder():
           if (!libraryFeatures.genericMetadata.isEnabled) {
-            addProblem(cfe.messageAnnotationOnFunctionTypeTypeParameter,
+            addProblem(cfe.codeAnnotationOnFunctionTypeTypeParameter,
                 variable.fileOffset, variable.name.length);
           }
           break;
@@ -9219,14 +9206,14 @@ class BodyBuilder extends StackListenerImpl
       if (builder.hasAbstractField) {
         return <Initializer>[
           buildInvalidInitializer(
-              buildProblem(cfe.messageAbstractFieldConstructorInitializer,
+              buildProblem(cfe.codeAbstractFieldConstructorInitializer,
                   fieldNameOffset, name.length),
               fieldNameOffset)
         ];
       } else if (builder.hasExternalField) {
         return <Initializer>[
           buildInvalidInitializer(
-              buildProblem(cfe.messageExternalFieldConstructorInitializer,
+              buildProblem(cfe.codeExternalFieldConstructorInitializer,
                   fieldNameOffset, name.length),
               fieldNameOffset)
         ];
@@ -9267,7 +9254,7 @@ class BodyBuilder extends StackListenerImpl
                 noLength,
                 uri,
                 context: [
-                  cfe.messageInitializingFormalTypeMismatchField.withLocation(
+                  cfe.codeInitializingFormalTypeMismatchField.withLocation(
                       builder.fileUri, builder.fileOffset, noLength)
                 ]);
           }
@@ -9291,7 +9278,7 @@ class BodyBuilder extends StackListenerImpl
       bool isSynthetic, Constructor constructor, Arguments arguments,
       [int charOffset = -1]) {
     if (_context.isConstConstructor && !constructor.isConst) {
-      addProblem(cfe.messageConstConstructorWithNonConstSuper, charOffset,
+      addProblem(cfe.codeConstConstructorWithNonConstSuper, charOffset,
           constructor.name.text.length);
     }
     needsImplicitSuperInitializer = false;
@@ -9325,14 +9312,14 @@ class BodyBuilder extends StackListenerImpl
       if (_context.isConstructorCyclic(name.text)) {
         int length = name.text.length;
         if (length == 0) length = "this".length;
-        addProblem(cfe.messageConstructorCyclic, fileOffset, length);
+        addProblem(cfe.codeConstructorCyclic, fileOffset, length);
         // TODO(askesc): Produce invalid initializer.
       }
       if (_context.formals != null) {
         for (FormalParameterBuilder formal in _context.formals!) {
           if (formal.isSuperInitializingFormal) {
             addProblem(
-                cfe.messageUnexpectedSuperParametersInGenerativeConstructors,
+                cfe.codeUnexpectedSuperParametersInGenerativeConstructors,
                 formal.fileOffset,
                 noLength);
             if (constructorBuilder is SourceConstructorBuilder) {
@@ -9393,7 +9380,7 @@ class BodyBuilder extends StackListenerImpl
               (operand.target.isFactory || isTearOffLowering(operand.target)) ||
           operand is ConstructorTearOff ||
           operand is RedirectingFactoryTearOff) {
-        push(buildProblem(cfe.messageConstructorTearOffWithTypeArguments,
+        push(buildProblem(cfe.codeConstructorTearOffWithTypeArguments,
             openAngleBracket.charOffset, noLength));
       } else {
         push(new Instantiation(
@@ -9438,7 +9425,7 @@ class BodyBuilder extends StackListenerImpl
               typeParameterDeclaration is ExtensionTypeDeclaration) {
             if (constantContext != ConstantContext.none &&
                 (!inConstructorInitializer || !allowPotentiallyConstantType)) {
-              LocatedMessage message = cfe.messageTypeVariableInConstantContext
+              LocatedMessage message = cfe.codeTypeVariableInConstantContext
                   .withLocation(builder.fileUri!, builder.charOffset!,
                       typeParameter.name!.length);
               builder.bind(libraryBuilder,
@@ -9573,7 +9560,7 @@ class BodyBuilder extends StackListenerImpl
     }
     if (isImplicitCall) {
       return buildProblem(
-          cfe.messageImplicitSuperCallOfNonMethod, offset, noLength);
+          cfe.codeImplicitSuperCallOfNonMethod, offset, noLength);
     } else {
       Expression receiver = new SuperPropertyGet(name, target)
         ..fileOffset = offset;
@@ -9737,8 +9724,8 @@ class BodyBuilder extends StackListenerImpl
       } else {
         Pattern pattern = toPattern(field);
         if (pattern is! InvalidPattern) {
-          addProblem(cfe.messageUnnamedObjectPatternField, pattern.fileOffset,
-              noLength);
+          addProblem(
+              cfe.codeUnnamedObjectPatternField, pattern.fileOffset, noLength);
         }
       }
     }
@@ -9897,8 +9884,8 @@ class BodyBuilder extends StackListenerImpl
           variable.charOffset, variableDeclaration);
       registerVariableAssignment(variableDeclaration);
     } else {
-      addProblem(cfe.messagePatternAssignmentNotLocalVariable,
-          variable.charOffset, variable.charCount);
+      addProblem(cfe.codePatternAssignmentNotLocalVariable, variable.charOffset,
+          variable.charCount);
       // Recover by using [WildcardPattern] instead.
       pattern = forest.createWildcardPattern(variable.charOffset, null);
     }
@@ -9973,7 +9960,7 @@ class BodyBuilder extends StackListenerImpl
     if (colon != null) {
       Object? identifier = pop();
       if (identifier is ParserRecovery) {
-        push(new ParserErrorGenerator(this, colon, cfe.messageSyntheticToken));
+        push(new ParserErrorGenerator(this, colon, cfe.codeSyntheticToken));
       } else {
         String? name;
         if (identifier is Identifier) {
@@ -9983,7 +9970,7 @@ class BodyBuilder extends StackListenerImpl
         }
         if (name == null) {
           push(forest.createInvalidPattern(
-              buildProblem(cfe.messageUnspecifiedGetterNameInObjectPattern,
+              buildProblem(cfe.codeUnspecifiedGetterNameInObjectPattern,
                   colon.charOffset, noLength),
               declaredVariables: const []));
         } else {

pkg/front_end/lib/src/kernel/cfe_verifier.dart

@@ -12,7 +12,7 @@ import '../codes/cfe_codes.dart'
     show
         LocatedMessage,
         Message,
-        messageVerificationErrorOriginContext,
+        codeVerificationErrorOriginContext,
         noLength,
         codeInternalProblemVerificationError;
 import '../base/compiler_context.dart' show CompilerContext;
@@ -55,7 +55,7 @@ class CfeVerificationErrorListener implements VerificationErrorListener {
     List<LocatedMessage>? contextMessages;
     if (origin != null) {
       contextMessages = [
-        messageVerificationErrorOriginContext.withLocation(
+        codeVerificationErrorOriginContext.withLocation(
             origin.location!.file, origin.fileOffset, noLength)
       ];
     }

pkg/front_end/lib/src/kernel/constant_collection_builders.dart

@@ -47,7 +47,7 @@ abstract class _ListOrSetConstantBuilder<L extends Expression> {
       // Coverage-ignore-block(suite): Not run.
       // Null spread
       return evaluator.createEvaluationErrorConstant(
-          spreadExpression, messageConstEvalNullValue);
+          spreadExpression, codeConstEvalNullValue);
     } else {
       // Fully evaluated spread
       List<Constant> entries;
@@ -72,7 +72,7 @@ abstract class _ListOrSetConstantBuilder<L extends Expression> {
       } else {
         // Not list or set in spread
         return evaluator.createEvaluationErrorConstant(
-            spreadExpression, messageConstEvalNotListOrSetInSpread);
+            spreadExpression, codeConstEvalNotListOrSetInSpread);
       }
       for (Constant entry in entries) {
         AbortConstant? error = addConstant(entry, spreadExpression);
@@ -267,7 +267,7 @@ class MapConstantBuilder {
       // Coverage-ignore-block(suite): Not run.
       // Null spread
       return evaluator.createEvaluationErrorConstant(
-          spreadExpression, messageConstEvalNullValue);
+          spreadExpression, codeConstEvalNullValue);
     } else {
       // Fully evaluated spread
       if (spread is MapConstant) {
@@ -287,7 +287,7 @@ class MapConstantBuilder {
       } else {
         // Not map in spread
         return evaluator.createEvaluationErrorConstant(
-            spreadExpression, messageConstEvalNotMapInSpread);
+            spreadExpression, codeConstEvalNotMapInSpread);
       }
     }
     return null;

pkg/front_end/lib/src/kernel/constant_evaluator.dart

@@ -1172,11 +1172,10 @@ class ConstantsTransformer extends RemovingTransformer {
                 createArguments([
                   createStringLiteral(
                       forUnsoundness
-                          ? messageUnsoundSwitchStatementError.problemMessage
+                          ? codeUnsoundSwitchStatementError.problemMessage
                           :
                           // Coverage-ignore(suite): Not run.
-                          messageNeverReachableSwitchStatementError
-                              .problemMessage,
+                          codeNeverReachableSwitchStatementError.problemMessage,
                       fileOffset: node.fileOffset)
                 ], fileOffset: node.fileOffset),
                 fileOffset: node.fileOffset),
@@ -1475,7 +1474,7 @@ class ConstantsTransformer extends RemovingTransformer {
                     typeEnvironment.coreTypes.stateErrorConstructor,
                     createArguments([
                       createStringLiteral(
-                          messagePatternMatchingError.problemMessage,
+                          codePatternMatchingError.problemMessage,
                           fileOffset: node.fileOffset)
                     ], fileOffset: node.fileOffset),
                     fileOffset: node.fileOffset),
@@ -1556,7 +1555,7 @@ class ConstantsTransformer extends RemovingTransformer {
                     typeEnvironment.coreTypes.stateErrorConstructor,
                     createArguments([
                       createStringLiteral(
-                          messagePatternMatchingError.problemMessage,
+                          codePatternMatchingError.problemMessage,
                           fileOffset: node.fileOffset)
                     ], fileOffset: node.fileOffset),
                     fileOffset: node.fileOffset),
@@ -1625,10 +1624,10 @@ class ConstantsTransformer extends RemovingTransformer {
       if (existing != null) {
         constantEvaluator.errorReporter.report(
             constantEvaluator.createLocatedMessage(
-                entry.key, messageEqualKeysInMapPattern),
+                entry.key, codeEqualKeysInMapPattern),
             [
               constantEvaluator.createLocatedMessage(
-                  existing.key, messageEqualKeysInMapPatternContext)
+                  existing.key, codeEqualKeysInMapPatternContext)
             ]);
       } else {
         keyValueMap[keyValue] = entry;
@@ -1843,10 +1842,10 @@ class ConstantsTransformer extends RemovingTransformer {
                 createArguments([
                   createStringLiteral(
                       forUnsoundness
-                          ? messageUnsoundSwitchExpressionError.problemMessage
+                          ? codeUnsoundSwitchExpressionError.problemMessage
                           :
                           // Coverage-ignore(suite): Not run.
-                          messageNeverReachableSwitchExpressionError
+                          codeNeverReachableSwitchExpressionError
                               .problemMessage,
                       fileOffset: node.fileOffset)
                 ], fileOffset: node.fileOffset),
@@ -2337,13 +2336,13 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
             contextMessages.addAll(result.context!);
           }
           if (contextNode != null && contextNode != result.node) {
-            contextMessages.add(
-                createLocatedMessage(contextNode, messageConstEvalContext));
+            contextMessages
+                .add(createLocatedMessage(contextNode, codeConstEvalContext));
           }
 
           {
             final LocatedMessage locatedMessage =
-                createLocatedMessage(node, messageConstEvalStartingPoint);
+                createLocatedMessage(node, codeConstEvalStartingPoint);
             errorReporter.report(locatedMessage, contextMessages);
           }
         } else {
@@ -2370,7 +2369,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
         ];
         {
           final LocatedMessage locatedMessage =
-              createLocatedMessage(node, messageConstEvalStartingPoint);
+              createLocatedMessage(node, codeConstEvalStartingPoint);
           errorReporter.report(locatedMessage, contextMessages);
         }
         return new UnevaluatedConstant(
@@ -2388,7 +2387,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
     if (result is UnevaluatedConstant) {
       if (errorOnUnevaluatedConstant) {
         // Coverage-ignore-block(suite): Not run.
-        return createEvaluationErrorConstant(node, messageConstEvalUnevaluated);
+        return createEvaluationErrorConstant(node, codeConstEvalUnevaluated);
       }
       return canonicalize(new UnevaluatedConstant(
           removeRedundantFileUriExpressions(result.expression)));
@@ -2584,8 +2583,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
         if (cachedResult == null) {
           // [null] is a sentinel value only used when still evaluating the same
           // node.
-          return createEvaluationErrorConstant(
-              node, messageConstEvalCircularity);
+          return createEvaluationErrorConstant(node, codeConstEvalCircularity);
         }
         result = cachedResult;
       } else {
@@ -2613,8 +2611,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
         if (nodeCache[node] == null &&
             !(enableConstFunctions && isRecursiveFunctionCall)) {
           // recursive call
-          return createEvaluationErrorConstant(
-              node, messageConstEvalCircularity);
+          return createEvaluationErrorConstant(node, codeConstEvalCircularity);
         }
         // else we've seen the node before and come to a result -> we won't
         // go into an infinite loop here either.
@@ -2644,7 +2641,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
   Constant _notAConstantExpression(Expression node) {
     // Only a subset of the expression language is valid for constant
     // evaluation.
-    return createExpressionErrorConstant(node, messageNotAConstantExpression);
+    return createExpressionErrorConstant(node, codeNotAConstantExpression);
   }
 
   @override
@@ -2941,7 +2938,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
 
     final Constructor constructor = node.target;
     AbortConstant? error =
-        checkConstructorConst(node, constructor, messageNonConstConstructor);
+        checkConstructorConst(node, constructor, codeNonConstConstructor);
     if (error != null) return error;
 
     final Class klass = constructor.enclosingClass;
@@ -3038,19 +3035,18 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
   /// Returns [null] on success and an error-"constant" on failure, as such the
   /// return value should be checked.
   AbortConstant? checkConstructorConst(
-      TreeNode node, Constructor constructor, Message messageIfNonConst) {
+      TreeNode node, Constructor constructor, Message codeIfNonConst) {
     if (!constructor.isConst) {
-      return createExpressionErrorConstant(node, messageIfNonConst);
+      return createExpressionErrorConstant(node, codeIfNonConst);
     }
     if (constructor.function.body != null &&
         constructor.function.body is! EmptyStatement &&
         !enableConstFunctions) {
       // Coverage-ignore: Probably unreachable.
-      return createExpressionErrorConstant(
-          node, messageConstConstructorWithBody);
+      return createExpressionErrorConstant(node, codeConstConstructorWithBody);
     } else if (constructor.isExternal) {
       return createEvaluationErrorConstant(
-          node, messageConstEvalExternalConstructor);
+          node, codeConstEvalExternalConstructor);
     }
     return null;
   }
@@ -3157,7 +3153,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
           env.addVariableValue(variable, constant);
         } else if (init is SuperInitializer) {
           AbortConstant? error = checkConstructorConst(
-              init, init.target, messageConstConstructorWithNonConstSuper);
+              init, init.target, codeConstConstructorWithNonConstSuper);
           if (error != null) return error;
           List<DartType>? types = _evaluateSuperTypeArguments(
               init, constructor.enclosingClass.supertype!);
@@ -3195,7 +3191,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
           // class, we pass the same [typeArguments].
 
           AbortConstant? error = checkConstructorConst(
-              init, init.target, messageConstConstructorRedirectionToNonConst);
+              init, init.target, codeConstConstructorRedirectionToNonConst);
           if (error != null) return error;
           List<Constant>? positionalArguments =
               _evaluatePositionalArguments(init.arguments.positional);
@@ -3236,7 +3232,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
               'No support for handling initializer of type '
               '"${init.runtimeType}".');
           return createEvaluationErrorConstant(
-              init, messageNotAConstantExpression);
+              init, codeNotAConstantExpression);
         }
       }
 
@@ -3283,7 +3279,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
       if (!condition.value) {
         if (statement.message == null) {
           return createEvaluationErrorConstant(
-              statement.condition, messageConstEvalFailedAssertion);
+              statement.condition, codeConstEvalFailedAssertion);
         }
         final Constant message = _evaluateSubexpression(statement.message!);
         if (message is AbortConstant) return message;
@@ -3300,10 +3296,10 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
                   .withArguments(message.value));
         } else if (message is NullConstant) {
           return createEvaluationErrorConstant(
-              statement.condition, messageConstEvalFailedAssertion);
+              statement.condition, codeConstEvalFailedAssertion);
         } else {
           return createEvaluationErrorConstant(statement.message!,
-              messageConstEvalFailedAssertionWithNonStringMessage);
+              codeConstEvalFailedAssertionWithNonStringMessage);
         }
       }
     } else {
@@ -3697,7 +3693,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
         }
       }
     } else if (receiver is NullConstant) {
-      return createEvaluationErrorConstant(node, messageConstEvalNullValue);
+      return createEvaluationErrorConstant(node, codeConstEvalNullValue);
     } else if (receiver is ListConstant && enableConstFunctions) {
       if (positionalArguments.length == 1) {
         final Constant other = positionalArguments[0];
@@ -3915,8 +3911,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
       // non-const stuff as const.
       // Access "this" during instance creation.
       if (instanceBuilder == null) {
-        return createEvaluationErrorConstant(
-            node, messageNotAConstantExpression);
+        return createEvaluationErrorConstant(node, codeNotAConstantExpression);
       }
 
       for (final MapEntry<Field, Constant> entry
@@ -3949,7 +3944,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
               resultType: node.resultType,
               interfaceTarget: node.interfaceTarget));
     } else if (receiver is NullConstant) {
-      return createEvaluationErrorConstant(node, messageConstEvalNullValue);
+      return createEvaluationErrorConstant(node, codeConstEvalNullValue);
     } else if (receiver is ListConstant && enableConstFunctions) {
       switch (node.name.text) {
         case 'first':
@@ -4043,7 +4038,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
       return unevaluated(
           node, new DynamicGet(node.kind, _wrap(receiver), node.name));
     } else if (receiver is NullConstant) {
-      return createEvaluationErrorConstant(node, messageConstEvalNullValue);
+      return createEvaluationErrorConstant(node, codeConstEvalNullValue);
     }
     // Coverage-ignore(suite): Not run.
     return createEvaluationErrorConstant(
@@ -4356,7 +4351,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
             // Coverage-ignore(suite): Not run.
             else if (name is NullConstant) {
               return createEvaluationErrorConstant(
-                  node, messageConstEvalNullValue);
+                  node, codeConstEvalNullValue);
             }
           } else {
             // Leave environment constant unevaluated.
@@ -4368,7 +4363,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
           }
         } else if (target.isExternal) {
           return createEvaluationErrorConstant(
-              node, messageConstEvalExternalFactory);
+              node, codeConstEvalExternalFactory);
         } else if (enableConstFunctions) {
           return _handleFunctionInvocation(
               node.target.function, typeArguments, positional, named);
@@ -4435,7 +4430,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
                 'Invocation of non-const extension type member'));
       }
     } else if (target.isExtensionMember) {
-      return createEvaluationErrorConstant(node, messageConstEvalExtension);
+      return createEvaluationErrorConstant(node, codeConstEvalExtension);
     } else if (enableConstFunctions && target.kind == ProcedureKind.Method) {
       return _handleFunctionInvocation(
           node.target.function, typeArguments, positional, named);
@@ -4582,7 +4577,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
       final Constant constant = _evaluateSubexpression(node.operand);
       if (constant is AbortConstant) return constant;
       if (constant is NullConstant) {
-        return createEvaluationErrorConstant(node, messageConstEvalNonNull);
+        return createEvaluationErrorConstant(node, codeConstEvalNonNull);
       }
       if (shouldBeUnevaluated) {
         return unevaluated(node, new NullCheck(_wrap(constant)));
@@ -4909,7 +4904,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
       // potentially constant types, but we should be able to handle all (or
       // none) in the body builder.
       _gotError = createExpressionErrorConstant(
-          node, messageTypeVariableInConstantContext);
+          node, codeTypeVariableInConstantContext);
       return null;
     }
 

pkg/front_end/lib/src/kernel/dynamic_module_validator.dart

@@ -13,7 +13,7 @@ import '../api_prototype/lowering_predicates.dart'
 
 import '../codes/cfe_codes.dart'
     show
-        messageDynamicCallsAreNotAllowedInDynamicModule,
+        codeDynamicCallsAreNotAllowedInDynamicModule,
         noLength,
         codeConstructorShouldBeListedAsCallableInDynamicInterface,
         codeMemberShouldBeListedAsCallableInDynamicInterface,
@@ -601,7 +601,7 @@ class _DynamicModuleValidator extends RecursiveVisitor {
       throw 'Unexpected node ${node.runtimeType} $node';
 
   void _dynamicCall(TreeNode node) {
-    loader.addProblem(messageDynamicCallsAreNotAllowedInDynamicModule,
+    loader.addProblem(codeDynamicCallsAreNotAllowedInDynamicModule,
         node.fileOffset, noLength, node.location!.file);
   }
 

pkg/front_end/lib/src/kernel/expression_generator.dart

@@ -177,7 +177,7 @@ abstract class Generator {
     return <Initializer>[
       _helper.buildInvalidInitializer(
           _helper.buildProblem(
-              messageInvalidInitializer, fileOffset, lengthForToken(token)),
+              codeInvalidInitializer, fileOffset, lengthForToken(token)),
           fileOffset)
     ];
   }
@@ -213,7 +213,7 @@ abstract class Generator {
       if (_helper.constantContext != ConstantContext.none &&
           selector.name != lengthName) {
         _helper.addProblem(
-            messageNotAConstantExpression, fileOffset, token.length);
+            codeNotAConstantExpression, fileOffset, token.length);
       }
       return PropertyAccessGenerator.make(_helper, selector.token,
           buildSimpleRead(), selector.name, isNullAware);
@@ -346,7 +346,7 @@ class VariableUseGenerator extends Generator {
   Expression _createWrite(int offset, Expression value) {
     if (_helper.isDeclaredInEnclosingCase(variable)) {
       _helper.addProblem(
-          messagePatternVariableAssignmentInsideGuard, offset, noLength);
+          codePatternVariableAssignmentInsideGuard, offset, noLength);
     }
     _helper.registerVariableAssignment(variable);
     return new VariableSet(variable, value)..fileOffset = offset;
@@ -933,7 +933,7 @@ class SuperPropertyAccessGenerator extends Generator {
       {bool isTypeArgumentsInForest = false}) {
     if (_helper.constantContext != ConstantContext.none) {
       // TODO(brianwilkerson) Fix the length
-      _helper.addProblem(messageNotAConstantExpression, offset, 1);
+      _helper.addProblem(codeNotAConstantExpression, offset, 1);
     }
     if (getter == null) {
       return _helper.buildUnresolvedError(name.text, fileOffset,
@@ -2649,8 +2649,7 @@ class ExplicitExtensionAccessGenerator extends Generator {
     selector.reportNewAsSelector();
     if (_helper.constantContext != ConstantContext.none) {
       // Coverage-ignore-block(suite): Not run.
-      _helper.addProblem(
-          messageNotAConstantExpression, fileOffset, token.length);
+      _helper.addProblem(codeNotAConstantExpression, fileOffset, token.length);
     }
     Generator generator = _createInstanceAccess(selector.token, selector.name,
         isNullAware: isNullAware);
@@ -2693,7 +2692,7 @@ class ExplicitExtensionAccessGenerator extends Generator {
   Expression _makeInvalidRead(
       {UnresolvedKind? unresolvedKind, bool errorHasBeenReported = false}) {
     return _helper.buildProblem(
-        messageExplicitExtensionAsExpression, fileOffset, lengthForToken(token),
+        codeExplicitExtensionAsExpression, fileOffset, lengthForToken(token),
         errorHasBeenReported: errorHasBeenReported);
   }
 
@@ -2702,7 +2701,7 @@ class ExplicitExtensionAccessGenerator extends Generator {
   Expression _makeInvalidWrite(
       {Expression? value, bool errorHasBeenReported = false}) {
     return _helper.buildProblem(
-        messageExplicitExtensionAsLvalue, fileOffset, lengthForToken(token));
+        codeExplicitExtensionAsLvalue, fileOffset, lengthForToken(token));
   }
 
   @override
@@ -2814,7 +2813,7 @@ class LoadLibraryGenerator extends Generator {
         _forest.argumentsNamed(arguments).length > 0) {
       // Coverage-ignore-block(suite): Not run.
       _helper.addProblemErrorIfConst(
-          messageLoadLibraryTakesNoArguments, offset, 'loadLibrary'.length);
+          codeLoadLibraryTakesNoArguments, offset, 'loadLibrary'.length);
     }
     return builder.createLoadLibrary(offset, _forest, arguments);
   }
@@ -3241,12 +3240,12 @@ class TypeUseGenerator extends AbstractReadOnlyAccessGenerator {
                 if (declarationBuilder is ClassBuilder &&
                     declarationBuilder.isAbstract) {
                   return _helper.buildProblem(
-                      messageAbstractClassConstructorTearOff,
+                      codeAbstractClassConstructorTearOff,
                       nameOffset,
                       name.text.length);
                 } else if (declarationBuilder.isEnum) {
-                  return _helper.buildProblem(messageEnumConstructorTearoff,
-                      nameOffset, name.text.length);
+                  return _helper.buildProblem(
+                      codeEnumConstructorTearoff, nameOffset, name.text.length);
                 }
                 tearOffExpression = _helper.forest
                     .createConstructorTearOff(token.charOffset, tearOff);
@@ -3385,10 +3384,8 @@ class TypeUseGenerator extends AbstractReadOnlyAccessGenerator {
           if (getable.isStatic &&
               getable is! FactoryBuilder &&
               typeArguments != null) {
-            return _helper.buildProblem(
-                messageStaticTearOffFromInstantiatedClass,
-                send.fileOffset,
-                send.name.text.length);
+            return _helper.buildProblem(codeStaticTearOffFromInstantiatedClass,
+                send.fileOffset, send.name.text.length);
           } else {
             generator = new StaticAccessGenerator.fromBuilder(
                 _helper,
@@ -3430,7 +3427,7 @@ class TypeUseGenerator extends AbstractReadOnlyAccessGenerator {
     if (declaration is ExtensionBuilder) {
       ExtensionBuilder extensionBuilder = declaration as ExtensionBuilder;
       if (arguments.positional.length != 1 || arguments.named.isNotEmpty) {
-        return _helper.buildProblem(messageExplicitExtensionArgumentMismatch,
+        return _helper.buildProblem(codeExplicitExtensionArgumentMismatch,
             fileOffset, lengthForToken(token));
       }
       List<DartType>? explicitTypeArguments =
@@ -3557,18 +3554,16 @@ abstract class AbstractReadOnlyAccessGenerator extends Generator {
             lengthForToken(token),
             errorHasBeenReported: errorHasBeenReported);
       case ReadOnlyAccessKind.ExtensionThis:
-        return _helper.buildProblem(messageCannotAssignToExtensionThis,
-            fileOffset, lengthForToken(token),
+        return _helper.buildProblem(
+            codeCannotAssignToExtensionThis, fileOffset, lengthForToken(token),
             errorHasBeenReported: errorHasBeenReported);
       case ReadOnlyAccessKind.TypeLiteral:
         return _helper.buildProblem(
-            messageCannotAssignToTypeLiteral, fileOffset, lengthForToken(token),
+            codeCannotAssignToTypeLiteral, fileOffset, lengthForToken(token),
             errorHasBeenReported: errorHasBeenReported);
       case ReadOnlyAccessKind.ParenthesizedExpression:
-        return _helper.buildProblem(
-            messageCannotAssignToParenthesizedExpression,
-            fileOffset,
-            lengthForToken(token),
+        return _helper.buildProblem(codeCannotAssignToParenthesizedExpression,
+            fileOffset, lengthForToken(token),
             errorHasBeenReported: errorHasBeenReported);
       case ReadOnlyAccessKind.LetVariable:
       case ReadOnlyAccessKind.InvalidDeclaration:
@@ -4036,8 +4031,8 @@ abstract class ContextAwareGenerator extends Generator {
   // Coverage-ignore(suite): Not run.
   Expression _makeInvalidWrite(
       {Expression? value, bool errorHasBeenReported = false}) {
-    return _helper.buildProblem(messageIllegalAssignmentToNonAssignable,
-        fileOffset, lengthForToken(token),
+    return _helper.buildProblem(
+        codeIllegalAssignmentToNonAssignable, fileOffset, lengthForToken(token),
         errorHasBeenReported: errorHasBeenReported);
   }
 
@@ -4076,7 +4071,7 @@ class DelayedAssignment extends ContextAwareGenerator {
   Expression handleAssignment(bool voidContext) {
     if (_helper.constantContext != ConstantContext.none) {
       return _helper.buildProblem(
-          messageNotAConstantExpression, fileOffset, token.length);
+          codeNotAConstantExpression, fileOffset, token.length);
     }
     if (identical("=", assignmentOperator)) {
       return generator.buildAssignment(value, voidContext: voidContext);
@@ -4262,7 +4257,7 @@ class PrefixUseGenerator extends Generator {
     return _helper.wrapInLocatedProblem(
         _helper.evaluateArgumentsBefore(
             arguments, _forest.createNullLiteral(fileOffset)),
-        messageCantUsePrefixAsExpression.withLocation(
+        codeCantUsePrefixAsExpression.withLocation(
             _helper.uri, fileOffset, lengthForToken(token)));
   }
 
@@ -4281,7 +4276,7 @@ class PrefixUseGenerator extends Generator {
     if (isNullAware) {
       result = _helper.wrapInLocatedProblem(
           _helper.toValue(result),
-          messageCantUsePrefixWithNullAware.withLocation(
+          codeCantUsePrefixWithNullAware.withLocation(
               _helper.uri, fileOffset, lengthForToken(token)));
     }
     return result;
@@ -4291,7 +4286,7 @@ class PrefixUseGenerator extends Generator {
   Expression _makeInvalidRead(
       {UnresolvedKind? unresolvedKind, bool errorHasBeenReported = false}) {
     return _helper.buildProblem(
-        messageCantUsePrefixAsExpression, fileOffset, lengthForToken(token),
+        codeCantUsePrefixAsExpression, fileOffset, lengthForToken(token),
         errorHasBeenReported: errorHasBeenReported);
   }
 
@@ -4673,7 +4668,7 @@ class ThisAccessGenerator extends Generator {
       }
     } else {
       return _helper.buildProblem(
-          messageSuperAsExpression, fileOffset, lengthForToken(token));
+          codeSuperAsExpression, fileOffset, lengthForToken(token));
     }
   }
 
@@ -4701,8 +4696,7 @@ class ThisAccessGenerator extends Generator {
     int offset = offsetForToken(selector.token);
     if (isInitializer && selector is InvocationSelector) {
       if (isNullAware) {
-        _helper.addProblem(
-            messageInvalidUseOfNullAwareAccess, operatorOffset, 2);
+        _helper.addProblem(codeInvalidUseOfNullAwareAccess, operatorOffset, 2);
       }
       return buildConstructorInitializer(offset, name, arguments!);
     }
@@ -4910,7 +4904,7 @@ class ThisAccessGenerator extends Generator {
   // Coverage-ignore(suite): Not run.
   Expression buildAssignmentError() {
     return _helper.buildProblem(
-        isSuper ? messageCannotAssignToSuper : messageNotAnLvalue,
+        isSuper ? codeCannotAssignToSuper : codeNotAnLvalue,
         fileOffset,
         token.length);
   }
@@ -5033,7 +5027,7 @@ class ParenthesizedExpressionGenerator extends AbstractReadOnlyAccessGenerator {
           selector.name != lengthName) {
         // Coverage-ignore-block(suite): Not run.
         _helper.addProblem(
-            messageNotAConstantExpression, fileOffset, token.length);
+            codeNotAConstantExpression, fileOffset, token.length);
       }
       return PropertyAccessGenerator.make(
           _helper, selector.token, _createRead(), selector.name, isNullAware);
@@ -5100,7 +5094,7 @@ abstract class Selector {
   void reportNewAsSelector() {
     if (name.text == 'new' &&
         _helper.libraryFeatures.constructorTearoffs.isEnabled) {
-      _helper.addProblem(messageNewAsSelector, fileOffset, name.text.length);
+      _helper.addProblem(codeNewAsSelector, fileOffset, name.text.length);
     }
   }
 
@@ -5235,7 +5229,7 @@ class AugmentSuperAccessGenerator extends Generator {
       return new AugmentSuperGet(readTarget, fileOffset: fileOffset);
     } else {
       return _helper.buildProblem(
-          messageNoAugmentSuperReadTarget, fileOffset, noLength);
+          codeNoAugmentSuperReadTarget, fileOffset, noLength);
     }
   }
 
@@ -5252,7 +5246,7 @@ class AugmentSuperAccessGenerator extends Generator {
           forEffect: forEffect, fileOffset: fileOffset);
     } else {
       return _helper.buildProblem(
-          messageNoAugmentSuperWriteTarget, offset, noLength);
+          codeNoAugmentSuperWriteTarget, offset, noLength);
     }
   }
 
@@ -5330,7 +5324,7 @@ class AugmentSuperAccessGenerator extends Generator {
           fileOffset: fileOffset);
     } else {
       return _helper.buildProblem(
-          messageNoAugmentSuperInvokeTarget, offset, noLength);
+          codeNoAugmentSuperInvokeTarget, offset, noLength);
     }
   }
 

pkg/front_end/lib/src/kernel/hierarchy/class_member.dart

@@ -8,8 +8,8 @@ import 'package:kernel/type_algebra.dart';
 import '../../base/messages.dart'
     show
         LocatedMessage,
-        messageDeclaredMemberConflictsWithInheritedMembersCause,
-        messageDeclaredMemberConflictsWithOverriddenMembersCause,
+        codeDeclaredMemberConflictsWithInheritedMembersCause,
+        codeDeclaredMemberConflictsWithOverriddenMembersCause,
         codeCombinedMemberSignatureFailed,
         codeExtensionTypeCombinedMemberSignatureFailed;
 import '../../base/uri_offset.dart';
@@ -563,7 +563,7 @@ class SynthesizedInterfaceMember extends SynthesizedMember {
         int nameLength =
             classBuilder.isAnonymousMixinApplication ? 1 : name.length;
         List<LocatedMessage> context = declarations.map((ClassMember d) {
-          return messageDeclaredMemberConflictsWithOverriddenMembersCause
+          return codeDeclaredMemberConflictsWithOverriddenMembersCause
               .withLocation2(d.uriOffset);
         }).toList();
 
@@ -932,7 +932,7 @@ class SynthesizedNonExtensionTypeMember extends SynthesizedMember {
       String name = extensionTypeDeclarationBuilder.fullNameForErrors;
       int nameLength = name.length;
       List<LocatedMessage> context = declarations.map((ClassMember d) {
-        return messageDeclaredMemberConflictsWithInheritedMembersCause
+        return codeDeclaredMemberConflictsWithInheritedMembersCause
             .withLocation2(d.uriOffset);
       }).toList();
 

pkg/front_end/lib/src/kernel/hierarchy/extension_type_members.dart

@@ -986,14 +986,14 @@ class _SanitizedMember {
             _implementedNonExtensionTypeMembers);
         for (ClassMember classMember in extensionTypeMemberDeclarations) {
           context.add((extensionTypeMemberDeclarations.length > 1
-                  ? messageExtensionTypeMemberOneOfContext
-                  : messageExtensionTypeMemberContext)
+                  ? codeExtensionTypeMemberOneOfContext
+                  : codeExtensionTypeMemberContext)
               .withLocation2(classMember.uriOffset));
         }
         for (ClassMember classMember in nonExtensionTypeMemberDeclarations) {
           context.add((nonExtensionTypeMemberDeclarations.length > 1
-                  ? messageNonExtensionTypeMemberOneOfContext
-                  : messageNonExtensionTypeMemberContext)
+                  ? codeNonExtensionTypeMemberOneOfContext
+                  : codeNonExtensionTypeMemberContext)
               .withLocation2(classMember.uriOffset));
         }
         extensionTypeDeclarationBuilder.libraryBuilder.addProblem(
@@ -1006,7 +1006,7 @@ class _SanitizedMember {
       } else if (extensionTypeMemberDeclarations.length > 1) {
         List<LocatedMessage> context = [];
         for (ClassMember classMember in extensionTypeMemberDeclarations) {
-          context.add(messageExtensionTypeMemberOneOfContext
+          context.add(codeExtensionTypeMemberOneOfContext
               .withLocation2(classMember.uriOffset));
         }
         extensionTypeDeclarationBuilder.libraryBuilder.addProblem(

pkg/front_end/lib/src/kernel/hierarchy/members_node.dart

@@ -11,13 +11,13 @@ import '../../base/messages.dart'
     show
         LocatedMessage,
         ProblemReporting,
-        messageDeclaredMemberConflictsWithInheritedMember,
-        messageDeclaredMemberConflictsWithInheritedMemberCause,
-        messageDeclaredMemberConflictsWithOverriddenMembersCause,
-        messageEnumAbstractMember,
-        messageInheritedMembersConflict,
-        messageInheritedMembersConflictCause1,
-        messageInheritedMembersConflictCause2,
+        codeDeclaredMemberConflictsWithInheritedMember,
+        codeDeclaredMemberConflictsWithInheritedMemberCause,
+        codeDeclaredMemberConflictsWithOverriddenMembersCause,
+        codeEnumAbstractMember,
+        codeInheritedMembersConflict,
+        codeInheritedMembersConflictCause1,
+        codeInheritedMembersConflictCause2,
         codeCantInferReturnTypeDueToNoCombinedSignature,
         codeCantInferTypeDueToNoCombinedSignature,
         codeCantInferTypesDueToNoCombinedSignature,
@@ -59,8 +59,8 @@ abstract class MembersNodeBuilder {
       second = a;
     }
     return <LocatedMessage>[
-      messageInheritedMembersConflictCause1.withLocation2(first.uriOffset),
-      messageInheritedMembersConflictCause2.withLocation2(second.uriOffset),
+      codeInheritedMembersConflictCause1.withLocation2(first.uriOffset),
+      codeInheritedMembersConflictCause2.withLocation2(second.uriOffset),
     ];
   }
 
@@ -74,21 +74,21 @@ abstract class MembersNodeBuilder {
     if (a.declarationBuilder != b.declarationBuilder) {
       if (a.declarationBuilder == declarationBuilder) {
         declarationBuilder.libraryBuilder.addProblem2(
-            messageDeclaredMemberConflictsWithInheritedMember, a.uriOffset,
+            codeDeclaredMemberConflictsWithInheritedMember, a.uriOffset,
             context: <LocatedMessage>[
-              messageDeclaredMemberConflictsWithInheritedMemberCause
+              codeDeclaredMemberConflictsWithInheritedMemberCause
                   .withLocation2(b.uriOffset)
             ]);
       } else if (b.declarationBuilder == declarationBuilder) {
         declarationBuilder.libraryBuilder.addProblem2(
-            messageDeclaredMemberConflictsWithInheritedMember, b.uriOffset,
+            codeDeclaredMemberConflictsWithInheritedMember, b.uriOffset,
             context: <LocatedMessage>[
-              messageDeclaredMemberConflictsWithInheritedMemberCause
+              codeDeclaredMemberConflictsWithInheritedMemberCause
                   .withLocation2(a.uriOffset)
             ]);
       } else {
         declarationBuilder.libraryBuilder.addProblem(
-            messageInheritedMembersConflict,
+            codeInheritedMembersConflict,
             declarationBuilder.fileOffset,
             declarationBuilder.fullNameForErrors.length,
             declarationBuilder.fileUri,
@@ -1031,7 +1031,7 @@ class ClassMembersNodeBuilder extends MembersNodeBuilder {
       if (classBuilder.isEnum &&
           declaration.declarationBuilder == classBuilder) {
         classBuilder.libraryBuilder.addProblem2(
-          messageEnumAbstractMember,
+          codeEnumAbstractMember,
           declaration.uriOffset,
         );
       } else {
@@ -2817,7 +2817,7 @@ void reportCantInferParameterType(ProblemReporting problemReporting,
   String name = parameter.name;
   List<LocatedMessage> context = overriddenMembers
       .map((ClassMember overriddenMember) {
-        return messageDeclaredMemberConflictsWithOverriddenMembersCause
+        return codeDeclaredMemberConflictsWithOverriddenMembersCause
             .withLocation2(overriddenMember.uriOffset);
       })
       // Call toSet to avoid duplicate context for instance of fields that are
@@ -2841,7 +2841,7 @@ void reportCantInferTypes(
     required int nameLength}) {
   List<LocatedMessage> context = overriddenMembers
       .map((ClassMember overriddenMember) {
-        return messageDeclaredMemberConflictsWithOverriddenMembersCause
+        return codeDeclaredMemberConflictsWithOverriddenMembersCause
             .withLocation2(overriddenMember.uriOffset);
       })
       // Call toSet to avoid duplicate context for instance of fields that are
@@ -2865,7 +2865,7 @@ void reportCantInferReturnType(
     required int nameLength}) {
   List<LocatedMessage> context = overriddenMembers
       .map((ClassMember overriddenMember) {
-        return messageDeclaredMemberConflictsWithOverriddenMembersCause
+        return codeDeclaredMemberConflictsWithOverriddenMembersCause
             .withLocation2(overriddenMember.uriOffset);
       })
       // Call toSet to avoid duplicate context for instance of fields that are
@@ -2889,7 +2889,7 @@ void reportCantInferFieldType(
     required int nameLength}) {
   List<LocatedMessage> context = overriddenMembers
       .map((ClassMember overriddenMember) {
-        return messageDeclaredMemberConflictsWithOverriddenMembersCause
+        return codeDeclaredMemberConflictsWithOverriddenMembersCause
             .withLocation2(overriddenMember.uriOffset);
       })
       // Call toSet to avoid duplicate context for instance of fields that are

pkg/front_end/lib/src/kernel/kernel_target.dart

@@ -30,11 +30,11 @@ import '../base/messages.dart'
         FormattedMessage,
         LocatedMessage,
         Message,
-        messageConstConstructorLateFinalFieldCause,
-        messageConstConstructorLateFinalFieldError,
-        messageConstConstructorNonFinalField,
-        messageConstConstructorNonFinalFieldCause,
-        messageConstConstructorRedirectionToNonConst,
+        codeConstConstructorLateFinalFieldCause,
+        codeConstConstructorLateFinalFieldError,
+        codeConstConstructorNonFinalField,
+        codeConstConstructorNonFinalFieldCause,
+        codeConstConstructorRedirectionToNonConst,
         noLength,
         codeFieldNonNullableNotInitializedByConstructorError,
         codeFieldNonNullableWithoutInitializerError,
@@ -1295,7 +1295,7 @@ class KernelTarget {
         if (initializer is RedirectingInitializer) {
           if (constructor.isConst && !initializer.target.isConst) {
             classBuilder.libraryBuilder.addProblem(
-                messageConstConstructorRedirectionToNonConst,
+                codeConstConstructorRedirectionToNonConst,
                 initializer.fileOffset,
                 initializer.target.name.text.length,
                 constructor.fileUri);
@@ -1398,12 +1398,12 @@ class KernelTarget {
       if (constructor.isEffectivelyRedirecting) continue;
       if (constructor.isConst && nonFinalFields.isNotEmpty) {
         classDeclaration.libraryBuilder.addProblem(
-            messageConstConstructorNonFinalField,
+            codeConstConstructorNonFinalField,
             constructor.fileOffset,
             noLength,
             constructor.fileUri,
             context: nonFinalFields
-                .map((field) => messageConstConstructorNonFinalFieldCause
+                .map((field) => codeConstConstructorNonFinalFieldCause
                     .withLocation(field.fileUri, field.fileOffset, noLength))
                 .toList());
         nonFinalFields.clear();
@@ -1411,9 +1411,9 @@ class KernelTarget {
       if (constructor.isConst && lateFinalFields.isNotEmpty) {
         for (SourcePropertyBuilder field in lateFinalFields) {
           classDeclaration.libraryBuilder.addProblem2(
-              messageConstConstructorLateFinalFieldError, field.fieldUriOffset!,
+              codeConstConstructorLateFinalFieldError, field.fieldUriOffset!,
               context: [
-                messageConstConstructorLateFinalFieldCause.withLocation(
+                codeConstConstructorLateFinalFieldCause.withLocation(
                     constructor.fileUri, constructor.fileOffset, noLength)
               ]);
         }

pkg/front_end/lib/src/kernel/record_use.dart

@@ -9,7 +9,7 @@ library;
 
 import 'package:kernel/ast.dart';
 
-import '../base/messages.dart' show messageRecordUseCannotBePlacedHere;
+import '../base/messages.dart' show codeRecordUseCannotBePlacedHere;
 import 'constant_evaluator.dart' show ErrorReporter;
 
 /// Get all of the `@RecordUse` annotations from `package:meta`
@@ -65,7 +65,7 @@ void validateRecordUseDeclaration(
   final bool onClassWithoutConstConstructor = node is! Class ||
       !node.constructors.any((constructor) => constructor.isConst);
   if (onNonStaticMethod && onClassWithoutConstConstructor) {
-    errorReporter.report(messageRecordUseCannotBePlacedHere.withLocation(
+    errorReporter.report(codeRecordUseCannotBePlacedHere.withLocation(
         node.location!.file, node.fileOffset, 1));
   }
 }

pkg/front_end/lib/src/kernel/static_weak_references.dart

@@ -9,12 +9,12 @@ import 'package:kernel/core_types.dart' show CoreTypes;
 
 import '../codes/cfe_codes.dart'
     show
-        messageWeakReferenceNotStatic,
-        messageWeakReferenceNotOneArgument,
-        messageWeakReferenceReturnTypeNotNullable,
-        messageWeakReferenceMismatchReturnAndArgumentTypes,
-        messageWeakReferenceTargetNotStaticTearoff,
-        messageWeakReferenceTargetHasParameters;
+        codeWeakReferenceNotStatic,
+        codeWeakReferenceNotOneArgument,
+        codeWeakReferenceReturnTypeNotNullable,
+        codeWeakReferenceMismatchReturnAndArgumentTypes,
+        codeWeakReferenceTargetNotStaticTearoff,
+        codeWeakReferenceTargetHasParameters;
 import 'constant_evaluator.dart' show ErrorReporter;
 
 /// Recognizes and validates static weak references.
@@ -55,7 +55,7 @@ class StaticWeakReferences {
       StaticInvocation node, ErrorReporter errorReporter) {
     final Arguments arguments = node.arguments;
     if (arguments.positional.length != 1 || arguments.named.isNotEmpty) {
-      errorReporter.report(messageWeakReferenceNotOneArgument.withLocation(
+      errorReporter.report(codeWeakReferenceNotOneArgument.withLocation(
           node.location!.file, node.fileOffset, 1));
       return;
     }
@@ -69,15 +69,15 @@ class StaticWeakReferences {
           if (function.positionalParameters.isNotEmpty ||
               function.namedParameters.isNotEmpty ||
               function.typeParameters.isNotEmpty) {
-            errorReporter.report(messageWeakReferenceTargetHasParameters
+            errorReporter.report(codeWeakReferenceTargetHasParameters
                 .withLocation(node.location!.file, node.fileOffset, 1));
           }
           return;
         }
       }
     }
-    errorReporter.report(messageWeakReferenceTargetNotStaticTearoff
-        .withLocation(node.location!.file, node.fileOffset, 1));
+    errorReporter.report(codeWeakReferenceTargetNotStaticTearoff.withLocation(
+        node.location!.file, node.fileOffset, 1));
   }
 
   // Coverage-ignore(suite): Not run.
@@ -86,7 +86,7 @@ class StaticWeakReferences {
     if (node is! Procedure ||
         !node.isStatic ||
         node.kind != ProcedureKind.Method) {
-      errorReporter.report(messageWeakReferenceNotStatic.withLocation(
+      errorReporter.report(codeWeakReferenceNotStatic.withLocation(
           node.location!.file, node.fileOffset, 1));
       return;
     }
@@ -94,17 +94,17 @@ class StaticWeakReferences {
     if (function.positionalParameters.length != 1 ||
         function.requiredParameterCount != 1 ||
         function.namedParameters.isNotEmpty) {
-      errorReporter.report(messageWeakReferenceNotOneArgument.withLocation(
+      errorReporter.report(codeWeakReferenceNotOneArgument.withLocation(
           node.location!.file, node.fileOffset, 1));
       return;
     }
     final DartType returnType = function.returnType;
     if (returnType.nullability != Nullability.nullable) {
-      errorReporter.report(messageWeakReferenceReturnTypeNotNullable
-          .withLocation(node.location!.file, node.fileOffset, 1));
+      errorReporter.report(codeWeakReferenceReturnTypeNotNullable.withLocation(
+          node.location!.file, node.fileOffset, 1));
     }
     if (returnType != function.positionalParameters.single.type) {
-      errorReporter.report(messageWeakReferenceMismatchReturnAndArgumentTypes
+      errorReporter.report(codeWeakReferenceMismatchReturnAndArgumentTypes
           .withLocation(node.location!.file, node.fileOffset, 1));
     }
     node.hasWeakTearoffReferencePragma = true;

pkg/front_end/lib/src/kernel/type_algorithms.dart

@@ -821,8 +821,8 @@ class ComputeDefaultTypeContext {
     }
 
     if (isUnaliasedGenericFunctionType || isAliasedGenericFunctionType) {
-      _problemReporting.addProblem(messageGenericFunctionTypeInBound,
-          charOffset, typeParameterName.length, fileUri);
+      _problemReporting.addProblem(codeGenericFunctionTypeInBound, charOffset,
+          typeParameterName.length, fileUri);
       return true;
     }
     return false;

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

@@ -243,10 +243,10 @@ class BuilderFactory {
         int augmentationTypeParameterCount =
             augmentation.typeParameters?.length ?? 0;
         if (introductoryTypeParameterCount != augmentationTypeParameterCount) {
-          _problemReporting.addProblem(messagePatchClassTypeParametersMismatch,
+          _problemReporting.addProblem(codePatchClassTypeParametersMismatch,
               augmentation.nameOffset, name.length, augmentation.fileUri,
               context: [
-                messagePatchClassOrigin.withLocation(
+                codePatchClassOrigin.withLocation(
                     fragment.fileUri, fragment.nameOffset, name.length)
               ]);
 
@@ -623,12 +623,12 @@ class BuilderFactory {
             augmentation.typeParameters?.length ?? 0;
         if (introductoryTypeParameterCount != augmentationTypeParameterCount) {
           _problemReporting.addProblem(
-              messagePatchExtensionTypeParametersMismatch,
+              codePatchExtensionTypeParametersMismatch,
               augmentation.nameOrExtensionOffset,
               nameLength,
               augmentation.fileUri,
               context: [
-                messagePatchExtensionOrigin.withLocation(fragment.fileUri,
+                codePatchExtensionOrigin.withLocation(fragment.fileUri,
                     fragment.nameOrExtensionOffset, nameLength)
               ]);
 
@@ -1131,7 +1131,7 @@ class EnumValuesDeclaration extends _PropertyDeclaration
   void reportDuplicateDeclaration(
       ProblemReporting problemReporting, _Declaration declaration) {
     problemReporting.addProblem2(
-        messageEnumContainsValuesDeclaration, declaration.uriOffset);
+        codeEnumContainsValuesDeclaration, declaration.uriOffset);
   }
 
   @override

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

@@ -33,7 +33,7 @@ import '../base/local_scope.dart';
 import '../base/problems.dart' show DebugAbort;
 import '../base/scope.dart';
 import '../codes/cfe_codes.dart'
-    show Code, LocatedMessage, Message, messageExpectedBlockToSkip;
+    show Code, LocatedMessage, Message, codeExpectedBlockToSkip;
 import '../fragment/fragment.dart';
 import '../kernel/benchmarker.dart' show BenchmarkSubdivides, Benchmarker;
 import '../kernel/body_builder.dart' show BodyBuilder, FormalParameters;
@@ -724,7 +724,7 @@ class DietListener extends StackListenerImpl {
     debugEvent("NativeFunctionBodySkipped");
     if (!enableNative) {
       super.handleRecoverableError(
-          messageExpectedBlockToSkip, nativeToken, nativeToken);
+          codeExpectedBlockToSkip, nativeToken, nativeToken);
     }
   }
 

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

@@ -11,7 +11,7 @@ import 'package:_fe_analyzer_shared/src/parser/listener.dart';
 import 'package:_fe_analyzer_shared/src/parser/quote.dart';
 import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token;
 
-import '../codes/cfe_codes.dart' show messageExpectedBlockToSkip;
+import '../codes/cfe_codes.dart' show codeExpectedBlockToSkip;
 
 /// Listener that records imports, exports, and part directives.
 ///
@@ -113,7 +113,7 @@ class DirectiveListener extends Listener {
   @override
   void handleNativeFunctionBodySkipped(Token nativeToken, Token semicolon) {
     super.handleRecoverableError(
-        messageExpectedBlockToSkip, nativeToken, nativeToken);
+        codeExpectedBlockToSkip, nativeToken, nativeToken);
   }
 }
 

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

@@ -579,7 +579,7 @@ class FragmentFactoryImpl implements FragmentFactory {
     if (uri == null) {
       // Coverage-ignore-block(suite): Not run.
       _problemReporting.addProblem(
-          messageExpectedUri, uriOffset, noLength, _compilationUnit.fileUri);
+          codeExpectedUri, uriOffset, noLength, _compilationUnit.fileUri);
       return new Uri(scheme: MALFORMED_URI_SCHEME);
     }
     Uri parsedUri;
@@ -656,8 +656,8 @@ class FragmentFactoryImpl implements FragmentFactory {
     _compilationUnitRegistry.registerPartOf(
         name: name, resolvedUri: resolvedUri);
     if (_scriptTokenOffset != null) {
-      _problemReporting.addProblem(messageScriptTagInPartFile,
-          _scriptTokenOffset!, noLength, _compilationUnit.fileUri);
+      _problemReporting.addProblem(codeScriptTagInPartFile, _scriptTokenOffset!,
+          noLength, _compilationUnit.fileUri);
     }
   }
 
@@ -698,8 +698,8 @@ class FragmentFactoryImpl implements FragmentFactory {
     String? nativePath;
     const String nativeExtensionScheme = "dart-ext:";
     if (uri.startsWith(nativeExtensionScheme)) {
-      _problemReporting.addProblem(messageUnsupportedDartExt, charOffset,
-          noLength, _compilationUnit.fileUri);
+      _problemReporting.addProblem(codeUnsupportedDartExt, charOffset, noLength,
+          _compilationUnit.fileUri);
       String strippedUri = uri.substring(nativeExtensionScheme.length);
       if (strippedUri.startsWith("package")) {
         // Coverage-ignore-block(suite): Not run.
@@ -1428,10 +1428,8 @@ class FragmentFactoryImpl implements FragmentFactory {
         return null;
       }
     } else {
-      internalProblem(
-          messageInternalProblemOmittedTypeNameInConstructorReference,
-          charOffset,
-          _compilationUnit.fileUri);
+      internalProblem(codeInternalProblemOmittedTypeNameInConstructorReference,
+          charOffset, _compilationUnit.fileUri);
     }
   }
 
@@ -1496,7 +1494,7 @@ class FragmentFactoryImpl implements FragmentFactory {
       // In either case this is reported elsewhere, and since the name is a
       // legal name for a regular method, we don't remove an error on the name.
     } else {
-      _problemReporting.addProblem(messageConstructorWithWrongName, charOffset,
+      _problemReporting.addProblem(codeConstructorWithWrongName, charOffset,
           prefix.length, _compilationUnit.fileUri,
           context: [
             codeConstructorWithWrongNameContext
@@ -1906,7 +1904,7 @@ class FragmentFactoryImpl implements FragmentFactory {
         if (builder.metadata != null) {
           if (!libraryFeatures.genericMetadata.isEnabled) {
             _problemReporting.addProblem(
-                messageAnnotationOnFunctionTypeTypeParameter,
+                codeAnnotationOnFunctionTypeTypeParameter,
                 builder.fileOffset,
                 builder.name.length,
                 builder.fileUri);
@@ -1930,7 +1928,7 @@ class FragmentFactoryImpl implements FragmentFactory {
       StructuralParameterBuilder? existing = typeParametersByName[tv.name];
       if (existing != null) {
         // Coverage-ignore-block(suite): Not run.
-        _problemReporting.addProblem(messageTypeParameterDuplicatedName,
+        _problemReporting.addProblem(codeTypeParameterDuplicatedName,
             tv.fileOffset, tv.name.length, _compilationUnit.fileUri,
             context: [
               codeTypeParameterDuplicatedNameCause

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

@@ -118,7 +118,7 @@ class DeclarationNameSpaceBuilder {
             name.length,
             fileUri,
             context: [
-              messageConflictsWithTypeParameterCause.withLocation(
+              codeConflictsWithTypeParameterCause.withLocation(
                   tv.fileUri!, tv.fileOffset, name.length)
             ]);
       }
@@ -212,13 +212,12 @@ class _DeclarationBuilderRegistry implements BuilderRegistry {
       // better specialize the message.
       if (declarationBuilder.isEnum && name == 'values') {
         problemReporting.addProblem(
-            messageEnumWithNameValues,
+            codeEnumWithNameValues,
             declarationBuilder.fileOffset,
             name.length,
             declarationBuilder.fileUri);
       } else {
-        problemReporting.addProblem2(
-            messageMemberWithSameNameAsClass, uriOffset);
+        problemReporting.addProblem2(codeMemberWithSameNameAsClass, uriOffset);
       }
     }
     if (isConstructor) {

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

@@ -24,7 +24,7 @@ class NominalParameterNameSpace {
           existing.parameter.name = '#${existing.name}';
           _typeParametersByName[tv.name] = tv;
         } else {
-          _problemReporting.addProblem(messageTypeParameterDuplicatedName,
+          _problemReporting.addProblem(codeTypeParameterDuplicatedName,
               tv.fileOffset, tv.name.length, tv.fileUri,
               context: [
                 codeTypeParameterDuplicatedNameCause
@@ -40,7 +40,7 @@ class NominalParameterNameSpace {
         // [#29555](https://github.com/dart-lang/sdk/issues/29555) and
         // [#54602](https://github.com/dart-lang/sdk/issues/54602).
         if (tv.name == ownerName && !allowNameConflict) {
-          _problemReporting.addProblem(messageTypeParameterSameNameAsEnclosing,
+          _problemReporting.addProblem(codeTypeParameterSameNameAsEnclosing,
               tv.fileOffset, tv.name.length, tv.fileUri);
         }
       }

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

@@ -875,7 +875,7 @@ class OutlineBuilder extends StackListenerImpl {
       push(charOffset);
       // Point to dollar sign
       int interpolationOffset = charOffset + beginToken.lexeme.length;
-      addProblem(messageInterpolationInUri, interpolationOffset, 1);
+      addProblem(codeInterpolationInUri, interpolationOffset, 1);
     }
   }
 
@@ -1604,25 +1604,25 @@ class OutlineBuilder extends StackListenerImpl {
               type.hasFunctionFormalParameterSyntax) {
             _compilationUnit.addProblem(
                 // ignore: lines_longer_than_80_chars
-                messageExtensionTypePrimaryConstructorFunctionFormalParameterSyntax,
+                codeExtensionTypePrimaryConstructorFunctionFormalParameterSyntax,
                 formal.fileOffset,
                 formal.name.length,
                 formal.fileUri);
           }
           if (type is ImplicitTypeBuilder) {
-            _compilationUnit.addProblem(messageExpectedRepresentationType,
+            _compilationUnit.addProblem(codeExpectedRepresentationType,
                 formal.fileOffset, formal.name.length, formal.fileUri);
             formal.type =
                 new InvalidTypeBuilderImpl(formal.fileUri, formal.fileOffset);
           }
           if (formal.modifiers.containsSyntacticModifiers(
               ignoreCovariant: true, ignoreRequired: true)) {
-            _compilationUnit.addProblem(messageRepresentationFieldModifier,
+            _compilationUnit.addProblem(codeRepresentationFieldModifier,
                 formal.fileOffset, formal.name.length, formal.fileUri);
           }
           if (formal.isInitializingFormal) {
             _compilationUnit.addProblem(
-                messageExtensionTypePrimaryConstructorWithInitializingFormal,
+                codeExtensionTypePrimaryConstructorWithInitializingFormal,
                 formal.fileOffset,
                 formal.name.length,
                 formal.fileUri);
@@ -1653,22 +1653,22 @@ class OutlineBuilder extends StackListenerImpl {
       if (inExtensionType) {
         if (firstOptionalPositionalParameterOffset != null) {
           _compilationUnit.addProblem(
-              messageOptionalParametersInExtensionTypeDeclaration,
+              codeOptionalParametersInExtensionTypeDeclaration,
               firstOptionalPositionalParameterOffset,
               1,
               uri);
         } else if (firstNamedParameterOffset != null) {
           _compilationUnit.addProblem(
-              messageNamedParametersInExtensionTypeDeclaration,
+              codeNamedParametersInExtensionTypeDeclaration,
               firstNamedParameterOffset,
               1,
               uri);
         } else if (requiredPositionalCount == 0) {
           _compilationUnit.addProblem(
-              messageExpectedRepresentationField, charOffset, 1, uri);
+              codeExpectedRepresentationField, charOffset, 1, uri);
         } else if (formals.length > 1) {
           _compilationUnit.addProblem(
-              messageMultipleRepresentationFields, charOffset, 1, uri);
+              codeMultipleRepresentationFields, charOffset, 1, uri);
         }
       }
     }
@@ -1727,7 +1727,7 @@ class OutlineBuilder extends StackListenerImpl {
         isAbstract = false;
       }
       if (returnType != null && !returnType.isVoidType) {
-        addProblem(messageNonVoidReturnSetter, beginToken.charOffset, noLength);
+        addProblem(codeNonVoidReturnSetter, beginToken.charOffset, noLength);
         // Use implicit void as recovery.
         returnType = null;
       }
@@ -1838,7 +1838,7 @@ class OutlineBuilder extends StackListenerImpl {
   void handleNativeFunctionBodySkipped(Token nativeToken, Token semicolon) {
     if (!enableNative) {
       super.handleRecoverableError(
-          messageExpectedBlockToSkip, nativeToken, nativeToken);
+          codeExpectedBlockToSkip, nativeToken, nativeToken);
     }
     push(MethodBody.Regular);
   }
@@ -2104,7 +2104,7 @@ class OutlineBuilder extends StackListenerImpl {
         if (formals != null) {
           for (FormalParameterBuilder formal in formals) {
             if (!formal.isRequiredPositional) {
-              addProblem(messageOperatorWithOptionalFormals, formal.fileOffset,
+              addProblem(codeOperatorWithOptionalFormals, formal.fileOffset,
                   formal.name.length);
             }
           }
@@ -2112,7 +2112,7 @@ class OutlineBuilder extends StackListenerImpl {
       }
       if (typeParameters != null) {
         TypeParameterFragment typeParameterBuilder = typeParameters.first;
-        addProblem(messageOperatorWithTypeParameters,
+        addProblem(codeOperatorWithTypeParameters,
             typeParameterBuilder.nameOffset, typeParameterBuilder.name.length);
       }
     } else {
@@ -2133,7 +2133,7 @@ class OutlineBuilder extends StackListenerImpl {
       }
       if (returnType != null && !returnType.isVoidType) {
         addProblem(
-            messageNonVoidReturnSetter,
+            codeNonVoidReturnSetter,
             returnType.charOffset ?? // Coverage-ignore(suite): Not run.
                 beginToken.charOffset,
             noLength);
@@ -2145,7 +2145,7 @@ class OutlineBuilder extends StackListenerImpl {
         returnType != null &&
         !returnType.isVoidType) {
       addProblem(
-          messageNonVoidReturnOperator,
+          codeNonVoidReturnOperator,
           returnType.charOffset ?? // Coverage-ignore(suite): Not run.
               beginToken.offset,
           noLength);
@@ -2179,12 +2179,12 @@ class OutlineBuilder extends StackListenerImpl {
       if (isConst &&
           bodyKind != MethodBody.Abstract &&
           !libraryFeatures.constFunctions.isEnabled) {
-        addProblem(messageConstConstructorWithBody, varFinalOrConstOffset, 5);
+        addProblem(codeConstConstructorWithBody, varFinalOrConstOffset, 5);
         modifiers -= Modifiers.Const;
       }
       if (returnType != null) {
         addProblem(
-            messageConstructorWithReturnType,
+            codeConstructorWithReturnType,
             returnType.charOffset ?? // Coverage-ignore(suite): Not run.
                 beginToken.offset,
             noLength);
@@ -2601,7 +2601,7 @@ class OutlineBuilder extends StackListenerImpl {
           tokenBeforeEnd.isA(TokenType.COMMA) &&
           kind == MemberKind.PrimaryConstructor &&
           declarationContext == DeclarationContext.ExtensionType) {
-        _compilationUnit.addProblem(messageRepresentationFieldTrailingComma,
+        _compilationUnit.addProblem(codeRepresentationFieldTrailingComma,
             tokenBeforeEnd.charOffset, 1, uri);
       }
     } else if (count > 1) {
@@ -2682,7 +2682,7 @@ class OutlineBuilder extends StackListenerImpl {
       for (FormalParameterBuilder formal in formals) {
         if (formal.isSuperInitializingFormal) {
           _compilationUnit.addProblem(
-              messageExtensionTypeConstructorWithSuperFormalParameter,
+              codeExtensionTypeConstructorWithSuperFormalParameter,
               formal.fileOffset,
               formal.name.length,
               formal.fileUri);
@@ -2860,7 +2860,7 @@ class OutlineBuilder extends StackListenerImpl {
     if (identifier is Identifier) {
       if (enumConstantInfos == null) {
         if (!leftBrace.isSynthetic) {
-          addProblem(messageEnumDeclarationEmpty, identifier.token.offset,
+          addProblem(codeEnumDeclarationEmpty, identifier.token.offset,
               identifier.token.length);
         }
       }
@@ -3111,12 +3111,11 @@ class OutlineBuilder extends StackListenerImpl {
       if (type is FunctionTypeBuilder &&
           !libraryFeatures.nonfunctionTypeAliases.isEnabled) {
         if (type.nullabilityBuilder.build() == Nullability.nullable) {
-          addProblem(
-              messageTypedefNullableType, equals.charOffset, equals.length);
+          addProblem(codeTypedefNullableType, equals.charOffset, equals.length);
           aliasedType = new NamedTypeBuilderImpl.fromTypeDeclarationBuilder(
               new InvalidBuilder(
                   identifier.name,
-                  messageTypedefNullableType.withLocation(
+                  codeTypedefNullableType.withLocation(
                       uri, equals.charOffset, equals.length)),
               const NullabilityBuilder.omitted(),
               instanceTypeParameterAccess:
@@ -3133,11 +3132,11 @@ class OutlineBuilder extends StackListenerImpl {
         if (type is TypeBuilder) {
           aliasedType = type;
         } else {
-          addProblem(messageTypedefNotType, equals.charOffset, equals.length);
+          addProblem(codeTypedefNotType, equals.charOffset, equals.length);
           aliasedType = new NamedTypeBuilderImpl.fromTypeDeclarationBuilder(
               new InvalidBuilder(
                   "${name}",
-                  messageTypedefNotType.withLocation(
+                  codeTypedefNotType.withLocation(
                       uri, equals.charOffset, equals.length)),
               const NullabilityBuilder.omitted(),
               instanceTypeParameterAccess:
@@ -3147,22 +3146,21 @@ class OutlineBuilder extends StackListenerImpl {
         assert(type is! FunctionTypeBuilder);
         // TODO(ahe): Improve this error message.
         if (type is TypeBuilder) {
-          addProblem(
-              messageTypedefNotFunction, equals.charOffset, equals.length);
+          addProblem(codeTypedefNotFunction, equals.charOffset, equals.length);
           aliasedType = new NamedTypeBuilderImpl.fromTypeDeclarationBuilder(
               new InvalidBuilder(
                   identifier.name,
-                  messageTypedefNotFunction.withLocation(
+                  codeTypedefNotFunction.withLocation(
                       uri, equals.charOffset, equals.length)),
               const NullabilityBuilder.omitted(),
               instanceTypeParameterAccess:
                   InstanceTypeParameterAccessState.Allowed);
         } else {
-          addProblem(messageTypedefNotType, equals.charOffset, equals.length);
+          addProblem(codeTypedefNotType, equals.charOffset, equals.length);
           aliasedType = new NamedTypeBuilderImpl.fromTypeDeclarationBuilder(
               new InvalidBuilder(
                   identifier.name,
-                  messageTypedefNotType.withLocation(
+                  codeTypedefNotType.withLocation(
                       uri, equals.charOffset, equals.length)),
               const NullabilityBuilder.omitted(),
               instanceTypeParameterAccess:
@@ -3265,7 +3263,7 @@ class OutlineBuilder extends StackListenerImpl {
     if (externalToken != null && lateToken != null) {
       // Coverage-ignore-block(suite): Not run.
       handleRecoverableError(
-          messageExternalLateField, externalToken, externalToken);
+          codeExternalLateField, externalToken, externalToken);
       externalToken = null;
     }
     List<FieldInfo>? fieldInfos = popFieldInfos(count);
@@ -3311,18 +3309,18 @@ class OutlineBuilder extends StackListenerImpl {
     debugEvent("Fields");
     if (staticToken != null && abstractToken != null) {
       handleRecoverableError(
-          messageAbstractStaticField, abstractToken, abstractToken);
+          codeAbstractStaticField, abstractToken, abstractToken);
       abstractToken = null;
     }
     if (abstractToken != null && lateToken != null) {
       handleRecoverableError(
-          messageAbstractLateField, abstractToken, abstractToken);
+          codeAbstractLateField, abstractToken, abstractToken);
       abstractToken = null;
     }
     // Coverage-ignore(suite): Not run.
     else if (externalToken != null && lateToken != null) {
       handleRecoverableError(
-          messageExternalLateField, externalToken, externalToken);
+          codeExternalLateField, externalToken, externalToken);
       externalToken = null;
     }
 
@@ -3339,7 +3337,7 @@ class OutlineBuilder extends StackListenerImpl {
     if (staticToken == null && modifiers.isConst) {
       // It is a compile-time error if an instance variable is declared to be
       // constant.
-      addProblem(messageConstInstanceField, varFinalOrConst!.charOffset,
+      addProblem(codeConstInstanceField, varFinalOrConst!.charOffset,
           varFinalOrConst.length);
       modifiers -= Modifiers.Const;
     }
@@ -3474,8 +3472,8 @@ class OutlineBuilder extends StackListenerImpl {
     }
 
     if (inConstructorName) {
-      addProblem(messageConstructorWithTypeParameters,
-          offsetForToken(beginToken), lengthOfSpan(beginToken, endToken));
+      addProblem(codeConstructorWithTypeParameters, offsetForToken(beginToken),
+          lengthOfSpan(beginToken, endToken));
       inConstructorName = false;
     }
   }
@@ -3738,7 +3736,7 @@ class OutlineBuilder extends StackListenerImpl {
     debugEvent("ConstFactory");
     if (!libraryFeatures.constFunctions.isEnabled) {
       // Coverage-ignore-block(suite): Not run.
-      handleRecoverableError(messageConstFactory, constKeyword, constKeyword);
+      handleRecoverableError(codeConstFactory, constKeyword, constKeyword);
     }
   }
 

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

@@ -356,16 +356,16 @@ class SourceClassBuilder extends ClassBuilderImpl
     if (_supertypeBuilder != null) {
       _supertypeBuilder = null;
       libraryBuilder.addProblem(
-          messageObjectExtends, fileOffset, noLength, fileUri);
+          codeObjectExtends, fileOffset, noLength, fileUri);
     }
     if (_interfaceBuilders != null) {
       libraryBuilder.addProblem(
-          messageObjectImplements, fileOffset, noLength, fileUri);
+          codeObjectImplements, fileOffset, noLength, fileUri);
       _interfaceBuilders = null;
     }
     if (_mixedInTypeBuilder != null) {
       libraryBuilder.addProblem(
-          messageObjectMixesIn, fileOffset, noLength, fileUri);
+          codeObjectMixesIn, fileOffset, noLength, fileUri);
       _mixedInTypeBuilder = null;
     }
   }
@@ -824,7 +824,7 @@ class SourceClassBuilder extends ClassBuilderImpl
         libraryBuilder.addProblem(
             message, nameOffset, nameLength, target.fileUri,
             context: [
-              messageTypedefCause.withLocation(
+              codeTypedefCause.withLocation(
                   aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
             ]);
       } else {
@@ -843,7 +843,7 @@ class SourceClassBuilder extends ClassBuilderImpl
       // TODO(eernst): Should gather 'restricted supertype' checks in one place,
       // e.g., dynamic/int/String/Null and more are checked elsewhere.
       if (unaliasedSuperDeclaration is NeverTypeDeclarationBuilder) {
-        fail(superClassType, messageExtendsNever, superDeclaration);
+        fail(superClassType, codeExtendsNever, superDeclaration);
       } else if (unaliasedSuperDeclaration is ClassBuilder) {
         superClass = unaliasedSuperDeclaration;
       }
@@ -927,8 +927,8 @@ class SourceClassBuilder extends ClassBuilderImpl
             // Coverage-ignore(suite): Not run.
             interface.cls.enclosingLibrary.importUri.path == "async") {
           // Coverage-ignore-block(suite): Not run.
-          libraryBuilder.addProblem(messageImplementsFutureOr, this.fileOffset,
-              noLength, this.fileUri);
+          libraryBuilder.addProblem(
+              codeImplementsFutureOr, this.fileOffset, noLength, this.fileUri);
         } else if (implemented.contains(interface)) {
           // Aggregate repetitions.
           problems ??= <ClassBuilder, int>{};
@@ -943,7 +943,7 @@ class SourceClassBuilder extends ClassBuilderImpl
       if (unaliasedDeclaration != superClass) {
         // TODO(eernst): Have all 'restricted supertype' checks in one place.
         if (unaliasedDeclaration is NeverTypeDeclarationBuilder) {
-          fail(type, messageImplementsNever, typeDeclaration);
+          fail(type, codeImplementsNever, typeDeclaration);
         }
       }
     }

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

@@ -563,7 +563,7 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
     if (isPart) {
       // Coverage-ignore-block(suite): Not run.
       // This is a part with no enclosing library.
-      addProblem(messagePartOrphan, 0, 1, fileUri);
+      addProblem(codePartOrphan, 0, 1, fileUri);
       _clearPartsAndReportExporters();
     }
     return libraryBuilder;
@@ -667,15 +667,15 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
     for (Part part in _compilationUnitData.parts) {
       // TODO(johnniwinther): Use [part.offset] in messages.
       if (part.compilationUnit == this) {
-        addProblem(messagePartOfSelf, -1, noLength, fileUri);
+        addProblem(codePartOfSelf, -1, noLength, fileUri);
       } else if (seenParts.add(part.compilationUnit.fileUri)) {
         if (part.compilationUnit.partOfLibrary != null) {
-          addProblem(messagePartOfTwoLibraries, -1, noLength,
+          addProblem(codePartOfTwoLibraries, -1, noLength,
               part.compilationUnit.fileUri,
               context: [
-                messagePartOfTwoLibrariesContext.withLocation(
+                codePartOfTwoLibrariesContext.withLocation(
                     part.compilationUnit.partOfLibrary!.fileUri, -1, noLength),
-                messagePartOfTwoLibrariesContext.withLocation(
+                codePartOfTwoLibrariesContext.withLocation(
                     fileUri, -1, noLength)
               ]);
         } else {
@@ -812,7 +812,7 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
       // parts, so that metadata annotations can be associated with it.
       List<LocatedMessage> context = <LocatedMessage>[];
       if (parentCompilationUnit.languageVersion.isExplicit) {
-        context.add(messageLanguageVersionLibraryContext.withLocation(
+        context.add(codeLanguageVersionLibraryContext.withLocation(
             parentCompilationUnit.languageVersion.fileUri!,
             parentCompilationUnit.languageVersion.charOffset,
             parentCompilationUnit.languageVersion.charCount));
@@ -824,23 +824,23 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
           // version, then point to this instead of the top of the file.
           partOffset = part.languageVersion.charOffset;
           partUri = part.languageVersion.fileUri!;
-          context.add(messageLanguageVersionPatchContext.withLocation(
-              part.languageVersion.fileUri!,
-              part.languageVersion.charOffset,
-              part.languageVersion.charCount));
-        }
-        parentCompilationUnit.addProblem(messageLanguageVersionMismatchInPatch,
-            partOffset, noLength, partUri,
-            context: context);
-      } else {
-        if (part.languageVersion.isExplicit) {
-          context.add(messageLanguageVersionPartContext.withLocation(
+          context.add(codeLanguageVersionPatchContext.withLocation(
               part.languageVersion.fileUri!,
               part.languageVersion.charOffset,
               part.languageVersion.charCount));
         }
         parentCompilationUnit.addProblem(
-            messageLanguageVersionMismatchInPart, partOffset, noLength, partUri,
+            codeLanguageVersionMismatchInPatch, partOffset, noLength, partUri,
+            context: context);
+      } else {
+        if (part.languageVersion.isExplicit) {
+          context.add(codeLanguageVersionPartContext.withLocation(
+              part.languageVersion.fileUri!,
+              part.languageVersion.charOffset,
+              part.languageVersion.charCount));
+        }
+        parentCompilationUnit.addProblem(
+            codeLanguageVersionMismatchInPart, partOffset, noLength, partUri,
             context: context);
       }
     }
@@ -885,11 +885,11 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
     if (exporters.isNotEmpty) {
       // Coverage-ignore-block(suite): Not run.
       List<LocatedMessage> context = <LocatedMessage>[
-        messagePartExportContext.withLocation(fileUri, -1, 1),
+        codePartExportContext.withLocation(fileUri, -1, 1),
       ];
       for (Export export in exporters) {
         export.exporter.addProblem(
-            messagePartExport, export.charOffset, "export".length, null,
+            codePartExport, export.charOffset, "export".length, null,
             context: context);
       }
     }
@@ -913,11 +913,11 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit {
     if (!allowPartInParts) {
       if (_compilationUnitData.parts.isNotEmpty) {
         List<LocatedMessage> context = <LocatedMessage>[
-          messagePartInPartLibraryContext.withLocation(
+          codePartInPartLibraryContext.withLocation(
               libraryBuilder.fileUri, -1, 1),
         ];
         for (Part part in _compilationUnitData.parts) {
-          addProblem(messagePartInPart, part.fileOffset, noLength, fileUri,
+          addProblem(codePartInPart, part.fileOffset, noLength, fileUri,
               context: context);
           // Mark this part as used so we don't report it as orphaned.
           usedParts.add(part.compilationUnit.importUri);

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

@@ -13,11 +13,11 @@ import '../base/messages.dart'
     show
         LocatedMessage,
         Message,
-        messageMoreThanOneSuperInitializer,
-        messageRedirectingConstructorWithAnotherInitializer,
-        messageRedirectingConstructorWithMultipleRedirectInitializers,
-        messageRedirectingConstructorWithSuperInitializer,
-        messageSuperInitializerNotLast,
+        codeMoreThanOneSuperInitializer,
+        codeRedirectingConstructorWithAnotherInitializer,
+        codeRedirectingConstructorWithMultipleRedirectInitializers,
+        codeRedirectingConstructorWithSuperInitializer,
+        codeSuperInitializerNotLast,
         noLength,
         codeCantInferTypeDueToCircularity;
 import '../base/name_space.dart';
@@ -287,11 +287,11 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
       required TreeNode parent}) {
     if (initializer is SuperInitializer) {
       if (superInitializer != null) {
-        _injectInvalidInitializer(messageMoreThanOneSuperInitializer,
+        _injectInvalidInitializer(codeMoreThanOneSuperInitializer,
             initializer.fileOffset, "super".length, helper, parent);
       } else if (redirectingInitializer != null) {
         _injectInvalidInitializer(
-            messageRedirectingConstructorWithSuperInitializer,
+            codeRedirectingConstructorWithSuperInitializer,
             initializer.fileOffset,
             "super".length,
             helper,
@@ -331,7 +331,7 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
       if (superInitializer != null) {
         // Point to the existing super initializer.
         _injectInvalidInitializer(
-            messageRedirectingConstructorWithSuperInitializer,
+            codeRedirectingConstructorWithSuperInitializer,
             superInitializer!.fileOffset,
             "super".length,
             helper,
@@ -339,7 +339,7 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
         markAsErroneous();
       } else if (redirectingInitializer != null) {
         _injectInvalidInitializer(
-            messageRedirectingConstructorWithMultipleRedirectInitializers,
+            codeRedirectingConstructorWithMultipleRedirectInitializers,
             initializer.fileOffset,
             noLength,
             helper,
@@ -353,7 +353,7 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
           if (initializer is AssertInitializer) length = "assert".length;
           Initializer error = helper.buildInvalidInitializer(
               helper.buildProblem(
-                  messageRedirectingConstructorWithAnotherInitializer,
+                  codeRedirectingConstructorWithAnotherInitializer,
                   initializer.fileOffset,
                   length));
           error.parent = parent;
@@ -398,14 +398,14 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
       int length = noLength;
       if (initializer is AssertInitializer) length = "assert".length;
       _injectInvalidInitializer(
-          messageRedirectingConstructorWithAnotherInitializer,
+          codeRedirectingConstructorWithAnotherInitializer,
           initializer.fileOffset,
           length,
           helper,
           parent);
       markAsErroneous();
     } else if (superInitializer != null) {
-      _injectInvalidInitializer(messageSuperInitializerNotLast,
+      _injectInvalidInitializer(codeSuperInitializerNotLast,
           initializer.fileOffset, noLength, helper, parent);
       markAsErroneous();
     } else {

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

@@ -147,7 +147,7 @@ class SourceEnumBuilder extends SourceClassBuilder {
     while (constructorIterator.moveNext()) {
       ConstructorBuilder constructorBuilder = constructorIterator.current;
       if (!constructorBuilder.isConst) {
-        libraryBuilder.addProblem(messageEnumNonConstConstructor,
+        libraryBuilder.addProblem(codeEnumNonConstConstructor,
             constructorBuilder.fileOffset, noLength, fileUri);
       }
     }
@@ -404,7 +404,7 @@ class SourceEnumBuilder extends SourceClassBuilder {
           // sources. (We should add a correct message. We no longer depend on
           // Object here.)
           libraryBuilder.addProblem(
-              messageNoUnnamedConstructorInObject,
+              codeNoUnnamedConstructorInObject,
               objectClass.fileOffset,
               objectClass.name.length,
               objectClass.fileUri);

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

@@ -236,7 +236,7 @@ class SourceExtensionTypeDeclarationBuilder
             errorMessage = codeSuperExtensionTypeIsIllegalAliased.withArguments(
                 typeBuilder.fullNameForErrors, interface);
             errorContext = [
-              messageTypedefCause.withLocation(
+              codeTypedefCause.withLocation(
                   aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
             ];
           } else {
@@ -279,7 +279,7 @@ class SourceExtensionTypeDeclarationBuilder
             List<LocatedMessage>? errorContext;
             if (aliasBuilder != null) {
               errorContext = [
-                messageTypedefCause.withLocation(
+                codeTypedefCause.withLocation(
                     aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
               ];
             }
@@ -301,7 +301,7 @@ class SourceExtensionTypeDeclarationBuilder
                   .withArguments(typeBuilder.fullNameForErrors, interface);
               if (aliasBuilder != null) {
                 errorContext = [
-                  messageTypedefCause.withLocation(
+                  codeTypedefCause.withLocation(
                       aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
                 ];
               }
@@ -319,7 +319,7 @@ class SourceExtensionTypeDeclarationBuilder
           if (aliasBuilder != null) {
             // Coverage-ignore-block(suite): Not run.
             errorContext = [
-              messageTypedefCause.withLocation(
+              codeTypedefCause.withLocation(
                   aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
             ];
           }
@@ -333,7 +333,7 @@ class SourceExtensionTypeDeclarationBuilder
             errorMessage = codeSuperExtensionTypeIsIllegalAliased.withArguments(
                 typeBuilder.fullNameForErrors, interface);
             errorContext = [
-              messageTypedefCause.withLocation(
+              codeTypedefCause.withLocation(
                   aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
             ];
           } else {
@@ -366,7 +366,7 @@ class SourceExtensionTypeDeclarationBuilder
                     initialVariance: Variance.covariant);
             if (representationType.accept(checker)) {
               libraryBuilder.addProblem(
-                  messageNonCovariantTypeParameterInRepresentationType,
+                  codeNonCovariantTypeParameterInRepresentationType,
                   typeBuilder.charOffset!,
                   noLength,
                   typeBuilder.fileUri);
@@ -374,7 +374,7 @@ class SourceExtensionTypeDeclarationBuilder
           }
           if (isBottom(representationType)) {
             libraryBuilder.addProblem(
-                messageExtensionTypeRepresentationTypeBottom,
+                codeExtensionTypeRepresentationTypeBottom,
                 _representationFieldFragment!.nameOffset,
                 _representationFieldFragment!.name.length,
                 _representationFieldFragment!.fileUri);
@@ -421,20 +421,20 @@ class SourceExtensionTypeDeclarationBuilder
             for (ExtensionTypeDeclarationBuilder extensionTypeDeclarationBuilder
                 in seenExtensionTypeDeclarations) {
               if (extensionTypeDeclarationBuilder != this) {
-                context.add(messageExtensionTypeDeclarationCause.withLocation(
+                context.add(codeExtensionTypeDeclarationCause.withLocation(
                     extensionTypeDeclarationBuilder.fileUri,
                     extensionTypeDeclarationBuilder.fileOffset,
                     extensionTypeDeclarationBuilder.name.length));
               }
             }
             for (TypeAliasBuilder typeAliasBuilder in usedTypeAliasBuilders) {
-              context.add(messageTypedefCause.withLocation(
+              context.add(codeTypedefCause.withLocation(
                   typeAliasBuilder.fileUri,
                   typeAliasBuilder.fileOffset,
                   typeAliasBuilder.name.length));
             }
             libraryBuilder.addProblem(
-                messageCyclicRepresentationDependency,
+                codeCyclicRepresentationDependency,
                 _representationFieldFragment!.type.charOffset!,
                 noLength,
                 _representationFieldFragment!.type.fileUri,

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

@@ -1235,7 +1235,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
           message = codeGenericFunctionTypeInferredAsActualTypeArgument
               .withArguments(argument);
         } else {
-          message = messageGenericFunctionTypeUsedAsActualTypeArgument;
+          message = codeGenericFunctionTypeUsedAsActualTypeArgument;
         }
         typeParameter = null;
       } else {
@@ -1312,7 +1312,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       // It looks like when parameters come from augmentation libraries, they
       // don't have a reportable location.
       (context ??= <LocatedMessage>[]).add(
-          messageIncorrectTypeArgumentVariable.withLocation(
+          codeIncorrectTypeArgumentVariable.withLocation(
               typeParameter.location!.file,
               typeParameter.fileOffset,
               noLength));
@@ -1338,7 +1338,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
       // It looks like when parameters come from augmentation libraries, they
       // don't have a reportable location.
       (context ??= <LocatedMessage>[]).add(
-          messageIncorrectTypeArgumentVariable.withLocation(
+          codeIncorrectTypeArgumentVariable.withLocation(
               typeParameter.location!.file,
               typeParameter.fileOffset,
               noLength));

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

@@ -519,7 +519,7 @@ class SourceLoader extends Loader {
             is package_config.InvalidLanguageVersion) {
           // Coverage-ignore-block(suite): Not run.
           packageLanguageVersionProblem =
-              messageLanguageVersionInvalidInDotPackages;
+              codeLanguageVersionInvalidInDotPackages;
           packageLanguageVersion = new InvalidLanguageVersion(
               fileUri, 0, noLength, target.currentSdkVersion, false);
         } else {
@@ -660,7 +660,7 @@ class SourceLoader extends Loader {
         accessor, charOffset, noLength, accessor.fileUri);
     if (!_hasLibraryAccess(imported: uri, importer: accessor.importUri) &&
         !accessor.isAugmenting) {
-      accessor.addProblem(messagePlatformPrivateLibraryAccess, charOffset,
+      accessor.addProblem(codePlatformPrivateLibraryAccess, charOffset,
           noLength, accessor.fileUri);
     }
     return libraryBuilder;
@@ -696,10 +696,10 @@ class SourceLoader extends Loader {
     if (!_hasLibraryAccess(imported: uri, importer: firstLibrary?.importUri)) {
       // Coverage-ignore-block(suite): Not run.
       if (firstLibrary != null) {
-        firstLibrary.addProblem(messagePlatformPrivateLibraryAccess, -1,
-            noLength, firstLibrary.importUri);
+        firstLibrary.addProblem(codePlatformPrivateLibraryAccess, -1, noLength,
+            firstLibrary.importUri);
       } else {
-        addProblem(messagePlatformPrivateLibraryAccess, -1, noLength, null);
+        addProblem(codePlatformPrivateLibraryAccess, -1, noLength, null);
       }
     }
     return libraryBuilder;
@@ -973,7 +973,7 @@ severity: $severity
             -1,
             compilationUnit.importUri);
       } else if (fileUri.isScheme(MALFORMED_URI_SCHEME)) {
-        compilationUnit.addProblemAtAccessors(messageExpectedUri);
+        compilationUnit.addProblemAtAccessors(codeExpectedUri);
         bytes = synthesizeSourceForMissingFile(compilationUnit.importUri, null);
       }
       if (bytes != null) {
@@ -1749,7 +1749,7 @@ severity: $severity
               noLength,
               classBuilder.fileUri,
               context: [
-                messageTypedefCause.withLocation(
+                codeTypedefCause.withLocation(
                     aliasBuilder.fileUri, aliasBuilder.fileOffset, noLength),
               ]);
         } else {
@@ -1782,7 +1782,7 @@ severity: $severity
                 classBuilder.fileUri,
                 context: declaration is TypeAliasBuilder
                     ? [
-                        messageTypedefUnaliasedTypeCause.withLocation(
+                        codeTypedefUnaliasedTypeCause.withLocation(
                             unaliasedDeclaration.fileUri,
                             unaliasedDeclaration.fileOffset,
                             noLength),
@@ -1812,7 +1812,7 @@ severity: $severity
               classBuilder.fileUri,
               context: declaration is TypeAliasBuilder
                   ? [
-                      messageTypedefCause.withLocation(declaration.fileUri,
+                      codeTypedefCause.withLocation(declaration.fileUri,
                           declaration.fileOffset, noLength),
                     ]
                   : null);
@@ -1827,7 +1827,7 @@ severity: $severity
                 classBuilder.fileUri,
                 context: declaration is TypeAliasBuilder
                     ? [
-                        messageTypedefCause.withLocation(declaration.fileUri,
+                        codeTypedefCause.withLocation(declaration.fileUri,
                             declaration.fileOffset, noLength),
                       ]
                     : null);
@@ -2376,7 +2376,7 @@ severity: $severity
                   classBuilder.name.length,
                   classBuilder.fileUri,
                   context: <LocatedMessage>[
-                    messageEnumInheritsRestrictedMember
+                    codeEnumInheritsRestrictedMember
                         .withLocation2(classMember.uriOffset)
                   ]);
             }
@@ -2609,15 +2609,15 @@ severity: $severity
       }
       if (mainBuilder.isProperty) {
         if (mainBuilder.libraryBuilder != libraryBuilder) {
-          libraryBuilder.addProblem(messageMainNotFunctionDeclarationExported,
+          libraryBuilder.addProblem(codeMainNotFunctionDeclarationExported,
               libraryBuilder.fileOffset, noLength, libraryBuilder.fileUri,
               context: [
-                messageExportedMain.withLocation(mainBuilder.fileUri!,
+                codeExportedMain.withLocation(mainBuilder.fileUri!,
                     mainBuilder.fileOffset, mainBuilder.name.length)
               ]);
         } else {
           libraryBuilder.addProblem(
-              messageMainNotFunctionDeclaration,
+              codeMainNotFunctionDeclaration,
               mainBuilder.fileOffset,
               mainBuilder.name.length,
               mainBuilder.fileUri);
@@ -2626,18 +2626,15 @@ severity: $severity
         Procedure procedure = mainBuilder.invokeTarget as Procedure;
         if (procedure.function.requiredParameterCount > 2) {
           if (mainBuilder.libraryBuilder != libraryBuilder) {
-            libraryBuilder.addProblem(
-                messageMainTooManyRequiredParametersExported,
-                libraryBuilder.fileOffset,
-                noLength,
-                libraryBuilder.fileUri,
+            libraryBuilder.addProblem(codeMainTooManyRequiredParametersExported,
+                libraryBuilder.fileOffset, noLength, libraryBuilder.fileUri,
                 context: [
-                  messageExportedMain.withLocation(mainBuilder.fileUri!,
+                  codeExportedMain.withLocation(mainBuilder.fileUri!,
                       mainBuilder.fileOffset, mainBuilder.name.length)
                 ]);
           } else {
             libraryBuilder.addProblem(
-                messageMainTooManyRequiredParameters,
+                codeMainTooManyRequiredParameters,
                 mainBuilder.fileOffset,
                 mainBuilder.name.length,
                 mainBuilder.fileUri);
@@ -2645,18 +2642,15 @@ severity: $severity
         } else if (procedure.function.namedParameters
             .any((parameter) => parameter.isRequired)) {
           if (mainBuilder.libraryBuilder != libraryBuilder) {
-            libraryBuilder.addProblem(
-                messageMainRequiredNamedParametersExported,
-                libraryBuilder.fileOffset,
-                noLength,
-                libraryBuilder.fileUri,
+            libraryBuilder.addProblem(codeMainRequiredNamedParametersExported,
+                libraryBuilder.fileOffset, noLength, libraryBuilder.fileUri,
                 context: [
-                  messageExportedMain.withLocation(mainBuilder.fileUri!,
+                  codeExportedMain.withLocation(mainBuilder.fileUri!,
                       mainBuilder.fileOffset, mainBuilder.name.length)
                 ]);
           } else {
             libraryBuilder.addProblem(
-                messageMainRequiredNamedParameters,
+                codeMainRequiredNamedParameters,
                 mainBuilder.fileOffset,
                 mainBuilder.name.length,
                 mainBuilder.fileUri);
@@ -2674,7 +2668,7 @@ severity: $severity
                   noLength,
                   libraryBuilder.fileUri,
                   context: [
-                    messageExportedMain.withLocation(mainBuilder.fileUri!,
+                    codeExportedMain.withLocation(mainBuilder.fileUri!,
                         mainBuilder.fileOffset, mainBuilder.name.length)
                   ]);
             } else {
@@ -2690,14 +2684,14 @@ severity: $severity
       }
     } else if (mainBuilder != null) {
       if (mainBuilder.parent != libraryBuilder) {
-        libraryBuilder.addProblem(messageMainNotFunctionDeclarationExported,
+        libraryBuilder.addProblem(codeMainNotFunctionDeclarationExported,
             libraryBuilder.fileOffset, noLength, libraryBuilder.fileUri,
             context: [
-              messageExportedMain.withLocation(
+              codeExportedMain.withLocation(
                   mainBuilder.fileUri!, mainBuilder.fileOffset, noLength)
             ]);
       } else {
-        libraryBuilder.addProblem(messageMainNotFunctionDeclaration,
+        libraryBuilder.addProblem(codeMainNotFunctionDeclaration,
             mainBuilder.fileOffset, noLength, mainBuilder.fileUri);
       }
     }
@@ -3127,7 +3121,7 @@ class _CheckSuperAccess extends RecursiveVisitor {
       _sourceLibraryBuilder.addProblem(template.withArguments(name.text),
           _typeBuilder.charOffset!, noLength, _typeBuilder.fileUri!,
           context: [
-            messageMixinApplicationNoConcreteMemberContext.withLocation(
+            codeMixinApplicationNoConcreteMemberContext.withLocation(
                 _enclosingMember.fileUri, accessFileOffset, noLength)
           ]);
     }

pkg/front_end/lib/src/type_inference/closure_context.dart

@@ -174,7 +174,7 @@ class _SyncClosureContext implements ClosureContext {
       } else {
         statement.expression = inferrer.helper.wrapInProblem(
             new NullLiteral()..fileOffset = statement.fileOffset,
-            messageReturnWithoutExpressionSync,
+            codeReturnWithoutExpressionSync,
             statement.fileOffset,
             noLength)
           ..parent = statement;
@@ -195,7 +195,7 @@ class _SyncClosureContext implements ClosureContext {
         // neither void, dynamic, nor Null.
         statement.expression = inferrer.helper.wrapInProblem(
             statement.expression!,
-            messageReturnFromVoidFunction,
+            codeReturnFromVoidFunction,
             statement.expression!.fileOffset,
             noLength)
           ..parent = statement;
@@ -424,7 +424,7 @@ class _AsyncClosureContext implements ClosureContext {
       } else {
         statement.expression = inferrer.helper.wrapInProblem(
             new NullLiteral()..fileOffset = statement.fileOffset,
-            messageReturnWithoutExpressionAsync,
+            codeReturnWithoutExpressionAsync,
             statement.fileOffset,
             noLength)
           ..parent = statement;

pkg/front_end/lib/src/type_inference/inference_visitor.dart

@@ -293,8 +293,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
     DartType inferredType = result.inferredType;
     if (inferredType is VoidType && !isVoidAllowed) {
       if (expression.parent is! ArgumentsImpl) {
-        helper.addProblem(
-            messageVoidExpression, expression.fileOffset, noLength);
+        helper.addProblem(codeVoidExpression, expression.fileOffset, noLength);
       }
     }
     if (coreTypes.isBottom(result.inferredType)) {
@@ -309,7 +308,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
         Expression replacement = createLet(
             createVariable(result.expression, result.inferredType),
             createReachabilityError(
-                expression.fileOffset, messageNeverValueError));
+                expression.fileOffset, codeNeverValueError));
         flowAnalysis.forwardExpression(replacement, result.expression);
         result =
             new ExpressionInferenceResult(result.inferredType, replacement);
@@ -835,10 +834,10 @@ class InferenceVisitorImpl extends InferenceVisitorBase
     node.condition = condition..parent = node;
     flowAnalysis.assert_afterCondition(node.condition);
     if (node.message != null) {
-      ExpressionInferenceResult messageResult = inferExpression(
+      ExpressionInferenceResult codeResult = inferExpression(
           node.message!, const UnknownType(),
           isVoidAllowed: true);
-      node.message = messageResult.expression..parent = node;
+      node.message = codeResult.expression..parent = node;
     }
     flowAnalysis.assert_end();
     return const StatementInferenceResult();
@@ -892,7 +891,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
     if (_isIncompatibleWithAwait(operandType)) {
       Expression wrapped = operandResult.expression;
       node.operand = helper.wrapInProblem(
-          wrapped, messageAwaitOfExtensionTypeNotFuture, wrapped.fileOffset, 1);
+          wrapped, codeAwaitOfExtensionTypeNotFuture, wrapped.fileOffset, 1);
       wrapped.parent = node.operand;
     } else {
       node.operand = operandResult.expression..parent = node;
@@ -2331,7 +2330,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
             !element.isNullAware) {
           Expression receiver = element.expression;
           replacement = helper.buildProblem(
-              messageNullableSpreadError, receiver.fileOffset, 1,
+              codeNullableSpreadError, receiver.fileOffset, 1,
               context: getWhyNotPromotedContext(
                   flowAnalysis.whyNotPromoted(receiver)(),
                   element,
@@ -2358,13 +2357,13 @@ class InferenceVisitorImpl extends InferenceVisitorBase
           spreadType is! NullType &&
           !element.isNullAware) {
         Expression receiver = element.expression;
-        replacement = helper.buildProblem(
-            messageNullableSpreadError, receiver.fileOffset, 1,
-            context: getWhyNotPromotedContext(
-                flowAnalysis.whyNotPromoted(receiver)(),
-                element,
-                // Coverage-ignore(suite): Not run.
-                (type) => !type.isPotentiallyNullable));
+        replacement =
+            helper.buildProblem(codeNullableSpreadError, receiver.fileOffset, 1,
+                context: getWhyNotPromotedContext(
+                    flowAnalysis.whyNotPromoted(receiver)(),
+                    element,
+                    // Coverage-ignore(suite): Not run.
+                    (type) => !type.isPotentiallyNullable));
         _copyNonPromotionReasonToReplacement(element, replacement);
       }
     }
@@ -4421,7 +4420,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
             !entry.isNullAware) {
           Expression receiver = entry.expression;
           Expression problem = helper.buildProblem(
-              messageNullableSpreadError, receiver.fileOffset, 1,
+              codeNullableSpreadError, receiver.fileOffset, 1,
               context: getWhyNotPromotedContext(
                   flowAnalysis.whyNotPromoted(receiver)(),
                   entry,
@@ -4472,13 +4471,13 @@ class InferenceVisitorImpl extends InferenceVisitorBase
           spreadType is! NullType &&
           !entry.isNullAware) {
         Expression receiver = entry.expression;
-        keyError = helper.buildProblem(
-            messageNullableSpreadError, receiver.fileOffset, 1,
-            context: getWhyNotPromotedContext(
-                flowAnalysis.whyNotPromoted(receiver)(),
-                entry,
-                // Coverage-ignore(suite): Not run.
-                (type) => !type.isPotentiallyNullable));
+        keyError =
+            helper.buildProblem(codeNullableSpreadError, receiver.fileOffset, 1,
+                context: getWhyNotPromotedContext(
+                    flowAnalysis.whyNotPromoted(receiver)(),
+                    entry,
+                    // Coverage-ignore(suite): Not run.
+                    (type) => !type.isPotentiallyNullable));
         _copyNonPromotionReasonToReplacement(entry, keyError);
       }
       if (keyError != null || valueError != null) {
@@ -5372,13 +5371,13 @@ class InferenceVisitorImpl extends InferenceVisitorBase
       }
       if (canBeSet && canBeMap && node.entries.isNotEmpty) {
         Expression replacement = helper.buildProblem(
-            messageCantDisambiguateNotEnoughInformation, node.fileOffset, 1);
+            codeCantDisambiguateNotEnoughInformation, node.fileOffset, 1);
         return new ExpressionInferenceResult(
             NeverType.fromNullability(Nullability.nonNullable), replacement);
       }
       if (!canBeSet && !canBeMap) {
         Expression replacement = helper.buildProblem(
-            messageCantDisambiguateAmbiguousInformation, node.fileOffset, 1);
+            codeCantDisambiguateAmbiguousInformation, node.fileOffset, 1);
         return new ExpressionInferenceResult(
             NeverType.fromNullability(Nullability.nonNullable), replacement);
       }
@@ -8979,7 +8978,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
           [],
           [],
           _createExpressionStatement(createReachabilityError(
-              node.fileOffset, messageNeverReachableSwitchDefaultError)),
+              node.fileOffset, codeNeverReachableSwitchDefaultError)),
           isDefault: true)
         ..fileOffset = node.fileOffset
         ..parent = node);
@@ -12053,7 +12052,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
         return new ExpressionInferenceResult(
             const DynamicType(),
             helper.buildProblem(
-                messageDotShorthandsConstructorInvocationWithTypeArguments,
+                codeDotShorthandsConstructorInvocationWithTypeArguments,
                 node.nameOffset,
                 node.name.text.length));
       }
@@ -12062,7 +12061,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
         if (!constructor.isConst && node.isConst) {
           return new ExpressionInferenceResult(
               const DynamicType(),
-              helper.buildProblem(messageNonConstConstructor, node.nameOffset,
+              helper.buildProblem(codeNonConstConstructor, node.nameOffset,
                   node.name.text.length));
         }
 
@@ -12101,7 +12100,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
           // Coverage-ignore-block(suite): Not run.
           return new ExpressionInferenceResult(
               const DynamicType(),
-              helper.buildProblem(messageNonConstConstructor, node.nameOffset,
+              helper.buildProblem(codeNonConstConstructor, node.nameOffset,
                   node.name.text.length));
         }
 
@@ -12210,7 +12209,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
             return new ExpressionInferenceResult(
                 const DynamicType(),
                 helper.buildProblem(
-                    messageDotShorthandsConstructorInvocationWithTypeArguments,
+                    codeDotShorthandsConstructorInvocationWithTypeArguments,
                     node.nameOffset,
                     node.name.text.length));
           }
@@ -12219,7 +12218,7 @@ class InferenceVisitorImpl extends InferenceVisitorBase
             if (typeDeclaration is Class && typeDeclaration.isAbstract) {
               return new ExpressionInferenceResult(
                   const DynamicType(),
-                  helper.buildProblem(messageAbstractClassConstructorTearOff,
+                  helper.buildProblem(codeAbstractClassConstructorTearOff,
                       node.nameOffset, node.name.text.length));
             }
 

pkg/front_end/lib/src/type_inference/inference_visitor_base.dart

@@ -550,7 +550,7 @@ abstract class InferenceVisitorBase implements InferenceVisitor {
         // Error: not assignable.  Perform error recovery.
         result = helper.wrapInProblem(
           expression,
-          messageVoidExpression,
+          codeVoidExpression,
           expression.fileOffset,
           noLength,
         );
@@ -3917,7 +3917,7 @@ abstract class InferenceVisitorBase implements InferenceVisitor {
       case ObjectAccessTargetKind.nullableRecordNamed:
         if (isImplicitCall && !target.isNullable) {
           libraryBuilder.addProblem(
-            messageRecordUsedAsCallable,
+            codeRecordUsedAsCallable,
             receiver.fileOffset,
             noLength,
             libraryBuilder.fileUri,
@@ -4694,7 +4694,7 @@ abstract class InferenceVisitorBase implements InferenceVisitor {
       context = extensionAccessCandidates
           .map(
             (ExtensionAccessCandidate c) =>
-                messageAmbiguousExtensionCause.withLocation(
+                codeAmbiguousExtensionCause.withLocation(
               c.memberBuilder.fileUri!,
               c.memberBuilder.fileOffset,
               name == unaryMinusName ? 1 : c.memberBuilder.name.length,

pkg/front_end/lib/src/type_inference/shared_type_analyzer.dart

@@ -50,7 +50,7 @@ class SharedTypeAnalyzerErrors
         caseExpression.fileOffset,
         noLength,
         context: [
-          messageSwitchExpressionNotAssignableCause.withLocation(
+          codeSwitchExpressionNotAssignableCause.withLocation(
               uri, scrutinee.fileOffset, noLength)
         ]);
   }
@@ -66,7 +66,7 @@ class SharedTypeAnalyzerErrors
         duplicate.fileOffset,
         noLength,
         context: [
-          messageDuplicatePatternAssignmentVariableContext.withLocation(
+          codeDuplicatePatternAssignmentVariableContext.withLocation(
               uri, original.fileOffset, noLength)
         ]);
   }
@@ -83,7 +83,7 @@ class SharedTypeAnalyzerErrors
         duplicate.pattern.fileOffset,
         noLength,
         context: [
-          messageDuplicateRecordPatternFieldContext.withLocation(
+          codeDuplicateRecordPatternFieldContext.withLocation(
               uri, original.pattern.fileOffset, noLength)
         ]);
   }
@@ -95,9 +95,9 @@ class SharedTypeAnalyzerErrors
     required TreeNode duplicate,
   }) {
     return helper.buildProblem(
-        messageDuplicateRestElementInPattern, duplicate.fileOffset, noLength,
+        codeDuplicateRestElementInPattern, duplicate.fileOffset, noLength,
         context: [
-          messageDuplicateRestElementInPatternContext.withLocation(
+          codeDuplicateRestElementInPatternContext.withLocation(
               uri, original.fileOffset, noLength)
         ]);
   }
@@ -107,7 +107,7 @@ class SharedTypeAnalyzerErrors
     required Pattern pattern,
   }) {
     return helper.buildProblem(
-        messageEmptyMapPattern, pattern.fileOffset, noLength);
+        codeEmptyMapPattern, pattern.fileOffset, noLength);
   }
 
   @override
@@ -142,8 +142,7 @@ class SharedTypeAnalyzerErrors
 
   @override
   InvalidExpression nonBooleanCondition({required Expression node}) {
-    return helper.buildProblem(
-        messageNonBoolCondition, node.fileOffset, noLength);
+    return helper.buildProblem(codeNonBoolCondition, node.fileOffset, noLength);
   }
 
   @override
@@ -176,8 +175,8 @@ class SharedTypeAnalyzerErrors
   @override
   InvalidExpression refutablePatternInIrrefutableContext(
       {required covariant Pattern pattern, required TreeNode context}) {
-    return helper.buildProblem(messageRefutablePatternInIrrefutableContext,
-        pattern.fileOffset, noLength);
+    return helper.buildProblem(
+        codeRefutablePatternInIrrefutableContext, pattern.fileOffset, noLength);
   }
 
   @override
@@ -211,14 +210,14 @@ class SharedTypeAnalyzerErrors
     required TreeNode element,
   }) {
     return helper.buildProblem(
-        messageRestPatternInMapPattern, element.fileOffset, noLength);
+        codeRestPatternInMapPattern, element.fileOffset, noLength);
   }
 
   @override
   InvalidExpression switchCaseCompletesNormally(
       {required covariant SwitchStatement node, required int caseIndex}) {
-    return helper.buildProblem(messageSwitchCaseFallThrough,
-        node.cases[caseIndex].fileOffset, noLength);
+    return helper.buildProblem(
+        codeSwitchCaseFallThrough, node.cases[caseIndex].fileOffset, noLength);
   }
 
   @override

pkg/front_end/test/kernel_generator_test.dart

@@ -5,7 +5,7 @@
 import 'package:front_end/src/api_prototype/front_end.dart'
     show CompilerOptions, CfeDiagnosticMessage;
 import 'package:front_end/src/codes/cfe_codes.dart'
-    show FormattedMessage, messageMissingMain;
+    show FormattedMessage, codeMissingMain;
 import 'package:front_end/src/kernel/utils.dart' show serializeComponent;
 import 'package:front_end/src/testing/compiler_common.dart'
     show
@@ -82,7 +82,7 @@ void main() {
       var options = new CompilerOptions()..onDiagnostic = errors.add;
       await compileScript('a() => print("hi");', options: options);
       expect((errors.first as FormattedMessage).problemMessage,
-          messageMissingMain.problemMessage);
+          codeMissingMain.problemMessage);
     });
 
     test('generated program contains source-info', () async {

pkg/front_end/test/src/base/processed_options_test.dart

@@ -424,7 +424,7 @@ class ProcessedOptionsTest {
     var options = new ProcessedOptions(options: raw);
     var result = await options.validateOptions();
     expect((errors.single as FormattedMessage).problemMessage,
-        messageMissingInput.problemMessage);
+        codeMissingInput.problemMessage);
     expect(result, isFalse);
   }
 
@@ -564,9 +564,9 @@ class ProcessedOptionsTest {
   /// Returns the longest prefix of the text in a message template that doesn't
   /// mention a template argument.
   String _stringPrefixOf(Template template) {
-    var messageTemplate = template.problemMessageTemplate;
-    var index = messageTemplate.indexOf('#');
-    var prefix = messageTemplate.substring(0, index - 1);
+    var codeTemplate = template.problemMessageTemplate;
+    var index = codeTemplate.indexOf('#');
+    var prefix = codeTemplate.substring(0, index - 1);
 
     // Check that the prefix is not empty and that it contains more than one
     // word.

pkg/front_end/test/tool_git_test.dart

@@ -7,7 +7,7 @@
 import "dart:io";
 
 import "package:expect/expect.dart";
-import "package:front_end/src/codes/cfe_codes.dart" show messageFastaUsageShort;
+import "package:front_end/src/codes/cfe_codes.dart" show codeFastaUsageShort;
 
 const String toolPath = "pkg/front_end/tool/cfe";
 
@@ -50,7 +50,7 @@ void main() {
   }
   Set<String> testedSubtools = new Set<String>.from(subtools)
       .difference(new Set<String>.from(unsafeTools));
-  String usage = messageFastaUsageShort.problemMessage;
+  String usage = codeFastaUsageShort.problemMessage;
   Map expectations = {
     "abcompile": {
       "exitCode": 1,

pkg/front_end/tool/additional_targets_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:front_end/src/base/command_line_options.dart';
 import 'package:front_end/src/codes/cfe_codes.dart'
-    show MessageCode, messageFastaUsageLong;
+    show MessageCode, codeFastaUsageLong;
 import 'package:kernel/target/targets.dart' show targets;
 
 import 'additional_targets.dart' show installAdditionalTargets;
@@ -13,7 +13,7 @@ void main() {
   installAdditionalTargets();
   String expected =
       "  ${Flags.target}=${(targets.keys.toList()..sort()).join('|')}";
-  MessageCode code = messageFastaUsageLong;
+  MessageCode code = codeFastaUsageLong;
   if (!code.problemMessage.contains(expected)) {
     throw "Error: ${code.name} in pkg/front_end/messages.yaml doesn't contain"
         " '$expected'.";

pkg/front_end/tool/command_line.dart

@@ -28,8 +28,8 @@ import 'package:front_end/src/codes/cfe_codes.dart'
     show
         Message,
         PlainAndColorizedString,
-        messageFastaUsageLong,
-        messageFastaUsageShort,
+        codeFastaUsageLong,
+        codeFastaUsageShort,
         codeUnspecified;
 import 'package:front_end/src/compute_platform_binaries_location.dart'
     show computePlatformBinariesLocation, computePlatformDillName;
@@ -329,8 +329,8 @@ Message computeUsage(String programName, bool verbose) {
   String basicUsage = "Usage: $programName [options] dartfile\n";
   String? summary;
   String options = (verbose
-          ? messageFastaUsageLong.problemMessage
-          : messageFastaUsageShort.problemMessage)
+          ? codeFastaUsageLong.problemMessage
+          : codeFastaUsageShort.problemMessage)
       .trim();
   switch (programName) {
     case "outline":

pkg/vm/lib/modular/transformations/deeply_immutable.dart

@@ -6,11 +6,11 @@
 // avoid cyclic dependency between `package:vm/modular` and `package:front_end`.
 import 'package:front_end/src/codes/cfe_codes.dart'
     show
-        messageFfiDeeplyImmutableClassesMustBeFinalOrSealed,
-        messageFfiDeeplyImmutableFieldsModifiers,
-        messageFfiDeeplyImmutableFieldsMustBeDeeplyImmutable,
-        messageFfiDeeplyImmutableSubtypesMustBeDeeplyImmutable,
-        messageFfiDeeplyImmutableSupertypeMustBeDeeplyImmutable;
+        codeFfiDeeplyImmutableClassesMustBeFinalOrSealed,
+        codeFfiDeeplyImmutableFieldsModifiers,
+        codeFfiDeeplyImmutableFieldsMustBeDeeplyImmutable,
+        codeFfiDeeplyImmutableSubtypesMustBeDeeplyImmutable,
+        codeFfiDeeplyImmutableSupertypeMustBeDeeplyImmutable;
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
 import 'package:kernel/library_index.dart' show LibraryIndex;
@@ -92,7 +92,7 @@ class DeeplyImmutableValidator {
       for (final superClass in classes) {
         if (_isDeeplyImmutableClass(superClass)) {
           diagnosticReporter.report(
-            messageFfiDeeplyImmutableSubtypesMustBeDeeplyImmutable,
+            codeFfiDeeplyImmutableSubtypesMustBeDeeplyImmutable,
             node.fileOffset,
             node.name.length,
             node.location!.file,
@@ -110,7 +110,7 @@ class DeeplyImmutableValidator {
         !_isOrExtendsNativeFieldWrapper1Class(superClass)) {
       if (!_isDeeplyImmutableClass(superClass)) {
         diagnosticReporter.report(
-          messageFfiDeeplyImmutableSupertypeMustBeDeeplyImmutable,
+          codeFfiDeeplyImmutableSupertypeMustBeDeeplyImmutable,
           node.fileOffset,
           node.name.length,
           node.location!.file,
@@ -131,7 +131,7 @@ class DeeplyImmutableValidator {
         superClass != unionClass) {
       if (!(node.isFinal || node.isSealed)) {
         diagnosticReporter.report(
-          messageFfiDeeplyImmutableClassesMustBeFinalOrSealed,
+          codeFfiDeeplyImmutableClassesMustBeFinalOrSealed,
           node.fileOffset,
           node.name.length,
           node.location!.file,
@@ -147,7 +147,7 @@ class DeeplyImmutableValidator {
       }
       if (!_isDeeplyImmutableDartType(field.type)) {
         diagnosticReporter.report(
-          messageFfiDeeplyImmutableFieldsMustBeDeeplyImmutable,
+          codeFfiDeeplyImmutableFieldsMustBeDeeplyImmutable,
           field.fileOffset,
           field.name.text.length,
           field.location!.file,
@@ -155,7 +155,7 @@ class DeeplyImmutableValidator {
       }
       if (!field.isFinal || field.isLate) {
         diagnosticReporter.report(
-          messageFfiDeeplyImmutableFieldsModifiers,
+          codeFfiDeeplyImmutableFieldsModifiers,
           field.fileOffset,
           field.name.text.length,
           field.location!.file,

pkg/vm/lib/modular/transformations/ffi/common.dart

@@ -11,11 +11,11 @@ library vm.transformations.ffi;
 // avoid cyclic dependency between `package:vm/modular` and `package:front_end`.
 import 'package:front_end/src/codes/cfe_codes.dart'
     show
-        messageFfiLeafCallMustNotReturnHandle,
-        messageFfiLeafCallMustNotTakeHandle,
-        messageFfiVariableLengthArrayNotLast,
-        messageNegativeVariableDimension,
-        messageNonPositiveArrayDimensions,
+        codeFfiLeafCallMustNotReturnHandle,
+        codeFfiLeafCallMustNotTakeHandle,
+        codeFfiVariableLengthArrayNotLast,
+        codeNegativeVariableDimension,
+        codeNonPositiveArrayDimensions,
         codeFfiSizeAnnotation,
         codeFfiSizeAnnotationDimensions,
         codeFfiTypeInvalid,
@@ -1486,7 +1486,7 @@ class FfiTransformer extends Transformer {
         if (variableLength) {
           if (!allowVariableLength) {
             diagnosticReporter.report(
-              messageFfiVariableLengthArrayNotLast,
+              codeFfiVariableLengthArrayNotLast,
               node.fileOffset,
               node.name.text.length,
               node.fileUri,
@@ -1499,7 +1499,7 @@ class FfiTransformer extends Transformer {
             // Variable dimension can't be negative.
             if (dimensions[0] < 0) {
               diagnosticReporter.report(
-                messageNegativeVariableDimension,
+                codeNegativeVariableDimension,
                 node.fileOffset,
                 node.name.text.length,
                 node.fileUri,
@@ -1510,7 +1510,7 @@ class FfiTransformer extends Transformer {
 
           if (dimensions[i] <= 0) {
             diagnosticReporter.report(
-              messageNonPositiveArrayDimensions,
+              codeNonPositiveArrayDimensions,
               node.fileOffset,
               node.name.text.length,
               node.fileUri,
@@ -1866,7 +1866,7 @@ class FfiTransformer extends Transformer {
       if (returnType is InterfaceType) {
         if (returnType.classNode == handleClass) {
           diagnosticReporter.report(
-            messageFfiLeafCallMustNotReturnHandle,
+            codeFfiLeafCallMustNotReturnHandle,
             reportErrorOn.fileOffset,
             1,
             reportErrorOn.location?.file,
@@ -1878,7 +1878,7 @@ class FfiTransformer extends Transformer {
       for (DartType param in functionType.positionalParameters) {
         if ((param as InterfaceType).classNode == handleClass) {
           diagnosticReporter.report(
-            messageFfiLeafCallMustNotTakeHandle,
+            codeFfiLeafCallMustNotTakeHandle,
             reportErrorOn.fileOffset,
             1,
             reportErrorOn.location?.file,

pkg/vm/lib/modular/transformations/ffi/definitions.dart

@@ -6,9 +6,9 @@
 // avoid cyclic dependency between `package:vm/modular` and `package:front_end`.
 import 'package:front_end/src/codes/cfe_codes.dart'
     show
-        messageFfiAbiSpecificIntegerInvalid,
-        messageFfiAbiSpecificIntegerMappingInvalid,
-        messageFfiPackedAnnotationAlignment,
+        codeFfiAbiSpecificIntegerInvalid,
+        codeFfiAbiSpecificIntegerMappingInvalid,
+        codeFfiPackedAnnotationAlignment,
         codeFfiCompoundImplementsFinalizable,
         codeFfiEmptyStruct,
         codeFfiFieldAnnotation,
@@ -290,7 +290,7 @@ class _FfiDefinitionTransformer extends FfiTransformer {
       if (nativeTypeCfe.abiSpecificTypes.isEmpty) {
         // Annotation missing, multiple annotations, or invalid mapping.
         diagnosticReporter.report(
-          messageFfiAbiSpecificIntegerMappingInvalid,
+          codeFfiAbiSpecificIntegerMappingInvalid,
           node.fileOffset,
           node.name.length,
           node.location!.file,
@@ -303,7 +303,7 @@ class _FfiDefinitionTransformer extends FfiTransformer {
           !node.constructors.single.isConst) {
         // We want exactly one constructor, no other members and no type arguments.
         diagnosticReporter.report(
-          messageFfiAbiSpecificIntegerInvalid,
+          codeFfiAbiSpecificIntegerInvalid,
           node.fileOffset,
           node.name.length,
           node.location!.file,
@@ -411,7 +411,7 @@ class _FfiDefinitionTransformer extends FfiTransformer {
             packing == 8 ||
             packing == 16)) {
           diagnosticReporter.report(
-            messageFfiPackedAnnotationAlignment,
+            codeFfiPackedAnnotationAlignment,
             node.fileOffset,
             node.name.length,
             node.location!.file,

pkg/vm/lib/modular/transformations/ffi/native.dart

@@ -6,14 +6,14 @@
 // avoid cyclic dependency between `package:vm/modular` and `package:front_end`.
 import 'package:front_end/src/codes/cfe_codes.dart'
     show
-        messageFfiDefaultAssetDuplicate,
-        messageFfiNativeDuplicateAnnotations,
-        messageFfiNativeFieldMissingType,
-        messageFfiNativeFieldMustBeStatic,
-        messageFfiNativeFieldType,
-        messageFfiNativeFunctionMissingType,
-        messageFfiNativeMustBeExternal,
-        messageFfiNativeOnlyNativeFieldWrapperClassCanBePointer,
+        codeFfiDefaultAssetDuplicate,
+        codeFfiNativeDuplicateAnnotations,
+        codeFfiNativeFieldMissingType,
+        codeFfiNativeFieldMustBeStatic,
+        codeFfiNativeFieldType,
+        codeFfiNativeFunctionMissingType,
+        codeFfiNativeMustBeExternal,
+        codeFfiNativeOnlyNativeFieldWrapperClassCanBePointer,
         codeCantHaveNamedParameters,
         codeCantHaveOptionalParameters,
         codeFfiNativeUnexpectedNumberOfParameters,
@@ -143,7 +143,7 @@ class FfiNativeTransformer extends FfiTransformer {
       if (assetAnnotation != null) {
         // Duplicate @DefaultAsset annotations are forbidden.
         diagnosticReporter.report(
-          messageFfiDefaultAssetDuplicate,
+          codeFfiDefaultAssetDuplicate,
           annotation.fileOffset,
           1,
           annotation.location?.file,
@@ -164,7 +164,7 @@ class FfiNativeTransformer extends FfiTransformer {
       if (nativeAnnotation != null) {
         // Duplicate @Native annotations are forbidden.
         diagnosticReporter.report(
-          messageFfiNativeDuplicateAnnotations,
+          codeFfiNativeDuplicateAnnotations,
           node.fileOffset,
           1,
           node.location?.file,
@@ -458,7 +458,7 @@ class FfiNativeTransformer extends FfiTransformer {
     if (_requiresPointerConversion(dartParameterType, ffiParameterType) &&
         !_extendsNativeFieldWrapperClass1(dartParameterType)) {
       diagnosticReporter.report(
-        messageFfiNativeOnlyNativeFieldWrapperClassCanBePointer,
+        codeFfiNativeOnlyNativeFieldWrapperClassCanBePointer,
         annotationOffset,
         1,
         file,
@@ -835,7 +835,7 @@ class FfiNativeTransformer extends FfiTransformer {
         ffiType = inferred;
       } else {
         diagnosticReporter.report(
-          messageFfiNativeFieldMissingType,
+          codeFfiNativeFieldMissingType,
           node.fileOffset,
           1,
           node.location?.file,
@@ -889,7 +889,7 @@ class FfiNativeTransformer extends FfiTransformer {
           type == NativeType.kHandle ||
           isArrayType(ffiType)) {
         diagnosticReporter.report(
-          messageFfiNativeFieldType,
+          codeFfiNativeFieldType,
           node.fileOffset,
           1,
           node.location?.file,
@@ -926,7 +926,7 @@ class FfiNativeTransformer extends FfiTransformer {
         allowStructAndUnion: true,
       )) {
         diagnosticReporter.report(
-          messageFfiNativeFunctionMissingType,
+          codeFfiNativeFunctionMissingType,
           node.fileOffset,
           1,
           node.location?.file,
@@ -949,7 +949,7 @@ class FfiNativeTransformer extends FfiTransformer {
     // only visit fields to verify that no native annotation is present.
     assert(!node.isExternal);
     diagnosticReporter.report(
-      messageFfiNativeMustBeExternal,
+      codeFfiNativeMustBeExternal,
       node.fileOffset,
       1,
       node.location?.file,
@@ -969,7 +969,7 @@ class FfiNativeTransformer extends FfiTransformer {
 
     if (!node.isExternal) {
       diagnosticReporter.report(
-        messageFfiNativeMustBeExternal,
+        codeFfiNativeMustBeExternal,
         node.fileOffset,
         1,
         node.location?.file,
@@ -1043,7 +1043,7 @@ class FfiNativeTransformer extends FfiTransformer {
         node.kind == ProcedureKind.Setter) {
       if (!node.isStatic) {
         diagnosticReporter.report(
-          messageFfiNativeFieldMustBeStatic,
+          codeFfiNativeFieldMustBeStatic,
           node.fileOffset,
           1,
           node.location?.file,

pkg/vm/lib/modular/transformations/ffi/use_sites.dart

@@ -6,12 +6,12 @@
 // avoid cyclic dependency between `package:vm/modular` and `package:front_end`.
 import 'package:front_end/src/codes/cfe_codes.dart'
     show
-        messageFfiAddressOfMustBeNative,
-        messageFfiAddressPosition,
-        messageFfiAddressReceiver,
-        messageFfiCreateOfStructOrUnion,
-        messageFfiExceptionalReturnNull,
-        messageFfiExpectedConstant,
+        codeFfiAddressOfMustBeNative,
+        codeFfiAddressPosition,
+        codeFfiAddressReceiver,
+        codeFfiCreateOfStructOrUnion,
+        codeFfiExceptionalReturnNull,
+        codeFfiExpectedConstant,
         codeFfiDartTypeMismatch,
         codeFfiNativeCallableListenerReturnVoid,
         codeFfiExpectedConstantArg,
@@ -158,7 +158,7 @@ mixin _FfiUseSiteTransformer on FfiTransformer {
         target.name != Name("#fromTypedDataBase") &&
         target.name != Name("#fromTypedData")) {
       diagnosticReporter.report(
-        messageFfiCreateOfStructOrUnion,
+        codeFfiCreateOfStructOrUnion,
         node.fileOffset,
         1,
         node.location?.file,
@@ -664,7 +664,7 @@ mixin _FfiUseSiteTransformer on FfiTransformer {
         // remaining invocations occur are places where `<expr>.address` is
         // disallowed, so issue an error.
         diagnosticReporter.report(
-          messageFfiAddressPosition,
+          codeFfiAddressPosition,
           node.fileOffset,
           1,
           node.location?.file,
@@ -1214,7 +1214,7 @@ mixin _FfiUseSiteTransformer on FfiTransformer {
           !(exceptionalReturn is ConstantExpression &&
               exceptionalReturn.constant is PrimitiveConstant)) {
         diagnosticReporter.report(
-          messageFfiExpectedConstant,
+          codeFfiExpectedConstant,
           node.fileOffset,
           1,
           node.location?.file,
@@ -1227,7 +1227,7 @@ mixin _FfiUseSiteTransformer on FfiTransformer {
           (exceptionalReturn is ConstantExpression &&
               exceptionalReturn.constant is NullConstant)) {
         diagnosticReporter.report(
-          messageFfiExceptionalReturnNull,
+          codeFfiExceptionalReturnNull,
           node.fileOffset,
           1,
           node.location?.file,
@@ -1896,7 +1896,7 @@ mixin _FfiUseSiteTransformer on FfiTransformer {
 
     if (nativeAnnotation == null) {
       diagnosticReporter.report(
-        messageFfiAddressOfMustBeNative,
+        codeFfiAddressOfMustBeNative,
         arg.fileOffset,
         1,
         node.location?.file,
@@ -2212,7 +2212,7 @@ mixin _FfiUseSiteTransformer on FfiTransformer {
     }
 
     diagnosticReporter.report(
-      messageFfiAddressReceiver,
+      codeFfiAddressReceiver,
       argument.fileOffset,
       1,
       argument.location?.file,