From 1bfae529f7c7ef99e5a82cf834494e8f2cd4023b Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Wed, 8 May 2024 18:30:19 +0000
Subject: [PATCH] meta: Sort TargetKinds

Change-Id: I9ecc0ac8050bdac6dd61b8e67e889a57cb0a0fec
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/365622
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
Auto-Submit: Samuel Rawlins <srawlins@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
---
 .../lib/src/test_utilities/mock_packages.dart      |  6 +++---
 .../package_content/meta/lib/meta_meta.dart        | 14 ++++++++++++++
 pkg/meta/lib/meta_meta.dart                        | 14 +++++++-------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkg/analyzer/lib/src/test_utilities/mock_packages.dart b/pkg/analyzer/lib/src/test_utilities/mock_packages.dart
index 8db3012dc2c..5153a480674 100644
--- a/pkg/analyzer/lib/src/test_utilities/mock_packages.dart
+++ b/pkg/analyzer/lib/src/test_utilities/mock_packages.dart
@@ -350,12 +350,12 @@ class TargetKind {
   static const extensionType = TargetKind._('extension types', 'extensionType');
   static const field = TargetKind._('fields', 'field');
   static const function = TargetKind._('top-level functions', 'function');
-  static const optionalParameter =
-      TargetKind._('optional parameters', 'optionalParameter');
   static const library = TargetKind._('libraries', 'library');
   static const getter = TargetKind._('getters', 'getter');
   static const method = TargetKind._('methods', 'method');
   static const mixinType = TargetKind._('mixins', 'mixinType');
+  static const optionalParameter =
+      TargetKind._('optional parameters', 'optionalParameter');
   static const overridableMember =
       TargetKind._('overridable members', 'overridableMember');
   static const parameter = TargetKind._('parameters', 'parameter');
@@ -377,12 +377,12 @@ class TargetKind {
     extensionType,
     field,
     function,
-    overridableMember,
     library,
     getter,
     method,
     mixinType,
     optionalParameter,
+    overridableMember,
     parameter,
     setter,
     topLevelVariable,
diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta_meta.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta_meta.dart
index 6ee58f0b345..5b5765ace51 100644
--- a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta_meta.dart
+++ b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta_meta.dart
@@ -67,6 +67,18 @@ class TargetKind {
   /// Indicates that an annotation is valid on any mixin declaration.
   static const mixinType = TargetKind._('mixins', 'mixinType');
 
+  /// Indicates that an annotation is valid on any optional formal parameter
+  /// declaration, whether it's in a constructor, function (named or anonymous),
+  /// function type, function-typed formal parameter, or method.
+  static const optionalParameter =
+      TargetKind._('optional parameters', 'optionalParameter');
+
+  /// Indicates that an annotation is valid on any overridable instance member
+  /// declaration, whether it's in a class, enum, extension type, or mixin. This
+  /// includes instance fields, getters, setters, methods, and operators.
+  static const overridableMember =
+      TargetKind._('overridable members', 'overridableMember');
+
   /// Indicates that an annotation is valid on any formal parameter declaration,
   /// whether it's in a function, method, constructor, or closure.
   static const parameter = TargetKind._('parameters', 'parameter');
@@ -101,6 +113,8 @@ class TargetKind {
     getter,
     method,
     mixinType,
+    optionalParameter,
+    overridableMember,
     parameter,
     setter,
     topLevelVariable,
diff --git a/pkg/meta/lib/meta_meta.dart b/pkg/meta/lib/meta_meta.dart
index 13a3411efbb..98339cbe658 100644
--- a/pkg/meta/lib/meta_meta.dart
+++ b/pkg/meta/lib/meta_meta.dart
@@ -74,12 +74,6 @@ class TargetKind {
   /// declaration.
   static const function = TargetKind._('top-level functions', 'function');
 
-  /// Indicates that an annotation is valid on any overridable instance member
-  /// declaration, whether it's in a class, enum, extension type, or mixin. This
-  /// includes instance fields, getters, setters, methods, and operators.
-  static const overridableMember =
-      TargetKind._('overridable members', 'overridableMember');
-
   /// Indicates that an annotation is valid on the first directive in a library,
   /// whether that's a `library`, `import`, `export` or `part` directive. This
   /// doesn't include the `part of` directive in a part file.
@@ -104,6 +98,12 @@ class TargetKind {
   static const optionalParameter =
       TargetKind._('optional parameters', 'optionalParameter');
 
+  /// Indicates that an annotation is valid on any overridable instance member
+  /// declaration, whether it's in a class, enum, extension type, or mixin. This
+  /// includes instance fields, getters, setters, methods, and operators.
+  static const overridableMember =
+      TargetKind._('overridable members', 'overridableMember');
+
   /// Indicates that an annotation is valid on any formal parameter declaration,
   /// whether it's in a constructor, function (named or anonymous), function
   /// type, function-typed formal parameter, or method.
@@ -146,12 +146,12 @@ class TargetKind {
     extensionType,
     field,
     function,
-    overridableMember,
     library,
     getter,
     method,
     mixinType,
     optionalParameter,
+    overridableMember,
     parameter,
     setter,
     topLevelVariable,