[messages] Fix sorting of `diagnosticCodeValues` list.

Previously, this list was sorted by the full analyzer code
(`ClassName.diagnosticName`). That made sense when the constants in
the list were referenced by `ClassName.diagnosticName`. Now that the
constants are referenced by `diag.diagnosticName`, it makes sense for
the sorting to fit.

The order of entries in this list has no user-visible effect, so from
the user's point of view there is no functional change.

Change-Id: I6a6a696468fa533d6d9d7b9f12914c070c0713af
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/461585
Commit-Queue: Paul Berry <paulberry@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/diagnostic/diagnostic_code_values.g.dart b/pkg/analyzer/lib/src/diagnostic/diagnostic_code_values.g.dart
index fd8b7b0..b6b0992 100644
--- a/pkg/analyzer/lib/src/diagnostic/diagnostic_code_values.g.dart
+++ b/pkg/analyzer/lib/src/diagnostic/diagnostic_code_values.g.dart
@@ -14,42 +14,49 @@
 
 @AnalyzerPublicApi(message: 'exported by lib/error/error.dart')
 const List<DiagnosticCode> diagnosticCodeValues = [
-  diag.includedFileParseError,
-  diag.parseError,
-  diag.analysisOptionDeprecated,
-  diag.analysisOptionDeprecatedWithReplacement,
-  diag.deprecatedLint,
-  diag.deprecatedLintWithReplacement,
-  diag.duplicateRule,
-  diag.includedFileWarning,
-  diag.includeFileNotFound,
-  diag.incompatibleLint,
-  diag.incompatibleLintFiles,
-  diag.incompatibleLintIncluded,
-  diag.invalidOption,
-  diag.invalidSectionFormat,
-  diag.multiplePlugins,
-  diag.pluginsInInnerOptions,
-  diag.recursiveIncludeFile,
-  diag.removedLint,
-  diag.replacedLint,
-  diag.undefinedLint,
-  diag.unrecognizedErrorCode,
-  diag.unsupportedOptionWithoutValues,
-  diag.unsupportedOptionWithLegalValue,
-  diag.unsupportedOptionWithLegalValues,
-  diag.unsupportedValue,
+  diag.abiSpecificIntegerInvalid,
+  diag.abiSpecificIntegerMappingExtra,
+  diag.abiSpecificIntegerMappingMissing,
+  diag.abiSpecificIntegerMappingUnsupported,
+  diag.abstractClassMember,
+  diag.abstractExternalField,
   diag.abstractFieldConstructorInitializer,
   diag.abstractFieldInitializer,
+  diag.abstractFinalBaseClass,
+  diag.abstractFinalInterfaceClass,
+  diag.abstractLateField,
+  diag.abstractSealedClass,
+  diag.abstractStaticField,
+  diag.abstractStaticMethod,
   diag.abstractSuperMemberReference,
+  diag.addressPosition,
+  diag.addressReceiver,
   diag.ambiguousExport,
   diag.ambiguousExtensionMemberAccessThreeOrMore,
   diag.ambiguousExtensionMemberAccessTwo,
   diag.ambiguousImport,
   diag.ambiguousSetOrMapLiteralBoth,
   diag.ambiguousSetOrMapLiteralEither,
+  diag.analysisOptionDeprecated,
+  diag.analysisOptionDeprecatedWithReplacement,
+  diag.annotationOnPointerField,
+  diag.annotationOnTypeArgument,
+  diag.annotationSpaceBeforeParenthesis,
+  diag.annotationWithTypeArguments,
+  diag.annotationWithTypeArgumentsUninstantiated,
+  diag.argumentMustBeAConstant,
+  diag.argumentMustBeNative,
   diag.argumentTypeNotAssignable,
+  diag.argumentTypeNotAssignableToErrorHandler,
   diag.assertInRedirectingConstructor,
+  diag.assetDirectoryDoesNotExist,
+  diag.assetDoesNotExist,
+  diag.assetFieldNotList,
+  diag.assetMissingPath,
+  diag.assetNotString,
+  diag.assetNotStringOrMap,
+  diag.assetPathNotString,
+  diag.assignmentOfDoNotStore,
   diag.assignmentToConst,
   diag.assignmentToFinal,
   diag.assignmentToFinalLocal,
@@ -58,6 +65,7 @@
   diag.assignmentToMethod,
   diag.assignmentToType,
   diag.asyncForInWrongContext,
+  diag.asyncKeywordUsedAsIdentifier,
   diag.augmentationExtendsClauseAlreadyPresent,
   diag.augmentationModifierExtra,
   diag.augmentationModifierMissing,
@@ -73,23 +81,36 @@
   diag.awaitInWrongContext,
   diag.awaitOfIncompatibleType,
   diag.baseClassImplementedOutsideOfLibrary,
+  diag.baseEnum,
   diag.baseMixinImplementedOutsideOfLibrary,
+  diag.binaryOperatorWrittenOut,
   diag.bodyMightCompleteNormally,
+  diag.bodyMightCompleteNormallyCatchError,
+  diag.bodyMightCompleteNormallyNullable,
   diag.breakLabelOnSwitchMember,
+  diag.breakOutsideOfLoop,
   diag.builtInIdentifierAsExtensionName,
   diag.builtInIdentifierAsExtensionTypeName,
   diag.builtInIdentifierAsPrefixName,
   diag.builtInIdentifierAsType,
-  diag.builtInIdentifierAsTypedefName,
   diag.builtInIdentifierAsTypeName,
   diag.builtInIdentifierAsTypeParameterName,
+  diag.builtInIdentifierAsTypedefName,
+  diag.cameraPermissionsIncompatible,
   diag.caseExpressionTypeImplementsEquals,
   diag.caseExpressionTypeIsNotSwitchExpressionSubtype,
+  diag.castFromNullAlwaysFails,
+  diag.castFromNullableAlwaysFails,
   diag.castToNonType,
+  diag.catchSyntax,
+  diag.catchSyntaxExtraParameters,
+  diag.classInClass,
   diag.classInstantiationAccessToInstanceMember,
   diag.classInstantiationAccessToStaticMember,
   diag.classInstantiationAccessToUnknownMember,
   diag.classUsedAsMixin,
+  diag.colonInPlaceOfIn,
+  diag.compoundImplementsFinalizable,
   diag.concreteClassHasEnumSuperinterface,
   diag.concreteClassWithAbstractMember,
   diag.conflictingConstructorAndStaticField,
@@ -100,6 +121,7 @@
   diag.conflictingGenericInterfaces,
   diag.conflictingInheritedMethodAndSetter,
   diag.conflictingMethodAndField,
+  diag.conflictingModifiers,
   diag.conflictingStaticAndInstance,
   diag.conflictingTypeVariableAndClass,
   diag.conflictingTypeVariableAndEnum,
@@ -111,11 +133,13 @@
   diag.conflictingTypeVariableAndMemberExtensionType,
   diag.conflictingTypeVariableAndMemberMixin,
   diag.conflictingTypeVariableAndMixin,
-  diag.constantPatternWithNonConstantExpression,
+  diag.constAndFinal,
+  diag.constClass,
   diag.constConstructorConstantFromDeferredLibrary,
   diag.constConstructorFieldTypeMismatch,
   diag.constConstructorParamTypeMismatch,
   diag.constConstructorThrowsException,
+  diag.constConstructorWithBody,
   diag.constConstructorWithFieldInitializedByNonConst,
   diag.constConstructorWithMixinWithField,
   diag.constConstructorWithMixinWithFields,
@@ -140,11 +164,13 @@
   diag.constEvalTypeNumString,
   diag.constEvalTypeString,
   diag.constEvalTypeType,
+  diag.constFactory,
   diag.constFieldInitializerNotAssignable,
   diag.constInitializedWithNonConstantValue,
   diag.constInitializedWithNonConstantValueFromDeferredLibrary,
   diag.constInstanceField,
   diag.constMapKeyNotPrimitiveEquality,
+  diag.constMethod,
   diag.constNotInitialized,
   diag.constSetElementNotPrimitiveEquality,
   diag.constSpreadExpectedListOrSet,
@@ -158,43 +184,144 @@
   diag.constWithTypeParametersFunctionTearoff,
   diag.constWithUndefinedConstructor,
   diag.constWithUndefinedConstructorDefault,
+  diag.constWithoutPrimaryConstructor,
+  diag.constantPatternNeverMatchesValueType,
+  diag.constantPatternWithNonConstantExpression,
+  diag.constructorWithReturnType,
+  diag.constructorWithTypeArguments,
   diag.continueLabelInvalid,
+  diag.continueOutsideOfLoop,
+  diag.continueWithoutLabelInCase,
   diag.couldNotInfer,
+  diag.covariantAndStatic,
+  diag.covariantConstructor,
+  diag.covariantMember,
+  diag.creationOfStructOrUnion,
+  diag.deadCode,
+  diag.deadCodeCatchFollowingCatch,
+  diag.deadCodeLateWildcardVariableInitializer,
+  diag.deadCodeOnCatchSubtype,
+  diag.deadNullAwareExpression,
+  diag.defaultInSwitchExpression,
+  diag.defaultValueInFunctionType,
   diag.defaultValueInRedirectingFactoryConstructor,
   diag.defaultValueOnRequiredParameter,
+  diag.deferredAfterPrefix,
   diag.deferredImportOfExtension,
   diag.definitelyUnassignedLateLocalVariable,
+  diag.dependenciesFieldNotMap,
+  diag.deprecatedColonForDefaultValue,
+  diag.deprecatedExportUse,
+  diag.deprecatedExtend,
+  diag.deprecatedExtendsFunction,
+  diag.deprecatedField,
+  diag.deprecatedImplement,
+  diag.deprecatedImplementsFunction,
+  diag.deprecatedInstantiate,
+  diag.deprecatedLint,
+  diag.deprecatedLintWithReplacement,
+  diag.deprecatedMemberUse,
+  diag.deprecatedMemberUseWithMessage,
+  diag.deprecatedMixin,
+  diag.deprecatedMixinFunction,
+  diag.deprecatedNewInCommentReference,
+  diag.deprecatedOptional,
+  diag.deprecatedSubclass,
+  diag.directiveAfterDeclaration,
   diag.disallowedTypeInstantiationExpression,
+  diag.docDirectiveArgumentWrongFormat,
+  diag.docDirectiveHasExtraArguments,
+  diag.docDirectiveHasUnexpectedNamedArgument,
+  diag.docDirectiveMissingClosingBrace,
+  diag.docDirectiveMissingClosingTag,
+  diag.docDirectiveMissingOneArgument,
+  diag.docDirectiveMissingOpeningTag,
+  diag.docDirectiveMissingThreeArguments,
+  diag.docDirectiveMissingTwoArguments,
+  diag.docDirectiveUnknown,
+  diag.docImportCannotBeDeferred,
+  diag.docImportCannotHaveCombinators,
+  diag.docImportCannotHaveConfigurations,
+  diag.docImportCannotHavePrefix,
   diag.dotShorthandMissingContext,
   diag.dotShorthandUndefinedGetter,
   diag.dotShorthandUndefinedInvocation,
   diag.duplicateConstructorDefault,
   diag.duplicateConstructorName,
+  diag.duplicateDeferred,
   diag.duplicateDefinition,
+  diag.duplicateExport,
   diag.duplicateFieldFormalParameter,
   diag.duplicateFieldName,
+  diag.duplicateHiddenName,
+  diag.duplicateIgnore,
+  diag.duplicateImport,
+  diag.duplicateLabelInSwitchStatement,
   diag.duplicateNamedArgument,
   diag.duplicatePart,
   diag.duplicatePatternAssignmentVariable,
   diag.duplicatePatternField,
+  diag.duplicatePrefix,
   diag.duplicateRestElementInPattern,
+  diag.duplicateRule,
+  diag.duplicateShownName,
   diag.duplicateVariablePattern,
+  diag.duplicatedModifier,
+  diag.emptyEnumBody,
   diag.emptyMapPattern,
+  diag.emptyRecordLiteralWithComma,
+  diag.emptyRecordTypeNamedFieldsList,
+  diag.emptyRecordTypeWithComma,
+  diag.emptyStruct,
+  diag.encoding,
   diag.enumConstantInvokesFactoryConstructor,
   diag.enumConstantSameNameAsEnclosing,
+  diag.enumInClass,
   diag.enumInstantiatedToBoundsIsNotWellBounded,
   diag.enumMixinWithInstanceVariable,
-  diag.enumWithoutConstants,
   diag.enumWithAbstractMember,
   diag.enumWithNameValues,
+  diag.enumWithoutConstants,
   diag.equalElementsInConstSet,
+  diag.equalElementsInSet,
   diag.equalKeysInConstMap,
+  diag.equalKeysInMap,
   diag.equalKeysInMapPattern,
+  diag.equalityCannotBeEqualityOperand,
+  diag.expectedCaseOrDefault,
+  diag.expectedCatchClauseBody,
+  diag.expectedClassBody,
+  diag.expectedClassMember,
+  diag.expectedElseOrComma,
+  diag.expectedExecutable,
+  diag.expectedExtensionBody,
+  diag.expectedExtensionTypeBody,
+  diag.expectedFinallyClauseBody,
+  diag.expectedIdentifierButGotKeyword,
+  diag.expectedInstead,
+  diag.expectedListOrMapLiteral,
+  diag.expectedMixinBody,
+  diag.expectedNamedTypeExtends,
+  diag.expectedNamedTypeImplements,
+  diag.expectedNamedTypeOn,
+  diag.expectedNamedTypeWith,
   diag.expectedOneListPatternTypeArguments,
   diag.expectedOneListTypeArguments,
   diag.expectedOneSetTypeArguments,
+  diag.expectedRepresentationField,
+  diag.expectedRepresentationType,
+  diag.expectedStringLiteral,
+  diag.expectedSwitchExpressionBody,
+  diag.expectedSwitchStatementBody,
+  diag.expectedToken,
+  diag.expectedTryStatementBody,
   diag.expectedTwoMapPatternTypeArguments,
   diag.expectedTwoMapTypeArguments,
+  diag.expectedTypeName,
+  diag.experimentNotEnabled,
+  diag.experimentNotEnabledOffByDefault,
+  diag.experimentalMemberUse,
+  diag.exportDirectiveAfterPartDirective,
   diag.exportInternalLibrary,
   diag.exportOfNonLibrary,
   diag.expressionInMap,
@@ -203,17 +330,21 @@
   diag.extendsNonClass,
   diag.extendsTypeAliasExpandsToTypeParameter,
   diag.extensionAsExpression,
+  diag.extensionAugmentationHasOnClause,
   diag.extensionConflictingStaticAndInstance,
+  diag.extensionDeclaresAbstractMember,
+  diag.extensionDeclaresConstructor,
   diag.extensionDeclaresInstanceField,
   diag.extensionDeclaresMemberOfObject,
   diag.extensionOverrideAccessToStaticMember,
   diag.extensionOverrideArgumentNotAssignable,
-  diag.extensionOverrideWithoutAccess,
   diag.extensionOverrideWithCascade,
+  diag.extensionOverrideWithoutAccess,
   diag.extensionTypeConstructorWithSuperFormalParameter,
   diag.extensionTypeConstructorWithSuperInvocation,
   diag.extensionTypeDeclaresInstanceField,
   diag.extensionTypeDeclaresMemberOfObject,
+  diag.extensionTypeExtends,
   diag.extensionTypeImplementsDisallowedType,
   diag.extensionTypeImplementsItself,
   diag.extensionTypeImplementsNotSupertype,
@@ -221,45 +352,98 @@
   diag.extensionTypeInheritedMemberConflict,
   diag.extensionTypeRepresentationDependsOnItself,
   diag.extensionTypeRepresentationTypeBottom,
+  diag.extensionTypeWith,
   diag.extensionTypeWithAbstractMember,
+  diag.externalClass,
+  diag.externalConstructorWithFieldInitializers,
+  diag.externalConstructorWithInitializer,
+  diag.externalEnum,
+  diag.externalFactoryRedirection,
+  diag.externalFactoryWithBody,
   diag.externalFieldConstructorInitializer,
   diag.externalFieldInitializer,
+  diag.externalGetterWithBody,
+  diag.externalLateField,
+  diag.externalMethodWithBody,
+  diag.externalOperatorWithBody,
+  diag.externalSetterWithBody,
+  diag.externalTypedef,
   diag.externalVariableInitializer,
+  diag.extraAnnotationOnStructField,
   diag.extraPositionalArguments,
   diag.extraPositionalArgumentsCouldBeNamed,
+  diag.extraSizeAnnotationCarray,
+  diag.extraneousModifier,
+  diag.extraneousModifierInExtensionType,
+  diag.extraneousModifierInPrimaryConstructor,
+  diag.factoryTopLevelDeclaration,
+  diag.factoryWithInitializers,
+  diag.factoryWithoutBody,
+  diag.ffiNativeInvalidDuplicateDefaultAsset,
+  diag.ffiNativeInvalidMultipleAnnotations,
+  diag.ffiNativeMustBeExternal,
+  diag.ffiNativeOnlyClassesExtendingNativefieldwrapperclass1CanBePointer,
+  diag.ffiNativeUnexpectedNumberOfParameters,
+  diag.ffiNativeUnexpectedNumberOfParametersWithReceiver,
   diag.fieldInitializedByMultipleInitializers,
   diag.fieldInitializedInInitializerAndDeclaration,
   diag.fieldInitializedInParameterAndInitializer,
+  diag.fieldInitializedOutsideDeclaringClass,
   diag.fieldInitializerFactoryConstructor,
   diag.fieldInitializerNotAssignable,
   diag.fieldInitializerOutsideConstructor,
   diag.fieldInitializerRedirectingConstructor,
   diag.fieldInitializingFormalNotAssignable,
+  diag.fieldMustBeExternalInStruct,
+  diag.finalAndCovariant,
+  diag.finalAndCovariantLateWithInitializer,
+  diag.finalAndVar,
   diag.finalClassExtendedOutsideOfLibrary,
   diag.finalClassImplementedOutsideOfLibrary,
   diag.finalClassUsedAsMixinConstraintOutsideOfLibrary,
+  diag.finalConstructor,
+  diag.finalEnum,
   diag.finalInitializedInDeclarationAndConstructor,
+  diag.finalMethod,
+  diag.finalMixin,
+  diag.finalMixinClass,
   diag.finalNotInitialized,
   diag.finalNotInitializedConstructor1,
   diag.finalNotInitializedConstructor2,
   diag.finalNotInitializedConstructor3Plus,
+  diag.fixme,
+  diag.flutterFieldNotMap,
   diag.forInOfInvalidElementType,
   diag.forInOfInvalidType,
   diag.forInWithConstVariable,
+  diag.functionTypedParameterVar,
   diag.genericFunctionTypeCannotBeBound,
   diag.genericFunctionTypeCannotBeTypeArgument,
   diag.genericMethodTypeInstantiationOnDynamic,
+  diag.genericStructSubclass,
+  diag.getterConstructor,
+  diag.getterInFunction,
   diag.getterNotAssignableSetterTypes,
   diag.getterNotSubtypeSetterTypes,
+  diag.getterWithParameters,
+  diag.hack,
   diag.ifElementConditionFromDeferredLibrary,
+  diag.illegalAssignmentToNonAssignable,
   diag.illegalAsyncGeneratorReturnType,
   diag.illegalAsyncReturnType,
+  diag.illegalCharacter,
   diag.illegalConcreteEnumMemberDeclaration,
   diag.illegalConcreteEnumMemberInheritance,
   diag.illegalEnumValuesDeclaration,
   diag.illegalEnumValuesInheritance,
   diag.illegalLanguageVersionOverride,
+  diag.illegalPatternAssignmentVariableName,
+  diag.illegalPatternIdentifierName,
+  diag.illegalPatternVariableName,
   diag.illegalSyncGeneratorReturnType,
+  diag.implementsBeforeExtends,
+  diag.implementsBeforeOn,
+  diag.implementsBeforeWith,
   diag.implementsDeferredClass,
   diag.implementsDisallowedClass,
   diag.implementsNonClass,
@@ -268,13 +452,29 @@
   diag.implementsTypeAliasExpandsToTypeParameter,
   diag.implicitSuperInitializerMissingArguments,
   diag.implicitThisReferenceInInitializer,
+  diag.importDeferredLibraryWithLoadFunction,
+  diag.importDirectiveAfterPartDirective,
   diag.importInternalLibrary,
   diag.importOfNonLibrary,
+  diag.includeFileNotFound,
+  diag.includedFileParseError,
+  diag.includedFileWarning,
+  diag.incompatibleLint,
+  diag.incompatibleLintFiles,
+  diag.incompatibleLintIncluded,
   diag.inconsistentCaseExpressionTypes,
   diag.inconsistentInheritance,
   diag.inconsistentInheritanceGetterAndMethod,
   diag.inconsistentLanguageVersionOverride,
   diag.inconsistentPatternVariableLogicalOr,
+  diag.inferenceFailureOnCollectionLiteral,
+  diag.inferenceFailureOnFunctionInvocation,
+  diag.inferenceFailureOnFunctionReturnType,
+  diag.inferenceFailureOnGenericInvocation,
+  diag.inferenceFailureOnInstanceCreation,
+  diag.inferenceFailureOnUninitializedVariable,
+  diag.inferenceFailureOnUntypedParameter,
+  diag.initializedVariableInForEach,
   diag.initializerForNonExistentField,
   diag.initializerForStaticField,
   diag.initializingFormalForNonExistentField,
@@ -288,10 +488,16 @@
   diag.integerLiteralImpreciseAsDouble,
   diag.integerLiteralOutOfRange,
   diag.interfaceClassExtendedOutsideOfLibrary,
+  diag.interfaceEnum,
+  diag.interfaceMixin,
+  diag.interfaceMixinClass,
   diag.invalidAnnotation,
   diag.invalidAnnotationConstantValueFromDeferredLibrary,
   diag.invalidAnnotationFromDeferredLibrary,
+  diag.invalidAnnotationTarget,
   diag.invalidAssignment,
+  diag.invalidAwaitInFor,
+  diag.invalidAwaitNotRequiredAnnotation,
   diag.invalidCastFunction,
   diag.invalidCastFunctionExpr,
   diag.invalidCastLiteral,
@@ -300,29 +506,103 @@
   diag.invalidCastLiteralSet,
   diag.invalidCastMethod,
   diag.invalidCastNewExpr,
+  diag.invalidCodePoint,
+  diag.invalidCommentReference,
   diag.invalidConstant,
+  diag.invalidConstantConstPrefix,
+  diag.invalidConstantPatternBinary,
+  diag.invalidConstantPatternDuplicateConst,
+  diag.invalidConstantPatternEmptyRecordLiteral,
+  diag.invalidConstantPatternGeneric,
+  diag.invalidConstantPatternNegation,
+  diag.invalidConstantPatternUnary,
+  diag.invalidConstructorName,
+  diag.invalidDependency,
+  diag.invalidDeprecatedExtendAnnotation,
+  diag.invalidDeprecatedImplementAnnotation,
+  diag.invalidDeprecatedInstantiateAnnotation,
+  diag.invalidDeprecatedMixinAnnotation,
+  diag.invalidDeprecatedOptionalAnnotation,
+  diag.invalidDeprecatedSubclassAnnotation,
+  diag.invalidExceptionValue,
+  diag.invalidExportOfInternalElement,
+  diag.invalidExportOfInternalElementIndirectly,
   diag.invalidExtensionArgumentCount,
+  diag.invalidFactoryMethodDecl,
+  diag.invalidFactoryMethodImpl,
   diag.invalidFactoryNameNotAClass,
   diag.invalidFieldNameFromObject,
   diag.invalidFieldNamePositional,
   diag.invalidFieldNamePrivate,
+  diag.invalidFieldTypeInStruct,
+  diag.invalidGenericFunctionType,
+  diag.invalidHexEscape,
   diag.invalidImplementationOverride,
   diag.invalidImplementationOverrideSetter,
+  diag.invalidInitializer,
   diag.invalidInlineFunctionType,
+  diag.invalidInsideUnaryPattern,
+  diag.invalidInternalAnnotation,
+  diag.invalidLanguageVersionOverrideAtSign,
+  diag.invalidLanguageVersionOverrideEquals,
+  diag.invalidLanguageVersionOverrideGreater,
+  diag.invalidLanguageVersionOverrideLocation,
+  diag.invalidLanguageVersionOverrideLowerCase,
+  diag.invalidLanguageVersionOverrideNumber,
+  diag.invalidLanguageVersionOverridePrefix,
+  diag.invalidLanguageVersionOverrideTrailingCharacters,
+  diag.invalidLanguageVersionOverrideTwoSlashes,
+  diag.invalidLiteralAnnotation,
+  diag.invalidLiteralInConfiguration,
   diag.invalidModifierOnConstructor,
   diag.invalidModifierOnSetter,
+  diag.invalidNonVirtualAnnotation,
+  diag.invalidNullAwareElement,
+  diag.invalidNullAwareMapEntryKey,
+  diag.invalidNullAwareMapEntryValue,
+  diag.invalidNullAwareOperator,
+  diag.invalidNullAwareOperatorAfterShortCircuit,
+  diag.invalidOperator,
+  diag.invalidOperatorForSuper,
+  diag.invalidOperatorQuestionmarkPeriodForSuper,
+  diag.invalidOption,
   diag.invalidOverride,
+  diag.invalidOverrideOfNonVirtualMember,
   diag.invalidOverrideSetter,
+  diag.invalidPlatformsField,
   diag.invalidReferenceToGenerativeEnumConstructor,
   diag.invalidReferenceToGenerativeEnumConstructorTearoff,
   diag.invalidReferenceToThis,
+  diag.invalidReopenAnnotation,
+  diag.invalidSectionFormat,
+  diag.invalidStarAfterAsync,
   diag.invalidSuperFormalParameterLocation,
+  diag.invalidSuperInInitializer,
+  diag.invalidSync,
+  diag.invalidThisInInitializer,
   diag.invalidTypeArgumentInConstList,
   diag.invalidTypeArgumentInConstMap,
   diag.invalidTypeArgumentInConstSet,
+  diag.invalidUnicodeEscapeStarted,
+  diag.invalidUnicodeEscapeUBracket,
+  diag.invalidUnicodeEscapeUNoBracket,
+  diag.invalidUnicodeEscapeUStarted,
   diag.invalidUri,
   diag.invalidUseOfCovariant,
+  diag.invalidUseOfCovariantInExtension,
+  diag.invalidUseOfDoNotSubmitMember,
+  diag.invalidUseOfIdentifierAugmented,
+  diag.invalidUseOfInternalMember,
   diag.invalidUseOfNullValue,
+  diag.invalidUseOfProtectedMember,
+  diag.invalidUseOfVisibleForOverridingMember,
+  diag.invalidUseOfVisibleForTemplateMember,
+  diag.invalidUseOfVisibleForTestingMember,
+  diag.invalidVisibilityAnnotation,
+  diag.invalidVisibleForOverridingAnnotation,
+  diag.invalidVisibleOutsideTemplateAnnotation,
+  diag.invalidWidgetPreviewApplication,
+  diag.invalidWidgetPreviewPrivateArgument,
   diag.invocationOfExtensionWithoutCall,
   diag.invocationOfNonFunction,
   diag.invocationOfNonFunctionExpression,
@@ -330,8 +610,16 @@
   diag.labelUndefined,
   diag.lateFinalFieldWithConstConstructor,
   diag.lateFinalLocalAlreadyAssigned,
+  diag.latePatternVariableDeclaration,
+  diag.leafCallMustNotReturnHandle,
+  diag.leafCallMustNotTakeHandle,
+  diag.libraryDirectiveNotFirst,
   diag.listElementTypeNotAssignable,
   diag.listElementTypeNotAssignableNullability,
+  diag.literalWithClass,
+  diag.literalWithClassAndNew,
+  diag.literalWithNew,
+  diag.localFunctionDeclarationModifier,
   diag.mainFirstPositionalParameterType,
   diag.mainHasRequiredNamedParameters,
   diag.mainHasTooManyRequiredPositionalParameters,
@@ -341,6 +629,14 @@
   diag.mapKeyTypeNotAssignableNullability,
   diag.mapValueTypeNotAssignable,
   diag.mapValueTypeNotAssignableNullability,
+  diag.memberWithClassName,
+  diag.mismatchedAnnotationOnStructField,
+  diag.missingAnnotationOnStructField,
+  diag.missingAssignableSelector,
+  diag.missingAssignmentInInitializer,
+  diag.missingCatchOrFinally,
+  diag.missingClosingParenthesis,
+  diag.missingConstFinalVarOrType,
   diag.missingConstInListLiteral,
   diag.missingConstInMapLiteral,
   diag.missingConstInSetLiteral,
@@ -348,34 +644,112 @@
   diag.missingDefaultValueForParameter,
   diag.missingDefaultValueForParameterPositional,
   diag.missingDefaultValueForParameterWithAnnotation,
+  diag.missingDependency,
+  diag.missingDigit,
+  diag.missingEnumBody,
+  diag.missingEnumConstantInSwitch,
+  diag.missingExceptionValue,
+  diag.missingExpressionInInitializer,
+  diag.missingExpressionInThrow,
+  diag.missingFieldTypeInStruct,
+  diag.missingFunctionBody,
+  diag.missingFunctionKeyword,
+  diag.missingFunctionParameters,
+  diag.missingGet,
+  diag.missingHexDigit,
+  diag.missingIdentifier,
+  diag.missingInitializer,
+  diag.missingKeywordOperator,
+  diag.missingMethodParameters,
+  diag.missingName,
+  diag.missingNameForNamedParameter,
+  diag.missingNameInLibraryDirective,
+  diag.missingNameInPartOfDirective,
   diag.missingNamedPatternFieldName,
+  diag.missingOverrideOfMustBeOverriddenOne,
+  diag.missingOverrideOfMustBeOverriddenThreePlus,
+  diag.missingOverrideOfMustBeOverriddenTwo,
+  diag.missingPrefixInDeferredImport,
+  diag.missingPrimaryConstructor,
+  diag.missingPrimaryConstructorParameters,
+  diag.missingQuote,
   diag.missingRequiredArgument,
+  diag.missingRequiredParam,
+  diag.missingRequiredParamWithDetails,
+  diag.missingSizeAnnotationCarray,
+  diag.missingStarAfterSync,
+  diag.missingStatement,
+  diag.missingTerminatorForParameterGroup,
+  diag.missingTypedefParameters,
+  diag.missingVariableInForEach,
   diag.missingVariablePattern,
-  diag.mixinsSuperClass,
+  diag.mixedParameterGroups,
   diag.mixinApplicationConcreteSuperInvokedMemberType,
-  diag.mixinApplicationNotImplementedInterface,
   diag.mixinApplicationNoConcreteSuperInvokedMember,
   diag.mixinApplicationNoConcreteSuperInvokedSetter,
+  diag.mixinApplicationNotImplementedInterface,
   diag.mixinClassDeclarationExtendsNotObject,
   diag.mixinClassDeclaresConstructor,
+  diag.mixinDeclaresConstructor,
   diag.mixinDeferredClass,
   diag.mixinInheritsFromNotObject,
   diag.mixinInstantiate,
   diag.mixinOfDisallowedClass,
   diag.mixinOfNonClass,
   diag.mixinOfTypeAliasExpandsToTypeParameter,
+  diag.mixinOnSealedClass,
   diag.mixinOnTypeAliasExpandsToTypeParameter,
   diag.mixinSubtypeOfBaseIsNotBase,
   diag.mixinSubtypeOfFinalIsNotBase,
   diag.mixinSuperClassConstraintDeferredClass,
   diag.mixinSuperClassConstraintDisallowedClass,
   diag.mixinSuperClassConstraintNonInterface,
+  diag.mixinWithClause,
   diag.mixinWithNonClassSuperclass,
+  diag.mixinsSuperClass,
+  diag.modifierOutOfOrder,
+  diag.multipleClauses,
+  diag.multipleCombinators,
+  diag.multipleExtendsClauses,
+  diag.multipleImplementsClauses,
+  diag.multipleLibraryDirectives,
+  diag.multipleNamedParameterGroups,
+  diag.multipleOnClauses,
+  diag.multiplePartOfDirectives,
+  diag.multiplePlugins,
+  diag.multiplePositionalParameterGroups,
   diag.multipleRedirectingConstructorInvocations,
+  diag.multipleRepresentationFields,
   diag.multipleSuperInitializers,
+  diag.multipleVariablesInForEach,
+  diag.multipleVarianceModifiers,
+  diag.multipleWithClauses,
+  diag.mustBeANativeFunctionType,
+  diag.mustBeASubtype,
+  diag.mustBeImmutable,
+  diag.mustCallSuper,
+  diag.mustReturnVoid,
+  diag.nameNotString,
+  diag.namedFunctionExpression,
+  diag.namedFunctionType,
+  diag.namedParameterOutsideGroup,
+  diag.nativeClauseInNonSdkCode,
+  diag.nativeClauseShouldBeAnnotation,
+  diag.nativeFieldInvalidType,
+  diag.nativeFieldMissingType,
+  diag.nativeFieldNotStatic,
+  diag.nativeFunctionBodyInNonSdkCode,
+  diag.nativeFunctionMissingType,
+  diag.negativeVariableDimension,
   diag.newWithNonType,
   diag.newWithUndefinedConstructor,
   diag.newWithUndefinedConstructorDefault,
+  diag.noAnnotationConstructorArguments,
+  diag.noCombinedSuperSignature,
+  diag.noDefaultSuperConstructorExplicit,
+  diag.noDefaultSuperConstructorImplicit,
+  diag.noGenerativeConstructorsInSuperclass,
+  diag.noTouchscreenFeature,
   diag.nonAbstractClassInheritsAbstractMemberFivePlus,
   diag.nonAbstractClassInheritsAbstractMemberFour,
   diag.nonAbstractClassInheritsAbstractMemberOne,
@@ -385,6 +759,11 @@
   diag.nonBoolExpression,
   diag.nonBoolNegationExpression,
   diag.nonBoolOperand,
+  diag.nonConstArgumentForConstParameter,
+  diag.nonConstCallToLiteralConstructor,
+  diag.nonConstCallToLiteralConstructorUsingNew,
+  diag.nonConstGenerativeEnumConstructor,
+  diag.nonConstMapAsExpressionStatement,
   diag.nonConstantAnnotationConstructor,
   diag.nonConstantCaseExpression,
   diag.nonConstantCaseExpressionFromDeferredLibrary,
@@ -402,21 +781,31 @@
   diag.nonConstantRecordFieldFromDeferredLibrary,
   diag.nonConstantRelationalPatternExpression,
   diag.nonConstantSetElement,
-  diag.nonConstGenerativeEnumConstructor,
-  diag.nonConstMapAsExpressionStatement,
+  diag.nonConstantTypeArgument,
+  diag.nonConstructorFactory,
   diag.nonCovariantTypeParameterPositionInRepresentationType,
   diag.nonExhaustiveSwitchExpression,
   diag.nonExhaustiveSwitchStatement,
   diag.nonFinalFieldInEnum,
   diag.nonGenerativeConstructor,
   diag.nonGenerativeImplicitConstructor,
+  diag.nonIdentifierLibraryName,
+  diag.nonNativeFunctionTypeArgumentToPointer,
+  diag.nonNullableEqualsParameter,
+  diag.nonPartOfDirectiveInPart,
+  diag.nonPositiveArrayDimension,
+  diag.nonResizableActivity,
+  diag.nonSizedTypeArgument,
+  diag.nonStringLiteralAsUri,
   diag.nonSyncFactory,
   diag.nonTypeAsTypeArgument,
   diag.nonTypeInCatchClause,
+  diag.nonUserDefinableOperator,
   diag.nonVoidReturnForOperator,
   diag.nonVoidReturnForSetter,
-  diag.notAssignedPotentiallyNonNullableLocalVariable,
+  diag.normalBeforeOptionalParameters,
   diag.notAType,
+  diag.notAssignedPotentiallyNonNullableLocalVariable,
   diag.notBinaryOperator,
   diag.notEnoughPositionalArgumentsNamePlural,
   diag.notEnoughPositionalArgumentsNameSingular,
@@ -429,11 +818,10 @@
   diag.notIterableSpread,
   diag.notMapSpread,
   diag.notNullAwareNullSpread,
-  diag.noAnnotationConstructorArguments,
-  diag.noCombinedSuperSignature,
-  diag.noDefaultSuperConstructorExplicit,
-  diag.noDefaultSuperConstructorImplicit,
-  diag.noGenerativeConstructorsInSuperclass,
+  diag.nullArgumentToNonNullType,
+  diag.nullAwareCascadeOutOfOrder,
+  diag.nullCheckAlwaysFails,
+  diag.nullableTypeInCatchClause,
   diag.nullableTypeInExtendsClause,
   diag.nullableTypeInImplementsClause,
   diag.nullableTypeInOnClause,
@@ -442,35 +830,63 @@
   diag.obsoleteColonForDefaultValue,
   diag.onRepeated,
   diag.optionalParameterInOperator,
+  diag.outOfOrderClauses,
+  diag.overrideOnNonOverridingField,
+  diag.overrideOnNonOverridingGetter,
+  diag.overrideOnNonOverridingMethod,
+  diag.overrideOnNonOverridingSetter,
+  diag.packedAnnotation,
+  diag.packedAnnotationAlignment,
+  diag.parseError,
   diag.partOfDifferentLibrary,
+  diag.partOfName,
   diag.partOfNonPart,
   diag.partOfUnnamedLibrary,
+  diag.pathDoesNotExist,
+  diag.pathNotPosix,
+  diag.pathPubspecDoesNotExist,
+  diag.patternAssignmentDeclaresVariable,
   diag.patternAssignmentNotLocalVariable,
   diag.patternConstantFromDeferredLibrary,
+  diag.patternNeverMatchesValueType,
   diag.patternTypeMismatchInIrrefutableContext,
   diag.patternVariableAssignmentInsideGuard,
+  diag.patternVariableDeclarationOutsideFunctionOrMethod,
   diag.patternVariableSharedCaseScopeDifferentFinalityOrType,
   diag.patternVariableSharedCaseScopeHasLabel,
   diag.patternVariableSharedCaseScopeNotAllCases,
+  diag.permissionImpliesUnsupportedHardware,
+  diag.platformValueDisallowed,
+  diag.pluginsInInnerOptions,
+  diag.positionalAfterNamedArgument,
   diag.positionalFieldInObjectPattern,
+  diag.positionalParameterOutsideGroup,
   diag.positionalSuperFormalParameterWithPositionalArgument,
+  diag.prefixAfterCombinator,
   diag.prefixCollidesWithTopLevelMember,
   diag.prefixIdentifierNotFollowedByDot,
   diag.prefixShadowedByLocalDeclaration,
   diag.privateCollisionInMixinApplication,
+  diag.privateNamedNonFieldParameter,
   diag.privateNamedParameterWithoutPublicName,
+  diag.privateOptionalParameter,
   diag.privateSetter,
   diag.readPotentiallyUnassignedFinal,
+  diag.receiverOfTypeNever,
+  diag.recordLiteralOnePositionalNoTrailingComma,
   diag.recordLiteralOnePositionalNoTrailingCommaByType,
+  diag.recordTypeOnePositionalNoTrailingComma,
   diag.recursiveCompileTimeConstant,
   diag.recursiveConstantConstructor,
   diag.recursiveConstructorRedirect,
   diag.recursiveFactoryRedirect,
+  diag.recursiveIncludeFile,
   diag.recursiveInterfaceInheritance,
   diag.recursiveInterfaceInheritanceExtends,
   diag.recursiveInterfaceInheritanceImplements,
   diag.recursiveInterfaceInheritanceOn,
   diag.recursiveInterfaceInheritanceWith,
+  diag.redeclareOnNonRedeclaringMember,
   diag.redirectGenerativeToMissingConstructor,
   diag.redirectGenerativeToNonGenerativeConstructor,
   diag.redirectToAbstractClassConstructor,
@@ -480,49 +896,94 @@
   diag.redirectToNonClass,
   diag.redirectToNonConstConstructor,
   diag.redirectToTypeAliasExpandsToTypeParameter,
+  diag.redirectingConstructorWithBody,
+  diag.redirectionInNonFactoryConstructor,
   diag.referencedBeforeDeclaration,
   diag.refutablePatternInIrrefutableContext,
   diag.relationalPatternOperandTypeNotAssignable,
   diag.relationalPatternOperatorReturnTypeNotAssignableToBool,
+  diag.removedLint,
+  diag.removedLintUse,
+  diag.replacedLint,
+  diag.replacedLintUse,
+  diag.representationFieldModifier,
+  diag.representationFieldTrailingComma,
   diag.restElementInMapPattern,
   diag.rethrowOutsideCatch,
   diag.returnInGenerativeConstructor,
   diag.returnInGenerator,
+  diag.returnOfDoNotStore,
+  diag.returnOfInvalidTypeFromCatchError,
   diag.returnOfInvalidTypeFromClosure,
   diag.returnOfInvalidTypeFromConstructor,
   diag.returnOfInvalidTypeFromFunction,
   diag.returnOfInvalidTypeFromMethod,
+  diag.returnTypeInvalidForCatchError,
   diag.returnWithoutValue,
+  diag.sdkVersionConstructorTearoffs,
+  diag.sdkVersionGtGtGtOperator,
+  diag.sdkVersionSince,
   diag.sealedClassSubtypeOutsideOfLibrary,
+  diag.sealedEnum,
+  diag.sealedMixin,
+  diag.sealedMixinClass,
   diag.setElementFromDeferredLibrary,
   diag.setElementTypeNotAssignable,
   diag.setElementTypeNotAssignableNullability,
+  diag.setterConstructor,
+  diag.setterInFunction,
+  diag.settingOrientationOnActivity,
   diag.sharedDeferredPrefix,
+  diag.sizeAnnotationDimensions,
   diag.spreadExpressionFromDeferredLibrary,
+  diag.stackOverflow,
   diag.staticAccessToInstanceMember,
+  diag.staticConstructor,
+  diag.staticGetterWithoutBody,
+  diag.staticOperator,
+  diag.staticSetterWithoutBody,
+  diag.strictRawType,
   diag.subtypeOfBaseIsNotBaseFinalOrSealed,
   diag.subtypeOfFinalIsNotBaseFinalOrSealed,
+  diag.subtypeOfSealedClass,
+  diag.subtypeOfStructClassInExtends,
+  diag.subtypeOfStructClassInImplements,
+  diag.subtypeOfStructClassInWith,
   diag.superFormalParameterTypeIsNotSubtypeOfAssociated,
   diag.superFormalParameterWithoutAssociatedNamed,
   diag.superFormalParameterWithoutAssociatedPositional,
-  diag.superInitializerInObject,
-  diag.superInvocationNotLast,
   diag.superInEnumConstructor,
   diag.superInExtension,
   diag.superInExtensionType,
   diag.superInInvalidContext,
   diag.superInRedirectingConstructor,
+  diag.superInitializerInObject,
+  diag.superInvocationNotLast,
   diag.switchCaseCompletesNormally,
+  diag.switchHasCaseAfterDefaultCase,
+  diag.switchHasMultipleDefaultCases,
   diag.tearoffOfGenerativeConstructorOfAbstractClass,
+  diag.textDirectionCodePointInComment,
+  diag.textDirectionCodePointInLiteral,
   diag.throwOfInvalidType,
+  diag.todo,
   diag.topLevelCycle,
+  diag.topLevelOperator,
   diag.typeAliasCannotReferenceItself,
   diag.typeAnnotationDeferredClass,
   diag.typeArgumentNotMatchingBounds,
+  diag.typeArgumentsOnTypeVariable,
+  diag.typeBeforeFactory,
+  diag.typeCheckIsNotNull,
+  diag.typeCheckIsNull,
+  diag.typeParameterOnConstructor,
+  diag.typeParameterOnOperator,
   diag.typeParameterReferencedByStatic,
   diag.typeParameterSupertypeOfItsBound,
   diag.typeTestWithNonType,
   diag.typeTestWithUndefinedName,
+  diag.typedefInClass,
+  diag.unableGetContent,
   diag.uncheckedInvocationOfNullableValue,
   diag.uncheckedMethodInvocationOfNullableValue,
   diag.uncheckedOperatorInvocationOfNullableValue,
@@ -546,555 +1007,42 @@
   diag.undefinedFunction,
   diag.undefinedGetter,
   diag.undefinedGetterOnFunctionType,
+  diag.undefinedHiddenName,
   diag.undefinedIdentifier,
   diag.undefinedIdentifierAwait,
+  diag.undefinedLint,
   diag.undefinedMethod,
   diag.undefinedMethodOnFunctionType,
   diag.undefinedNamedParameter,
   diag.undefinedOperator,
   diag.undefinedPrefixedName,
+  diag.undefinedReferencedParameter,
   diag.undefinedSetter,
   diag.undefinedSetterOnFunctionType,
+  diag.undefinedShownName,
   diag.undefinedSuperGetter,
   diag.undefinedSuperMethod,
   diag.undefinedSuperOperator,
   diag.undefinedSuperSetter,
-  diag.unqualifiedReferenceToNonLocalStaticMember,
-  diag.unqualifiedReferenceToStaticMemberOfExtendedType,
-  diag.uriDoesNotExist,
-  diag.uriHasNotBeenGenerated,
-  diag.uriWithInterpolation,
-  diag.useOfNativeExtension,
-  diag.useOfVoidResult,
-  diag.valuesDeclarationInEnum,
-  diag.variableTypeMismatch,
-  diag.wrongExplicitTypeParameterVarianceInSuperinterface,
-  diag.wrongNumberOfParametersForOperator,
-  diag.wrongNumberOfParametersForOperatorMinus,
-  diag.wrongNumberOfTypeArguments,
-  diag.wrongNumberOfTypeArgumentsAnonymousFunction,
-  diag.wrongNumberOfTypeArgumentsConstructor,
-  diag.wrongNumberOfTypeArgumentsDotShorthandConstructor,
-  diag.wrongNumberOfTypeArgumentsEnum,
-  diag.wrongNumberOfTypeArgumentsExtension,
-  diag.wrongNumberOfTypeArgumentsFunction,
-  diag.wrongNumberOfTypeArgumentsMethod,
-  diag.wrongTypeParameterVarianceInSuperinterface,
-  diag.wrongTypeParameterVariancePosition,
-  diag.yieldEachInNonGenerator,
-  diag.yieldEachOfInvalidType,
-  diag.yieldInNonGenerator,
-  diag.yieldOfInvalidType,
-  diag.abiSpecificIntegerInvalid,
-  diag.abiSpecificIntegerMappingExtra,
-  diag.abiSpecificIntegerMappingMissing,
-  diag.abiSpecificIntegerMappingUnsupported,
-  diag.addressPosition,
-  diag.addressReceiver,
-  diag.annotationOnPointerField,
-  diag.argumentMustBeAConstant,
-  diag.argumentMustBeNative,
-  diag.compoundImplementsFinalizable,
-  diag.creationOfStructOrUnion,
-  diag.emptyStruct,
-  diag.extraAnnotationOnStructField,
-  diag.extraSizeAnnotationCarray,
-  diag.ffiNativeInvalidDuplicateDefaultAsset,
-  diag.ffiNativeInvalidMultipleAnnotations,
-  diag.ffiNativeMustBeExternal,
-  diag.ffiNativeOnlyClassesExtendingNativefieldwrapperclass1CanBePointer,
-  diag.ffiNativeUnexpectedNumberOfParameters,
-  diag.ffiNativeUnexpectedNumberOfParametersWithReceiver,
-  diag.fieldMustBeExternalInStruct,
-  diag.genericStructSubclass,
-  diag.invalidExceptionValue,
-  diag.invalidFieldTypeInStruct,
-  diag.leafCallMustNotReturnHandle,
-  diag.leafCallMustNotTakeHandle,
-  diag.mismatchedAnnotationOnStructField,
-  diag.missingAnnotationOnStructField,
-  diag.missingExceptionValue,
-  diag.missingFieldTypeInStruct,
-  diag.missingSizeAnnotationCarray,
-  diag.mustBeANativeFunctionType,
-  diag.mustBeASubtype,
-  diag.mustReturnVoid,
-  diag.nativeFieldInvalidType,
-  diag.nativeFieldMissingType,
-  diag.nativeFieldNotStatic,
-  diag.nativeFunctionMissingType,
-  diag.negativeVariableDimension,
-  diag.nonConstantTypeArgument,
-  diag.nonNativeFunctionTypeArgumentToPointer,
-  diag.nonPositiveArrayDimension,
-  diag.nonSizedTypeArgument,
-  diag.packedAnnotation,
-  diag.packedAnnotationAlignment,
-  diag.sizeAnnotationDimensions,
-  diag.subtypeOfStructClassInExtends,
-  diag.subtypeOfStructClassInImplements,
-  diag.subtypeOfStructClassInWith,
-  diag.variableLengthArrayNotLast,
-  diag.deprecatedColonForDefaultValue,
-  diag.deprecatedMemberUse,
-  diag.deprecatedMemberUseWithMessage,
-  diag.importDeferredLibraryWithLoadFunction,
-  diag.unnecessaryImport,
-  diag.cameraPermissionsIncompatible,
-  diag.nonResizableActivity,
-  diag.noTouchscreenFeature,
-  diag.permissionImpliesUnsupportedHardware,
-  diag.settingOrientationOnActivity,
-  diag.unsupportedChromeOsFeature,
-  diag.unsupportedChromeOsHardware,
-  diag.abstractClassMember,
-  diag.abstractExternalField,
-  diag.abstractFinalBaseClass,
-  diag.abstractFinalInterfaceClass,
-  diag.abstractLateField,
-  diag.abstractSealedClass,
-  diag.abstractStaticField,
-  diag.abstractStaticMethod,
-  diag.annotationOnTypeArgument,
-  diag.annotationSpaceBeforeParenthesis,
-  diag.annotationWithTypeArguments,
-  diag.annotationWithTypeArgumentsUninstantiated,
-  diag.asyncKeywordUsedAsIdentifier,
-  diag.baseEnum,
-  diag.binaryOperatorWrittenOut,
-  diag.breakOutsideOfLoop,
-  diag.catchSyntax,
-  diag.catchSyntaxExtraParameters,
-  diag.classInClass,
-  diag.colonInPlaceOfIn,
-  diag.conflictingModifiers,
-  diag.constructorWithReturnType,
-  diag.constructorWithTypeArguments,
-  diag.constAndFinal,
-  diag.constClass,
-  diag.constConstructorWithBody,
-  diag.constFactory,
-  diag.constMethod,
-  diag.constWithoutPrimaryConstructor,
-  diag.continueOutsideOfLoop,
-  diag.continueWithoutLabelInCase,
-  diag.covariantAndStatic,
-  diag.covariantConstructor,
-  diag.covariantMember,
-  diag.defaultInSwitchExpression,
-  diag.defaultValueInFunctionType,
-  diag.deferredAfterPrefix,
-  diag.directiveAfterDeclaration,
-  diag.duplicatedModifier,
-  diag.duplicateDeferred,
-  diag.duplicateLabelInSwitchStatement,
-  diag.duplicatePrefix,
-  diag.emptyEnumBody,
-  diag.emptyRecordLiteralWithComma,
-  diag.emptyRecordTypeNamedFieldsList,
-  diag.emptyRecordTypeWithComma,
-  diag.enumInClass,
-  diag.equalityCannotBeEqualityOperand,
-  diag.expectedCaseOrDefault,
-  diag.expectedCatchClauseBody,
-  diag.expectedClassBody,
-  diag.expectedClassMember,
-  diag.expectedElseOrComma,
-  diag.expectedExecutable,
-  diag.expectedExtensionBody,
-  diag.expectedExtensionTypeBody,
-  diag.expectedFinallyClauseBody,
-  diag.expectedIdentifierButGotKeyword,
-  diag.expectedInstead,
-  diag.expectedListOrMapLiteral,
-  diag.expectedMixinBody,
-  diag.expectedNamedTypeExtends,
-  diag.expectedNamedTypeImplements,
-  diag.expectedNamedTypeOn,
-  diag.expectedNamedTypeWith,
-  diag.expectedRepresentationField,
-  diag.expectedRepresentationType,
-  diag.expectedStringLiteral,
-  diag.expectedSwitchExpressionBody,
-  diag.expectedSwitchStatementBody,
-  diag.expectedToken,
-  diag.expectedTryStatementBody,
-  diag.expectedTypeName,
-  diag.experimentNotEnabled,
-  diag.experimentNotEnabledOffByDefault,
-  diag.exportDirectiveAfterPartDirective,
-  diag.extensionAugmentationHasOnClause,
-  diag.extensionDeclaresAbstractMember,
-  diag.extensionDeclaresConstructor,
-  diag.extensionTypeExtends,
-  diag.extensionTypeWith,
-  diag.externalClass,
-  diag.externalConstructorWithFieldInitializers,
-  diag.externalConstructorWithInitializer,
-  diag.externalEnum,
-  diag.externalFactoryRedirection,
-  diag.externalFactoryWithBody,
-  diag.externalGetterWithBody,
-  diag.externalLateField,
-  diag.externalMethodWithBody,
-  diag.externalOperatorWithBody,
-  diag.externalSetterWithBody,
-  diag.externalTypedef,
-  diag.extraneousModifier,
-  diag.extraneousModifierInExtensionType,
-  diag.extraneousModifierInPrimaryConstructor,
-  diag.factoryTopLevelDeclaration,
-  diag.factoryWithoutBody,
-  diag.factoryWithInitializers,
-  diag.fieldInitializedOutsideDeclaringClass,
-  diag.finalAndCovariant,
-  diag.finalAndCovariantLateWithInitializer,
-  diag.finalAndVar,
-  diag.finalConstructor,
-  diag.finalEnum,
-  diag.finalMethod,
-  diag.finalMixin,
-  diag.finalMixinClass,
-  diag.functionTypedParameterVar,
-  diag.getterConstructor,
-  diag.getterInFunction,
-  diag.getterWithParameters,
-  diag.illegalAssignmentToNonAssignable,
-  diag.illegalPatternAssignmentVariableName,
-  diag.illegalPatternIdentifierName,
-  diag.illegalPatternVariableName,
-  diag.implementsBeforeExtends,
-  diag.implementsBeforeOn,
-  diag.implementsBeforeWith,
-  diag.importDirectiveAfterPartDirective,
-  diag.initializedVariableInForEach,
-  diag.interfaceEnum,
-  diag.interfaceMixin,
-  diag.interfaceMixinClass,
-  diag.invalidAwaitInFor,
-  diag.invalidCodePoint,
-  diag.invalidCommentReference,
-  diag.invalidConstantConstPrefix,
-  diag.invalidConstantPatternBinary,
-  diag.invalidConstantPatternDuplicateConst,
-  diag.invalidConstantPatternEmptyRecordLiteral,
-  diag.invalidConstantPatternGeneric,
-  diag.invalidConstantPatternNegation,
-  diag.invalidConstantPatternUnary,
-  diag.invalidConstructorName,
-  diag.invalidGenericFunctionType,
-  diag.invalidHexEscape,
-  diag.invalidInitializer,
-  diag.invalidInsideUnaryPattern,
-  diag.invalidLiteralInConfiguration,
-  diag.invalidOperator,
-  diag.invalidOperatorForSuper,
-  diag.invalidOperatorQuestionmarkPeriodForSuper,
-  diag.invalidStarAfterAsync,
-  diag.invalidSuperInInitializer,
-  diag.invalidSync,
-  diag.invalidThisInInitializer,
-  diag.invalidUnicodeEscapeStarted,
-  diag.invalidUnicodeEscapeUBracket,
-  diag.invalidUnicodeEscapeUNoBracket,
-  diag.invalidUnicodeEscapeUStarted,
-  diag.invalidUseOfCovariantInExtension,
-  diag.invalidUseOfIdentifierAugmented,
-  diag.latePatternVariableDeclaration,
-  diag.libraryDirectiveNotFirst,
-  diag.literalWithClass,
-  diag.literalWithClassAndNew,
-  diag.literalWithNew,
-  diag.localFunctionDeclarationModifier,
-  diag.memberWithClassName,
-  diag.missingAssignableSelector,
-  diag.missingAssignmentInInitializer,
-  diag.missingCatchOrFinally,
-  diag.missingClosingParenthesis,
-  diag.missingConstFinalVarOrType,
-  diag.missingEnumBody,
-  diag.missingExpressionInInitializer,
-  diag.missingExpressionInThrow,
-  diag.missingFunctionBody,
-  diag.missingFunctionKeyword,
-  diag.missingFunctionParameters,
-  diag.missingGet,
-  diag.missingIdentifier,
-  diag.missingInitializer,
-  diag.missingKeywordOperator,
-  diag.missingMethodParameters,
-  diag.missingNameForNamedParameter,
-  diag.missingNameInLibraryDirective,
-  diag.missingNameInPartOfDirective,
-  diag.missingPrefixInDeferredImport,
-  diag.missingPrimaryConstructor,
-  diag.missingPrimaryConstructorParameters,
-  diag.missingStarAfterSync,
-  diag.missingStatement,
-  diag.missingTerminatorForParameterGroup,
-  diag.missingTypedefParameters,
-  diag.missingVariableInForEach,
-  diag.mixedParameterGroups,
-  diag.mixinDeclaresConstructor,
-  diag.mixinWithClause,
-  diag.modifierOutOfOrder,
-  diag.multipleClauses,
-  diag.multipleExtendsClauses,
-  diag.multipleImplementsClauses,
-  diag.multipleLibraryDirectives,
-  diag.multipleNamedParameterGroups,
-  diag.multipleOnClauses,
-  diag.multiplePartOfDirectives,
-  diag.multiplePositionalParameterGroups,
-  diag.multipleRepresentationFields,
-  diag.multipleVariablesInForEach,
-  diag.multipleVarianceModifiers,
-  diag.multipleWithClauses,
-  diag.namedFunctionExpression,
-  diag.namedFunctionType,
-  diag.namedParameterOutsideGroup,
-  diag.nativeClauseInNonSdkCode,
-  diag.nativeClauseShouldBeAnnotation,
-  diag.nativeFunctionBodyInNonSdkCode,
-  diag.nonConstructorFactory,
-  diag.nonIdentifierLibraryName,
-  diag.nonPartOfDirectiveInPart,
-  diag.nonStringLiteralAsUri,
-  diag.nonUserDefinableOperator,
-  diag.normalBeforeOptionalParameters,
-  diag.nullAwareCascadeOutOfOrder,
-  diag.outOfOrderClauses,
-  diag.partOfName,
-  diag.patternAssignmentDeclaresVariable,
-  diag.patternVariableDeclarationOutsideFunctionOrMethod,
-  diag.positionalAfterNamedArgument,
-  diag.positionalParameterOutsideGroup,
-  diag.prefixAfterCombinator,
-  diag.privateNamedNonFieldParameter,
-  diag.privateOptionalParameter,
-  diag.recordLiteralOnePositionalNoTrailingComma,
-  diag.recordTypeOnePositionalNoTrailingComma,
-  diag.redirectingConstructorWithBody,
-  diag.redirectionInNonFactoryConstructor,
-  diag.representationFieldModifier,
-  diag.representationFieldTrailingComma,
-  diag.sealedEnum,
-  diag.sealedMixin,
-  diag.sealedMixinClass,
-  diag.setterConstructor,
-  diag.setterInFunction,
-  diag.stackOverflow,
-  diag.staticConstructor,
-  diag.staticGetterWithoutBody,
-  diag.staticOperator,
-  diag.staticSetterWithoutBody,
-  diag.switchHasCaseAfterDefaultCase,
-  diag.switchHasMultipleDefaultCases,
-  diag.topLevelOperator,
-  diag.typedefInClass,
-  diag.typeArgumentsOnTypeVariable,
-  diag.typeBeforeFactory,
-  diag.typeParameterOnConstructor,
-  diag.typeParameterOnOperator,
+  diag.undone,
+  diag.unexpectedDollarInString,
+  diag.unexpectedSeparatorInNumber,
   diag.unexpectedTerminatorForParameterGroup,
   diag.unexpectedToken,
   diag.unexpectedTokens,
-  diag.variablePatternKeywordInDeclarationContext,
-  diag.varAndType,
-  diag.varAsTypeName,
-  diag.varClass,
-  diag.varEnum,
-  diag.varReturnType,
-  diag.varTypedef,
-  diag.voidWithTypeArguments,
-  diag.withBeforeExtends,
-  diag.wrongNumberOfParametersForSetter,
-  diag.wrongSeparatorForPositionalParameter,
-  diag.wrongTerminatorForParameterGroup,
-  diag.assetDirectoryDoesNotExist,
-  diag.assetDoesNotExist,
-  diag.assetFieldNotList,
-  diag.assetMissingPath,
-  diag.assetNotString,
-  diag.assetNotStringOrMap,
-  diag.assetPathNotString,
-  diag.dependenciesFieldNotMap,
-  diag.deprecatedField,
-  diag.flutterFieldNotMap,
-  diag.invalidDependency,
-  diag.invalidPlatformsField,
-  diag.missingDependency,
-  diag.missingName,
-  diag.nameNotString,
-  diag.pathDoesNotExist,
-  diag.pathNotPosix,
-  diag.pathPubspecDoesNotExist,
-  diag.platformValueDisallowed,
-  diag.unknownPlatform,
-  diag.unnecessaryDevDependency,
-  diag.workspaceFieldNotList,
-  diag.workspaceValueNotString,
-  diag.workspaceValueNotSubdirectory,
-  diag.encoding,
-  diag.illegalCharacter,
-  diag.missingDigit,
-  diag.missingHexDigit,
-  diag.missingQuote,
-  diag.unableGetContent,
-  diag.unexpectedDollarInString,
-  diag.unexpectedSeparatorInNumber,
-  diag.unsupportedOperator,
-  diag.unterminatedMultiLineComment,
-  diag.unterminatedStringLiteral,
-  diag.deadNullAwareExpression,
-  diag.invalidNullAwareElement,
-  diag.invalidNullAwareMapEntryKey,
-  diag.invalidNullAwareMapEntryValue,
-  diag.invalidNullAwareOperator,
-  diag.invalidNullAwareOperatorAfterShortCircuit,
-  diag.missingEnumConstantInSwitch,
-  diag.unnecessaryNonNullAssertion,
-  diag.unnecessaryNullAssertPattern,
-  diag.unnecessaryNullCheckPattern,
-  diag.fixme,
-  diag.hack,
-  diag.todo,
-  diag.undone,
-  diag.argumentTypeNotAssignableToErrorHandler,
-  diag.assignmentOfDoNotStore,
-  diag.bodyMightCompleteNormallyCatchError,
-  diag.bodyMightCompleteNormallyNullable,
-  diag.castFromNullableAlwaysFails,
-  diag.castFromNullAlwaysFails,
-  diag.constantPatternNeverMatchesValueType,
-  diag.deadCode,
-  diag.deadCodeCatchFollowingCatch,
-  diag.deadCodeLateWildcardVariableInitializer,
-  diag.deadCodeOnCatchSubtype,
-  diag.deprecatedExportUse,
-  diag.deprecatedExtend,
-  diag.deprecatedExtendsFunction,
-  diag.deprecatedImplement,
-  diag.deprecatedImplementsFunction,
-  diag.deprecatedInstantiate,
-  diag.deprecatedMixin,
-  diag.deprecatedMixinFunction,
-  diag.deprecatedNewInCommentReference,
-  diag.deprecatedOptional,
-  diag.deprecatedSubclass,
-  diag.docDirectiveArgumentWrongFormat,
-  diag.docDirectiveHasExtraArguments,
-  diag.docDirectiveHasUnexpectedNamedArgument,
-  diag.docDirectiveMissingClosingBrace,
-  diag.docDirectiveMissingClosingTag,
-  diag.docDirectiveMissingOneArgument,
-  diag.docDirectiveMissingOpeningTag,
-  diag.docDirectiveMissingThreeArguments,
-  diag.docDirectiveMissingTwoArguments,
-  diag.docDirectiveUnknown,
-  diag.docImportCannotBeDeferred,
-  diag.docImportCannotHaveCombinators,
-  diag.docImportCannotHaveConfigurations,
-  diag.docImportCannotHavePrefix,
-  diag.duplicateExport,
-  diag.duplicateHiddenName,
-  diag.duplicateIgnore,
-  diag.duplicateImport,
-  diag.duplicateShownName,
-  diag.equalElementsInSet,
-  diag.equalKeysInMap,
-  diag.experimentalMemberUse,
-  diag.inferenceFailureOnCollectionLiteral,
-  diag.inferenceFailureOnFunctionInvocation,
-  diag.inferenceFailureOnFunctionReturnType,
-  diag.inferenceFailureOnGenericInvocation,
-  diag.inferenceFailureOnInstanceCreation,
-  diag.inferenceFailureOnUninitializedVariable,
-  diag.inferenceFailureOnUntypedParameter,
-  diag.invalidAnnotationTarget,
-  diag.invalidAwaitNotRequiredAnnotation,
-  diag.invalidDeprecatedExtendAnnotation,
-  diag.invalidDeprecatedImplementAnnotation,
-  diag.invalidDeprecatedInstantiateAnnotation,
-  diag.invalidDeprecatedMixinAnnotation,
-  diag.invalidDeprecatedOptionalAnnotation,
-  diag.invalidDeprecatedSubclassAnnotation,
-  diag.invalidExportOfInternalElement,
-  diag.invalidExportOfInternalElementIndirectly,
-  diag.invalidFactoryMethodDecl,
-  diag.invalidFactoryMethodImpl,
-  diag.invalidInternalAnnotation,
-  diag.invalidLanguageVersionOverrideAtSign,
-  diag.invalidLanguageVersionOverrideEquals,
-  diag.invalidLanguageVersionOverrideGreater,
-  diag.invalidLanguageVersionOverrideLocation,
-  diag.invalidLanguageVersionOverrideLowerCase,
-  diag.invalidLanguageVersionOverrideNumber,
-  diag.invalidLanguageVersionOverridePrefix,
-  diag.invalidLanguageVersionOverrideTrailingCharacters,
-  diag.invalidLanguageVersionOverrideTwoSlashes,
-  diag.invalidLiteralAnnotation,
-  diag.invalidNonVirtualAnnotation,
-  diag.invalidOverrideOfNonVirtualMember,
-  diag.invalidReopenAnnotation,
-  diag.invalidUseOfDoNotSubmitMember,
-  diag.invalidUseOfInternalMember,
-  diag.invalidUseOfProtectedMember,
-  diag.invalidUseOfVisibleForOverridingMember,
-  diag.invalidUseOfVisibleForTemplateMember,
-  diag.invalidUseOfVisibleForTestingMember,
-  diag.invalidVisibilityAnnotation,
-  diag.invalidVisibleForOverridingAnnotation,
-  diag.invalidVisibleOutsideTemplateAnnotation,
-  diag.invalidWidgetPreviewApplication,
-  diag.invalidWidgetPreviewPrivateArgument,
-  diag.missingOverrideOfMustBeOverriddenOne,
-  diag.missingOverrideOfMustBeOverriddenThreePlus,
-  diag.missingOverrideOfMustBeOverriddenTwo,
-  diag.missingRequiredParam,
-  diag.missingRequiredParamWithDetails,
-  diag.mixinOnSealedClass,
-  diag.multipleCombinators,
-  diag.mustBeImmutable,
-  diag.mustCallSuper,
-  diag.nonConstArgumentForConstParameter,
-  diag.nonConstCallToLiteralConstructor,
-  diag.nonConstCallToLiteralConstructorUsingNew,
-  diag.nonNullableEqualsParameter,
-  diag.nullableTypeInCatchClause,
-  diag.nullArgumentToNonNullType,
-  diag.nullCheckAlwaysFails,
-  diag.overrideOnNonOverridingField,
-  diag.overrideOnNonOverridingGetter,
-  diag.overrideOnNonOverridingMethod,
-  diag.overrideOnNonOverridingSetter,
-  diag.patternNeverMatchesValueType,
-  diag.receiverOfTypeNever,
-  diag.redeclareOnNonRedeclaringMember,
-  diag.removedLintUse,
-  diag.replacedLintUse,
-  diag.returnOfDoNotStore,
-  diag.returnOfInvalidTypeFromCatchError,
-  diag.returnTypeInvalidForCatchError,
-  diag.sdkVersionConstructorTearoffs,
-  diag.sdkVersionGtGtGtOperator,
-  diag.sdkVersionSince,
-  diag.strictRawType,
-  diag.subtypeOfSealedClass,
-  diag.textDirectionCodePointInComment,
-  diag.textDirectionCodePointInLiteral,
-  diag.typeCheckIsNotNull,
-  diag.typeCheckIsNull,
-  diag.undefinedHiddenName,
-  diag.undefinedReferencedParameter,
-  diag.undefinedShownName,
   diag.unignorableIgnore,
+  diag.unknownPlatform,
   diag.unnecessaryCast,
   diag.unnecessaryCastPattern,
+  diag.unnecessaryDevDependency,
   diag.unnecessaryFinal,
+  diag.unnecessaryImport,
   diag.unnecessaryNanComparisonFalse,
   diag.unnecessaryNanComparisonTrue,
   diag.unnecessaryNoSuchMethod,
+  diag.unnecessaryNonNullAssertion,
+  diag.unnecessaryNullAssertPattern,
+  diag.unnecessaryNullCheckPattern,
   diag.unnecessaryNullComparisonAlwaysNullFalse,
   diag.unnecessaryNullComparisonAlwaysNullTrue,
   diag.unnecessaryNullComparisonNeverNullFalse,
@@ -1104,8 +1052,20 @@
   diag.unnecessaryTypeCheckFalse,
   diag.unnecessaryTypeCheckTrue,
   diag.unnecessaryWildcardPattern,
+  diag.unqualifiedReferenceToNonLocalStaticMember,
+  diag.unqualifiedReferenceToStaticMemberOfExtendedType,
   diag.unreachableSwitchCase,
   diag.unreachableSwitchDefault,
+  diag.unrecognizedErrorCode,
+  diag.unsupportedChromeOsFeature,
+  diag.unsupportedChromeOsHardware,
+  diag.unsupportedOperator,
+  diag.unsupportedOptionWithLegalValue,
+  diag.unsupportedOptionWithLegalValues,
+  diag.unsupportedOptionWithoutValues,
+  diag.unsupportedValue,
+  diag.unterminatedMultiLineComment,
+  diag.unterminatedStringLiteral,
   diag.unusedCatchClause,
   diag.unusedCatchStack,
   diag.unusedElement,
@@ -1117,7 +1077,47 @@
   diag.unusedResult,
   diag.unusedResultWithMessage,
   diag.unusedShownName,
+  diag.uriDoesNotExist,
   diag.uriDoesNotExistInDocImport,
+  diag.uriHasNotBeenGenerated,
+  diag.uriWithInterpolation,
+  diag.useOfNativeExtension,
+  diag.useOfVoidResult,
+  diag.valuesDeclarationInEnum,
+  diag.varAndType,
+  diag.varAsTypeName,
+  diag.varClass,
+  diag.varEnum,
+  diag.varReturnType,
+  diag.varTypedef,
+  diag.variableLengthArrayNotLast,
+  diag.variablePatternKeywordInDeclarationContext,
+  diag.variableTypeMismatch,
+  diag.voidWithTypeArguments,
+  diag.withBeforeExtends,
+  diag.workspaceFieldNotList,
+  diag.workspaceValueNotString,
+  diag.workspaceValueNotSubdirectory,
+  diag.wrongExplicitTypeParameterVarianceInSuperinterface,
+  diag.wrongNumberOfParametersForOperator,
+  diag.wrongNumberOfParametersForOperatorMinus,
+  diag.wrongNumberOfParametersForSetter,
+  diag.wrongNumberOfTypeArguments,
+  diag.wrongNumberOfTypeArgumentsAnonymousFunction,
+  diag.wrongNumberOfTypeArgumentsConstructor,
+  diag.wrongNumberOfTypeArgumentsDotShorthandConstructor,
+  diag.wrongNumberOfTypeArgumentsEnum,
+  diag.wrongNumberOfTypeArgumentsExtension,
+  diag.wrongNumberOfTypeArgumentsFunction,
+  diag.wrongNumberOfTypeArgumentsMethod,
+  diag.wrongSeparatorForPositionalParameter,
+  diag.wrongTerminatorForParameterGroup,
+  diag.wrongTypeParameterVarianceInSuperinterface,
+  diag.wrongTypeParameterVariancePosition,
+  diag.yieldEachInNonGenerator,
+  diag.yieldEachOfInvalidType,
+  diag.yieldInNonGenerator,
+  diag.yieldOfInvalidType,
 ];
 
 final sharedAnalyzerCodes = <DiagnosticCode>[
diff --git a/pkg/analyzer/tool/messages/generate.dart b/pkg/analyzer/tool/messages/generate.dart
index 0ee7017..a72e878 100644
--- a/pkg/analyzer/tool/messages/generate.dart
+++ b/pkg/analyzer/tool/messages/generate.dart
@@ -230,8 +230,6 @@
     for (var message
         in diagnosticTables.activeMessagesByPackage[AnalyzerDiagnosticPackage
             .analyzer]!) {
-      // TODO(paulberry): after `generateTopLevelConstants` has been changed to
-      // `true`, sort these entries by camelCaseName.
       out.writeln('  ${message.analyzerCode.analyzerCodeReference},');
     }
     out.writeln('];');
diff --git a/pkg/analyzer_utilities/lib/messages.dart b/pkg/analyzer_utilities/lib/messages.dart
index 7a70586..cb3e9cc 100644
--- a/pkg/analyzer_utilities/lib/messages.dart
+++ b/pkg/analyzer_utilities/lib/messages.dart
@@ -416,7 +416,7 @@
   /// A message is considered active is [MessageWithAnalyzerCode.isRemoved] is
   /// `false` and the message is not an [AliasMessage].
   ///
-  /// Each list is sorted by analyzer code.
+  /// Each list is sorted by [AnalyzerCode.camelCaseName].
   final Map<AnalyzerDiagnosticPackage, List<MessageWithAnalyzerCode>>
   activeMessagesByPackage = {};
 
@@ -467,7 +467,7 @@
     sortedSharedDiagnostics.sortBy((e) => e.analyzerCode.camelCaseName);
     sortedFrontEndDiagnostics.sortBy((e) => e.frontEndCode);
     for (var value in activeMessagesByPackage.values) {
-      value.sortBy((e) => e.analyzerCode);
+      value.sortBy((e) => e.analyzerCode.camelCaseName);
     }
   }