Rename 'declaring-constructors' to 'primary-constructors' experiment flag. Changed the flag to `primary-constructors` to align with the rest of the feature's public naming. Renamed tests and existing usages of the flag. Bug: https://github.com/dart-lang/sdk/issues/61526 Change-Id: Id649447a50917ba5bcddb49661555889dc81ba14 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/464761 Reviewed-by: Johnni Winther <johnniwinther@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Erik Ernst <eernst@google.com> Reviewed-by: Michael Thomsen <mit@google.com>

diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
index 741e32e..fe51db7 100644
--- a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart

@@ -74,14 +74,6 @@
     experimentReleasedVersion: defaultLanguageVersion,
   ),
 
-  declaringConstructors(
-    name: 'declaring-constructors',
-    isEnabledByDefault: false,
-    isExpired: false,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  ),
-
   digitSeparators(
     name: 'digit-separators',
     isEnabledByDefault: true,
@@ -242,6 +234,14 @@
     experimentReleasedVersion: const Version(3, 0),
   ),
 
+  primaryConstructors(
+    name: 'primary-constructors',
+    isEnabledByDefault: false,
+    isExpired: false,
+    experimentEnabledVersion: defaultLanguageVersion,
+    experimentReleasedVersion: defaultLanguageVersion,
+  ),
+
   privateNamedParameters(
     name: 'private-named-parameters',
     isEnabledByDefault: false,

diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
index 234d12b..33bdccb 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart

@@ -325,8 +325,8 @@
   /// `true` if the 'enhanced-parts' feature is enabled.
   final bool _isEnhancedPartsFeatureEnabled;
 
-  /// `true` if the 'declaring-constructors' feature is enabled.
-  final bool _isDeclaringConstructorsFeatureEnabled;
+  /// `true` if the 'primary-constructors' feature is enabled.
+  final bool _isPrimaryConstructorsFeatureEnabled;
 
   /// `true` if the 'private-named-parameters' feature is enabled.
   final bool _isPrivateNamedParametersEnabled;
@@ -354,8 +354,8 @@
        ),
        _isEnhancedPartsFeatureEnabled = experimentalFeatures
            .isExperimentEnabled(ExperimentalFlag.enhancedParts),
-       _isDeclaringConstructorsFeatureEnabled = experimentalFeatures
-           .isExperimentEnabled(ExperimentalFlag.declaringConstructors),
+       _isPrimaryConstructorsFeatureEnabled = experimentalFeatures
+           .isExperimentEnabled(ExperimentalFlag.primaryConstructors),
        _isPrivateNamedParametersEnabled = experimentalFeatures
            .isExperimentEnabled(ExperimentalFlag.privateNamedParameters);
 
@@ -2215,9 +2215,9 @@
                 codes.codeFunctionTypedParameterVar,
               );
             } else {
-              if (!_isDeclaringConstructorsFeatureEnabled) {
+              if (!_isPrimaryConstructorsFeatureEnabled) {
                 reportExperimentNotEnabled(
-                  ExperimentalFlag.declaringConstructors,
+                  ExperimentalFlag.primaryConstructors,
                   varFinalOrConst,
                   varFinalOrConst,
                 );
@@ -2237,9 +2237,9 @@
             codes.codeFunctionTypedParameterVar,
           );
         } else {
-          if (!_isDeclaringConstructorsFeatureEnabled) {
+          if (!_isPrimaryConstructorsFeatureEnabled) {
             reportExperimentNotEnabled(
-              ExperimentalFlag.declaringConstructors,
+              ExperimentalFlag.primaryConstructors,
               varFinalOrConst,
               varFinalOrConst,
             );
@@ -2258,9 +2258,9 @@
           if (memberKind != MemberKind.PrimaryConstructor) {
             reportRecoverableError(varFinalOrConst, codes.codeTypeAfterVar);
           } else {
-            if (!_isDeclaringConstructorsFeatureEnabled) {
+            if (!_isPrimaryConstructorsFeatureEnabled) {
               reportExperimentNotEnabled(
-                ExperimentalFlag.declaringConstructors,
+                ExperimentalFlag.primaryConstructors,
                 varOrFinal,
                 varOrFinal,
               );
@@ -3072,9 +3072,9 @@
     token = parseClassHeaderOpt(token, beginToken, classKeyword);
     if (token.next!.isA(TokenType.SEMICOLON)) {
       Token semicolonToken = token = token.next!;
-      if (!_isDeclaringConstructorsFeatureEnabled) {
+      if (!_isPrimaryConstructorsFeatureEnabled) {
         reportExperimentNotEnabled(
-          ExperimentalFlag.declaringConstructors,
+          ExperimentalFlag.primaryConstructors,
           semicolonToken,
           semicolonToken,
         );
@@ -3787,9 +3787,9 @@
     token = parseClassOrMixinOrEnumImplementsOpt(token);
     if (token.next!.isA(TokenType.SEMICOLON)) {
       Token semicolonToken = token = token.next!;
-      if (!_isDeclaringConstructorsFeatureEnabled) {
+      if (!_isPrimaryConstructorsFeatureEnabled) {
         reportExperimentNotEnabled(
-          ExperimentalFlag.declaringConstructors,
+          ExperimentalFlag.primaryConstructors,
           semicolonToken,
           semicolonToken,
         );
@@ -5209,9 +5209,9 @@
     bool nameIsRecovered = false;
     if (next.isA(Keyword.NEW)) {
       newToken = next;
-      if (!_isDeclaringConstructorsFeatureEnabled) {
+      if (!_isPrimaryConstructorsFeatureEnabled) {
         reportExperimentNotEnabled(
-          ExperimentalFlag.declaringConstructors,
+          ExperimentalFlag.primaryConstructors,
           newToken,
           newToken,
         );
@@ -5253,7 +5253,7 @@
           );
           listener.endMember();
           return token;
-        } else if (_isDeclaringConstructorsFeatureEnabled &&
+        } else if (_isPrimaryConstructorsFeatureEnabled &&
             next2.isA(TokenType.OPEN_PAREN)) {
           if (typeInfo == noType &&
               covariantToken == null &&
@@ -5350,9 +5350,9 @@
         if (next2.isA(TokenType.COLON) ||
             next2.isA(TokenType.SEMICOLON) ||
             next2.isA(TokenType.OPEN_CURLY_BRACKET)) {
-          if (!_isDeclaringConstructorsFeatureEnabled) {
+          if (!_isPrimaryConstructorsFeatureEnabled) {
             reportExperimentNotEnabled(
-              ExperimentalFlag.declaringConstructors,
+              ExperimentalFlag.primaryConstructors,
               next,
               next,
             );

diff --git a/pkg/_fe_analyzer_shared/messages.yaml b/pkg/_fe_analyzer_shared/messages.yaml
index 74578c1..4d8786f 100644
--- a/pkg/_fe_analyzer_shared/messages.yaml
+++ b/pkg/_fe_analyzer_shared/messages.yaml

@@ -2446,7 +2446,7 @@
   correctionMessage: "Try removing the class name prefix from the qualified name or removing the 'new' keyword."
   analyzerCode: ParserErrorCode.NEW_CONSTRUCTOR_QUALIFIED_NAME
   hasPublishedDocs: false
-  experiments: declaring-constructors
+  experiments: primary-constructors
   script: |
     class C {
       new C.named();
@@ -2459,7 +2459,7 @@
   correctionMessage: "Try removing the second 'new' or changing it to a different name."
   analyzerCode: ParserErrorCode.NEW_CONSTRUCTOR_NEW_NAME
   hasPublishedDocs: false
-  experiments: declaring-constructors
+  experiments: primary-constructors
   script: |
     class C {
       new new();
@@ -2472,7 +2472,7 @@
   correctionMessage: "Try removing the 'new' keyword or changing it to a different name."
   analyzerCode: ParserErrorCode.FACTORY_CONSTRUCTOR_NEW_NAME
   hasPublishedDocs: false
-  experiments: declaring-constructors
+  experiments: primary-constructors
   script: |
     class C {
       factory new() => throw '';

diff --git a/pkg/analysis_server/test/src/services/correction/fix/make_final_test.dart b/pkg/analysis_server/test/src/services/correction/fix/make_final_test.dart
index 7fa344c..751324a 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/make_final_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/make_final_test.dart

@@ -467,8 +467,7 @@
   @override
   List<String> get experiments => super.experiments
       .where(
-        (experiment) =>
-            experiment != Feature.declaring_constructors.enableString,
+        (experiment) => experiment != Feature.primary_constructors.enableString,
       )
       .toList();
 
@@ -496,8 +495,7 @@
   @override
   List<String> get experiments => super.experiments
       .where(
-        (experiment) =>
-            experiment != Feature.declaring_constructors.enableString,
+        (experiment) => experiment != Feature.primary_constructors.enableString,
       )
       .toList();
 

diff --git a/pkg/analyzer/api.txt b/pkg/analyzer/api.txt
index 7072428..33ca027 100644
--- a/pkg/analyzer/api.txt
+++ b/pkg/analyzer/api.txt

@@ -400,7 +400,6 @@
     constant_update_2018 (static getter: ExperimentalFeature)
     constructor_tearoffs (static getter: ExperimentalFeature)
     control_flow_collections (static getter: ExperimentalFeature)
-    declaring_constructors (static getter: ExperimentalFeature)
     digit_separators (static getter: ExperimentalFeature)
     dot_shorthands (static getter: ExperimentalFeature)
     enhanced_enums (static getter: ExperimentalFeature)
@@ -420,6 +419,7 @@
     nonfunction_type_aliases (static getter: ExperimentalFeature)
     null_aware_elements (static getter: ExperimentalFeature)
     patterns (static getter: ExperimentalFeature)
+    primary_constructors (static getter: ExperimentalFeature)
     private_named_parameters (static getter: ExperimentalFeature)
     records (static getter: ExperimentalFeature)
     sealed_class (static getter: ExperimentalFeature)

diff --git a/pkg/analyzer/lib/dart/analysis/features.dart b/pkg/analyzer/lib/dart/analysis/features.dart
index 0d6bb84..1dedfe1 100644
--- a/pkg/analyzer/lib/dart/analysis/features.dart
+++ b/pkg/analyzer/lib/dart/analysis/features.dart

@@ -18,10 +18,6 @@
   /// Feature information for class modifiers.
   static final class_modifiers = ExperimentalFeatures.class_modifiers;
 
-  /// Feature information for declaring constructors.
-  static final declaring_constructors =
-      ExperimentalFeatures.declaring_constructors;
-
   /// Feature information for number literal digit separators.
   static final digit_separators = ExperimentalFeatures.digit_separators;
 
@@ -84,6 +80,9 @@
   /// Feature information for patterns.
   static final patterns = ExperimentalFeatures.patterns;
 
+  /// Feature information for primary constructors.
+  static final primary_constructors = ExperimentalFeatures.primary_constructors;
+
   /// Feature information for private named parameters.
   static final private_named_parameters =
       ExperimentalFeatures.private_named_parameters;

diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index 415569a..fea0e67 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -108,7 +108,7 @@
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 587;
+  static const int DATA_VERSION = 588;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart
index d7ea7a5..1c08b8d 100644
--- a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart

@@ -25,8 +25,6 @@
   EnableString.control_flow_collections:
       ExperimentalFeatures.control_flow_collections,
   EnableString.data_assets: ExperimentalFeatures.data_assets,
-  EnableString.declaring_constructors:
-      ExperimentalFeatures.declaring_constructors,
   EnableString.digit_separators: ExperimentalFeatures.digit_separators,
   EnableString.dot_shorthands: ExperimentalFeatures.dot_shorthands,
   EnableString.enhanced_enums: ExperimentalFeatures.enhanced_enums,
@@ -50,6 +48,7 @@
       ExperimentalFeatures.nonfunction_type_aliases,
   EnableString.null_aware_elements: ExperimentalFeatures.null_aware_elements,
   EnableString.patterns: ExperimentalFeatures.patterns,
+  EnableString.primary_constructors: ExperimentalFeatures.primary_constructors,
   EnableString.private_named_parameters:
       ExperimentalFeatures.private_named_parameters,
   EnableString.record_use: ExperimentalFeatures.record_use,
@@ -86,8 +85,6 @@
   shared.ExperimentalFlag.controlFlowCollections =>
     ExperimentalFeatures.control_flow_collections,
   shared.ExperimentalFlag.dataAssets => ExperimentalFeatures.data_assets,
-  shared.ExperimentalFlag.declaringConstructors =>
-    ExperimentalFeatures.declaring_constructors,
   shared.ExperimentalFlag.digitSeparators =>
     ExperimentalFeatures.digit_separators,
   shared.ExperimentalFlag.dotShorthands => ExperimentalFeatures.dot_shorthands,
@@ -120,6 +117,8 @@
   shared.ExperimentalFlag.nullAwareElements =>
     ExperimentalFeatures.null_aware_elements,
   shared.ExperimentalFlag.patterns => ExperimentalFeatures.patterns,
+  shared.ExperimentalFlag.primaryConstructors =>
+    ExperimentalFeatures.primary_constructors,
   shared.ExperimentalFlag.privateNamedParameters =>
     ExperimentalFeatures.private_named_parameters,
   shared.ExperimentalFlag.recordUse => ExperimentalFeatures.record_use,
@@ -173,9 +172,6 @@
   /// String to enable the experiment "data-assets"
   static const String data_assets = 'data-assets';
 
-  /// String to enable the experiment "declaring-constructors"
-  static const String declaring_constructors = 'declaring-constructors';
-
   /// String to enable the experiment "digit-separators"
   static const String digit_separators = 'digit-separators';
 
@@ -236,6 +232,9 @@
   /// String to enable the experiment "patterns"
   static const String patterns = 'patterns';
 
+  /// String to enable the experiment "primary-constructors"
+  static const String primary_constructors = 'primary-constructors';
+
   /// String to enable the experiment "private-named-parameters"
   static const String private_named_parameters = 'private-named-parameters';
 
@@ -373,19 +372,8 @@
     channels: ["main", "dev"],
   );
 
-  static final declaring_constructors = ExperimentalFeature(
-    index: 8,
-    enableString: EnableString.declaring_constructors,
-    isEnabledByDefault: IsEnabledByDefault.declaring_constructors,
-    isExpired: IsExpired.declaring_constructors,
-    documentation: 'Less verbose constructors.',
-    experimentalReleaseVersion: null,
-    releaseVersion: null,
-    channels: ["stable", "beta", "dev", "main"],
-  );
-
   static final digit_separators = ExperimentalFeature(
-    index: 9,
+    index: 8,
     enableString: EnableString.digit_separators,
     isEnabledByDefault: IsEnabledByDefault.digit_separators,
     isExpired: IsExpired.digit_separators,
@@ -396,7 +384,7 @@
   );
 
   static final dot_shorthands = ExperimentalFeature(
-    index: 10,
+    index: 9,
     enableString: EnableString.dot_shorthands,
     isEnabledByDefault: IsEnabledByDefault.dot_shorthands,
     isExpired: IsExpired.dot_shorthands,
@@ -407,7 +395,7 @@
   );
 
   static final enhanced_enums = ExperimentalFeature(
-    index: 11,
+    index: 10,
     enableString: EnableString.enhanced_enums,
     isEnabledByDefault: IsEnabledByDefault.enhanced_enums,
     isExpired: IsExpired.enhanced_enums,
@@ -418,7 +406,7 @@
   );
 
   static final enhanced_parts = ExperimentalFeature(
-    index: 12,
+    index: 11,
     enableString: EnableString.enhanced_parts,
     isEnabledByDefault: IsEnabledByDefault.enhanced_parts,
     isExpired: IsExpired.enhanced_parts,
@@ -429,7 +417,7 @@
   );
 
   static final extension_methods = ExperimentalFeature(
-    index: 13,
+    index: 12,
     enableString: EnableString.extension_methods,
     isEnabledByDefault: IsEnabledByDefault.extension_methods,
     isExpired: IsExpired.extension_methods,
@@ -440,7 +428,7 @@
   );
 
   static final generic_metadata = ExperimentalFeature(
-    index: 14,
+    index: 13,
     enableString: EnableString.generic_metadata,
     isEnabledByDefault: IsEnabledByDefault.generic_metadata,
     isExpired: IsExpired.generic_metadata,
@@ -452,7 +440,7 @@
   );
 
   static final getter_setter_error = ExperimentalFeature(
-    index: 15,
+    index: 14,
     enableString: EnableString.getter_setter_error,
     isEnabledByDefault: IsEnabledByDefault.getter_setter_error,
     isExpired: IsExpired.getter_setter_error,
@@ -464,7 +452,7 @@
   );
 
   static final inference_update_1 = ExperimentalFeature(
-    index: 16,
+    index: 15,
     enableString: EnableString.inference_update_1,
     isEnabledByDefault: IsEnabledByDefault.inference_update_1,
     isExpired: IsExpired.inference_update_1,
@@ -476,7 +464,7 @@
   );
 
   static final inference_update_2 = ExperimentalFeature(
-    index: 17,
+    index: 16,
     enableString: EnableString.inference_update_2,
     isEnabledByDefault: IsEnabledByDefault.inference_update_2,
     isExpired: IsExpired.inference_update_2,
@@ -487,7 +475,7 @@
   );
 
   static final inference_update_3 = ExperimentalFeature(
-    index: 18,
+    index: 17,
     enableString: EnableString.inference_update_3,
     isEnabledByDefault: IsEnabledByDefault.inference_update_3,
     isExpired: IsExpired.inference_update_3,
@@ -499,7 +487,7 @@
   );
 
   static final inference_update_4 = ExperimentalFeature(
-    index: 19,
+    index: 18,
     enableString: EnableString.inference_update_4,
     isEnabledByDefault: IsEnabledByDefault.inference_update_4,
     isExpired: IsExpired.inference_update_4,
@@ -510,7 +498,7 @@
   );
 
   static final inference_using_bounds = ExperimentalFeature(
-    index: 20,
+    index: 19,
     enableString: EnableString.inference_using_bounds,
     isEnabledByDefault: IsEnabledByDefault.inference_using_bounds,
     isExpired: IsExpired.inference_using_bounds,
@@ -522,7 +510,7 @@
   );
 
   static final inline_class = ExperimentalFeature(
-    index: 21,
+    index: 20,
     enableString: EnableString.inline_class,
     isEnabledByDefault: IsEnabledByDefault.inline_class,
     isExpired: IsExpired.inline_class,
@@ -533,7 +521,7 @@
   );
 
   static final macros = ExperimentalFeature(
-    index: 22,
+    index: 21,
     enableString: EnableString.macros,
     isEnabledByDefault: IsEnabledByDefault.macros,
     isExpired: IsExpired.macros,
@@ -544,7 +532,7 @@
   );
 
   static final named_arguments_anywhere = ExperimentalFeature(
-    index: 23,
+    index: 22,
     enableString: EnableString.named_arguments_anywhere,
     isEnabledByDefault: IsEnabledByDefault.named_arguments_anywhere,
     isExpired: IsExpired.named_arguments_anywhere,
@@ -555,7 +543,7 @@
   );
 
   static final native_assets = ExperimentalFeature(
-    index: 24,
+    index: 23,
     enableString: EnableString.native_assets,
     isEnabledByDefault: IsEnabledByDefault.native_assets,
     isExpired: IsExpired.native_assets,
@@ -566,7 +554,7 @@
   );
 
   static final non_nullable = ExperimentalFeature(
-    index: 25,
+    index: 24,
     enableString: EnableString.non_nullable,
     isEnabledByDefault: IsEnabledByDefault.non_nullable,
     isExpired: IsExpired.non_nullable,
@@ -577,7 +565,7 @@
   );
 
   static final nonfunction_type_aliases = ExperimentalFeature(
-    index: 26,
+    index: 25,
     enableString: EnableString.nonfunction_type_aliases,
     isEnabledByDefault: IsEnabledByDefault.nonfunction_type_aliases,
     isExpired: IsExpired.nonfunction_type_aliases,
@@ -588,7 +576,7 @@
   );
 
   static final null_aware_elements = ExperimentalFeature(
-    index: 27,
+    index: 26,
     enableString: EnableString.null_aware_elements,
     isEnabledByDefault: IsEnabledByDefault.null_aware_elements,
     isExpired: IsExpired.null_aware_elements,
@@ -599,7 +587,7 @@
   );
 
   static final patterns = ExperimentalFeature(
-    index: 28,
+    index: 27,
     enableString: EnableString.patterns,
     isEnabledByDefault: IsEnabledByDefault.patterns,
     isExpired: IsExpired.patterns,
@@ -609,6 +597,17 @@
     channels: ["stable", "beta", "dev", "main"],
   );
 
+  static final primary_constructors = ExperimentalFeature(
+    index: 28,
+    enableString: EnableString.primary_constructors,
+    isEnabledByDefault: IsEnabledByDefault.primary_constructors,
+    isExpired: IsExpired.primary_constructors,
+    documentation: 'Less verbose constructors.',
+    experimentalReleaseVersion: null,
+    releaseVersion: null,
+    channels: ["stable", "beta", "dev", "main"],
+  );
+
   static final private_named_parameters = ExperimentalFeature(
     index: 29,
     enableString: EnableString.private_named_parameters,
@@ -806,9 +805,6 @@
   /// Default state of the experiment "data-assets"
   static const bool data_assets = false;
 
-  /// Default state of the experiment "declaring-constructors"
-  static const bool declaring_constructors = false;
-
   /// Default state of the experiment "digit-separators"
   static const bool digit_separators = true;
 
@@ -869,6 +865,9 @@
   /// Default state of the experiment "patterns"
   static const bool patterns = true;
 
+  /// Default state of the experiment "primary-constructors"
+  static const bool primary_constructors = false;
+
   /// Default state of the experiment "private-named-parameters"
   static const bool private_named_parameters = false;
 
@@ -943,9 +942,6 @@
   /// Expiration status of the experiment "data-assets"
   static const bool data_assets = false;
 
-  /// Expiration status of the experiment "declaring-constructors"
-  static const bool declaring_constructors = false;
-
   /// Expiration status of the experiment "digit-separators"
   static const bool digit_separators = true;
 
@@ -1006,6 +1002,9 @@
   /// Expiration status of the experiment "patterns"
   static const bool patterns = true;
 
+  /// Expiration status of the experiment "primary-constructors"
+  static const bool primary_constructors = false;
+
   /// Expiration status of the experiment "private-named-parameters"
   static const bool private_named_parameters = false;
 
@@ -1081,10 +1080,6 @@
   /// Current state for the flag "data-assets"
   bool get data_assets => isEnabled(ExperimentalFeatures.data_assets);
 
-  /// Current state for the flag "declaring-constructors"
-  bool get declaring_constructors =>
-      isEnabled(ExperimentalFeatures.declaring_constructors);
-
   /// Current state for the flag "digit-separators"
   bool get digit_separators => isEnabled(ExperimentalFeatures.digit_separators);
 
@@ -1155,6 +1150,10 @@
   /// Current state for the flag "patterns"
   bool get patterns => isEnabled(ExperimentalFeatures.patterns);
 
+  /// Current state for the flag "primary-constructors"
+  bool get primary_constructors =>
+      isEnabled(ExperimentalFeatures.primary_constructors);
+
   /// Current state for the flag "private-named-parameters"
   bool get private_named_parameters =>
       isEnabled(ExperimentalFeatures.private_named_parameters);

diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart
index ac32960..01b5ea8 100644
--- a/pkg/analyzer/lib/src/fasta/ast_builder.dart
+++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -2833,7 +2833,7 @@
             );
         }
         if (firstFormalParameter.keyword case var keyword?) {
-          if (_featureSet.isEnabled(Feature.declaring_constructors)) {
+          if (_featureSet.isEnabled(Feature.primary_constructors)) {
             switch (keyword.keyword) {
               case Keyword.CONST:
               case Keyword.FINAL:
@@ -2917,9 +2917,9 @@
         ),
       );
     } else {
-      if (!_featureSet.isEnabled(Feature.declaring_constructors)) {
+      if (!_featureSet.isEnabled(Feature.primary_constructors)) {
         _reportFeatureNotEnabled(
-          feature: Feature.declaring_constructors,
+          feature: Feature.primary_constructors,
           startToken: beginToken,
         );
       }
@@ -6139,7 +6139,7 @@
       case null:
         break;
       case SimpleIdentifierImpl():
-        if (_featureSet.isEnabled(Feature.declaring_constructors)) {
+        if (_featureSet.isEnabled(Feature.primary_constructors)) {
           // Consider a factory constructor declaration of the form
           // `factory C(...` optionally starting with zero or more of the
           // modifiers `const`, `augment`, or `external`. Assume that `C` is

diff --git a/pkg/analyzer_testing/lib/experiments/experiments.dart b/pkg/analyzer_testing/lib/experiments/experiments.dart
index 4298902..81d7c94 100644
--- a/pkg/analyzer_testing/lib/experiments/experiments.dart
+++ b/pkg/analyzer_testing/lib/experiments/experiments.dart

@@ -16,9 +16,9 @@
 /// whether a given flag is already included.
 List<String> experimentsForTests = [
   Feature.augmentations.enableString,
-  Feature.declaring_constructors.enableString,
   Feature.enhanced_parts.enableString,
   Feature.macros.enableString,
+  Feature.primary_constructors.enableString,
   Feature.private_named_parameters.enableString,
   Feature.static_extensions.enableString,
   Feature.variance.enableString,

diff --git a/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart b/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart
index 7e06b38..c3e550a 100644
--- a/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart
+++ b/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart

@@ -134,15 +134,6 @@
     experimentReleasedVersion: defaultLanguageVersion,
   );
 
-  static const ExperimentalFlag declaringConstructors = const ExperimentalFlag(
-    name: 'declaring-constructors',
-    isEnabledByDefault: false,
-    isExpired: false,
-    enabledVersion: defaultLanguageVersion,
-    experimentEnabledVersion: defaultLanguageVersion,
-    experimentReleasedVersion: defaultLanguageVersion,
-  );
-
   static const ExperimentalFlag digitSeparators = const ExperimentalFlag(
     name: 'digit-separators',
     isEnabledByDefault: true,
@@ -323,6 +314,15 @@
     experimentReleasedVersion: const Version(3, 0),
   );
 
+  static const ExperimentalFlag primaryConstructors = const ExperimentalFlag(
+    name: 'primary-constructors',
+    isEnabledByDefault: false,
+    isExpired: false,
+    enabledVersion: defaultLanguageVersion,
+    experimentEnabledVersion: defaultLanguageVersion,
+    experimentReleasedVersion: defaultLanguageVersion,
+  );
+
   static const ExperimentalFlag privateNamedParameters = const ExperimentalFlag(
     name: 'private-named-parameters',
     isEnabledByDefault: false,
@@ -561,10 +561,6 @@
   GlobalFeature get dataAssets =>
       _dataAssets ??= _computeGlobalFeature(ExperimentalFlag.dataAssets);
 
-  GlobalFeature? _declaringConstructors;
-  GlobalFeature get declaringConstructors => _declaringConstructors ??=
-      _computeGlobalFeature(ExperimentalFlag.declaringConstructors);
-
   GlobalFeature? _digitSeparators;
   GlobalFeature get digitSeparators => _digitSeparators ??=
       _computeGlobalFeature(ExperimentalFlag.digitSeparators);
@@ -645,6 +641,10 @@
   GlobalFeature get patterns =>
       _patterns ??= _computeGlobalFeature(ExperimentalFlag.patterns);
 
+  GlobalFeature? _primaryConstructors;
+  GlobalFeature get primaryConstructors => _primaryConstructors ??=
+      _computeGlobalFeature(ExperimentalFlag.primaryConstructors);
+
   GlobalFeature? _privateNamedParameters;
   GlobalFeature get privateNamedParameters => _privateNamedParameters ??=
       _computeGlobalFeature(ExperimentalFlag.privateNamedParameters);
@@ -789,14 +789,6 @@
         libraryVersion,
       );
 
-  LibraryFeature? _declaringConstructors;
-  LibraryFeature get declaringConstructors =>
-      _declaringConstructors ??= globalFeatures._computeLibraryFeature(
-        ExperimentalFlag.declaringConstructors,
-        canonicalUri,
-        libraryVersion,
-      );
-
   LibraryFeature? _digitSeparators;
   LibraryFeature get digitSeparators =>
       _digitSeparators ??= globalFeatures._computeLibraryFeature(
@@ -957,6 +949,14 @@
         libraryVersion,
       );
 
+  LibraryFeature? _primaryConstructors;
+  LibraryFeature get primaryConstructors =>
+      _primaryConstructors ??= globalFeatures._computeLibraryFeature(
+        ExperimentalFlag.primaryConstructors,
+        canonicalUri,
+        libraryVersion,
+      );
+
   LibraryFeature? _privateNamedParameters;
   LibraryFeature get privateNamedParameters =>
       _privateNamedParameters ??= globalFeatures._computeLibraryFeature(
@@ -1098,8 +1098,6 @@
         return controlFlowCollections;
       case shared.ExperimentalFlag.dataAssets:
         return dataAssets;
-      case shared.ExperimentalFlag.declaringConstructors:
-        return declaringConstructors;
       case shared.ExperimentalFlag.digitSeparators:
         return digitSeparators;
       case shared.ExperimentalFlag.dotShorthands:
@@ -1140,6 +1138,8 @@
         return nullAwareElements;
       case shared.ExperimentalFlag.patterns:
         return patterns;
+      case shared.ExperimentalFlag.primaryConstructors:
+        return primaryConstructors;
       case shared.ExperimentalFlag.privateNamedParameters:
         return privateNamedParameters;
       case shared.ExperimentalFlag.recordUse:
@@ -1194,8 +1194,6 @@
       return ExperimentalFlag.controlFlowCollections;
     case "data-assets":
       return ExperimentalFlag.dataAssets;
-    case "declaring-constructors":
-      return ExperimentalFlag.declaringConstructors;
     case "digit-separators":
       return ExperimentalFlag.digitSeparators;
     case "dot-shorthands":
@@ -1236,6 +1234,8 @@
       return ExperimentalFlag.nullAwareElements;
     case "patterns":
       return ExperimentalFlag.patterns;
+    case "primary-constructors":
+      return ExperimentalFlag.primaryConstructors;
     case "private-named-parameters":
       return ExperimentalFlag.privateNamedParameters;
     case "record-use":
@@ -1288,8 +1288,6 @@
   ExperimentalFlag.controlFlowCollections:
       ExperimentalFlag.controlFlowCollections.isEnabledByDefault,
   ExperimentalFlag.dataAssets: ExperimentalFlag.dataAssets.isEnabledByDefault,
-  ExperimentalFlag.declaringConstructors:
-      ExperimentalFlag.declaringConstructors.isEnabledByDefault,
   ExperimentalFlag.digitSeparators:
       ExperimentalFlag.digitSeparators.isEnabledByDefault,
   ExperimentalFlag.dotShorthands:
@@ -1326,6 +1324,8 @@
   ExperimentalFlag.nullAwareElements:
       ExperimentalFlag.nullAwareElements.isEnabledByDefault,
   ExperimentalFlag.patterns: ExperimentalFlag.patterns.isEnabledByDefault,
+  ExperimentalFlag.primaryConstructors:
+      ExperimentalFlag.primaryConstructors.isEnabledByDefault,
   ExperimentalFlag.privateNamedParameters:
       ExperimentalFlag.privateNamedParameters.isEnabledByDefault,
   ExperimentalFlag.recordUse: ExperimentalFlag.recordUse.isEnabledByDefault,
@@ -1373,8 +1373,6 @@
   shared.ExperimentalFlag.controlFlowCollections =>
     ExperimentalFlag.controlFlowCollections,
   shared.ExperimentalFlag.dataAssets => ExperimentalFlag.dataAssets,
-  shared.ExperimentalFlag.declaringConstructors =>
-    ExperimentalFlag.declaringConstructors,
   shared.ExperimentalFlag.digitSeparators => ExperimentalFlag.digitSeparators,
   shared.ExperimentalFlag.dotShorthands => ExperimentalFlag.dotShorthands,
   shared.ExperimentalFlag.enhancedEnums => ExperimentalFlag.enhancedEnums,
@@ -1400,6 +1398,8 @@
   shared.ExperimentalFlag.nullAwareElements =>
     ExperimentalFlag.nullAwareElements,
   shared.ExperimentalFlag.patterns => ExperimentalFlag.patterns,
+  shared.ExperimentalFlag.primaryConstructors =>
+    ExperimentalFlag.primaryConstructors,
   shared.ExperimentalFlag.privateNamedParameters =>
     ExperimentalFlag.privateNamedParameters,
   shared.ExperimentalFlag.recordUse => ExperimentalFlag.recordUse,

diff --git a/pkg/front_end/lib/src/source/diet_listener.dart b/pkg/front_end/lib/src/source/diet_listener.dart
index 2d81c24..365939b 100644
--- a/pkg/front_end/lib/src/source/diet_listener.dart
+++ b/pkg/front_end/lib/src/source/diet_listener.dart

@@ -1199,7 +1199,7 @@
     assert(
       checkState(beginToken, [/* metadata token */ ValueKinds.TokenOrNull]),
     );
-    // TODO(declaring-constructors): Implement primary constructor body.
+    // TODO(primary-constructors): Implement primary constructor body.
     pop() as Token?;
     checkEmpty(beginToken.charOffset);
   }

diff --git a/pkg/front_end/lib/src/source/fragment_factory_impl.dart b/pkg/front_end/lib/src/source/fragment_factory_impl.dart
index 4704087..1292225 100644
--- a/pkg/front_end/lib/src/source/fragment_factory_impl.dart
+++ b/pkg/front_end/lib/src/source/fragment_factory_impl.dart

@@ -1817,7 +1817,7 @@
         // Erroneous case reported in the parser, normalize `Class`.
         name = '';
         fullName = className;
-      } else if (isFactory && libraryFeatures.declaringConstructors.isEnabled) {
+      } else if (isFactory && libraryFeatures.primaryConstructors.isEnabled) {
         fullName = '$className.$name';
       } else {
         _problemReporting.addProblem(

diff --git a/pkg/front_end/lib/src/source/outline_builder.dart b/pkg/front_end/lib/src/source/outline_builder.dart
index 42a71bd..2074c80 100644
--- a/pkg/front_end/lib/src/source/outline_builder.dart
+++ b/pkg/front_end/lib/src/source/outline_builder.dart

@@ -1839,7 +1839,7 @@
 
     if (!forExtensionType) {
       reportIfNotEnabled(
-        libraryFeatures.declaringConstructors,
+        libraryFeatures.primaryConstructors,
         beginToken.charOffset,
         noLength,
       );
@@ -1987,7 +1987,7 @@
       ]),
     );
 
-    // TODO(declaring-constructors): Implement primary constructor body.
+    // TODO(primary-constructors): Implement primary constructor body.
     // ignore: unused_local_variable
     MethodBody bodyKind = pop() as MethodBody;
     // ignore: unused_local_variable

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/folder.options b/pkg/front_end/parser_testcases/declaring_constructors/folder.options
deleted file mode 100644
index f312fd4..0000000
--- a/pkg/front_end/parser_testcases/declaring_constructors/folder.options
+++ /dev/null

@@ -1 +0,0 @@
---enable-experiment=declaring-constructors

diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect
index 834a92c..9b24767 100644
--- a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect
+++ b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.expect

@@ -12,7 +12,7 @@
   C.constructor_field_initializer() : this.new = null;
                                            ^^^
 
-parser/general/new_as_identifier:16:44: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/general/new_as_identifier:16:44: This requires the experimental 'primary-constructors' language feature to be enabled.
   C.constructor_field_initializer() : this.new = null;
                                            ^^^
 
@@ -95,7 +95,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType(})
             handleNoIdentifier(new, methodDeclaration)

diff --git a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect
index c031088..7727b9a 100644
--- a/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/general/new_as_identifier.dart.intertwined.expect

@@ -155,8 +155,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType(})

diff --git a/pkg/front_end/parser_testcases/inline_class/no_body.dart.expect b/pkg/front_end/parser_testcases/inline_class/no_body.dart.expect
index b4e82fd..ee76929 100644
--- a/pkg/front_end/parser_testcases/inline_class/no_body.dart.expect
+++ b/pkg/front_end/parser_testcases/inline_class/no_body.dart.expect

@@ -1,6 +1,6 @@
 Problems reported:
 
-parser/inline_class/no_body:1:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/inline_class/no_body:1:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C;
        ^
 
@@ -20,15 +20,15 @@
 extension E on int;
                   ^
 
-parser/inline_class/no_body:4:26: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/inline_class/no_body:4:26: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET1(int i);
                          ^
 
-parser/inline_class/no_body:5:41: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/inline_class/no_body:5:41: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET2(int i) implements Foo;
                                         ^
 
-parser/inline_class/no_body:6:46: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/inline_class/no_body:6:46: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET3(int i) implements Foo, Bar;
                                              ^
 
@@ -45,7 +45,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -110,7 +110,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor((, null, false, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -136,7 +136,7 @@
       handleNoTypeArguments(;)
       handleType(Foo, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -165,7 +165,7 @@
       handleNoTypeArguments(;)
       handleType(Bar, null)
       handleImplements(implements, 2)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)

diff --git a/pkg/front_end/parser_testcases/inline_class/no_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/inline_class/no_body.dart.intertwined.expect
index 6dcbe64..2110573 100644
--- a/pkg/front_end/parser_testcases/inline_class/no_body.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/inline_class/no_body.dart.intertwined.expect

@@ -25,8 +25,8 @@
             parseClassOrMixinOrEnumImplementsOpt(C)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -145,8 +145,8 @@
             listener: endPrimaryConstructor((, null, false, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -184,8 +184,8 @@
             listener: handleNoTypeArguments(;)
             listener: handleType(Foo, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -226,8 +226,8 @@
             listener: handleNoTypeArguments(;)
             listener: handleType(Bar, null)
             listener: handleImplements(implements, 2)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.expect
similarity index 91%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.expect
index 0466e9b..9c50c94 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.expect

@@ -1,26 +1,26 @@
 Problems reported:
 
-parser/declaring_constructors/class_primary_constructor_body_error:2:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/class_primary_constructor_body_error:2:3: 'this' can't be used as an identifier because it's a keyword.
   this() {}
   ^^^^
 
-parser/declaring_constructors/class_primary_constructor_body_error:6:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/class_primary_constructor_body_error:6:3: 'this' can't be used as an identifier because it's a keyword.
   this(int x) : assert(1 > 2) {}
   ^^^^
 
-parser/declaring_constructors/class_primary_constructor_body_error:6:3: The name of a constructor must match the name of the enclosing class.
+parser/primary_constructors/class_primary_constructor_body_error:6:3: The name of a constructor must match the name of the enclosing class.
   this(int x) : assert(1 > 2) {}
   ^^^^
 
-parser/declaring_constructors/class_primary_constructor_body_error:10:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/class_primary_constructor_body_error:10:3: 'this' can't be used as an identifier because it's a keyword.
   this();
   ^^^^
 
-parser/declaring_constructors/class_primary_constructor_body_error:14:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/class_primary_constructor_body_error:14:3: 'this' can't be used as an identifier because it's a keyword.
   this(int x) : assert(1 > 2);
   ^^^^
 
-parser/declaring_constructors/class_primary_constructor_body_error:14:3: The name of a constructor must match the name of the enclosing class.
+parser/primary_constructors/class_primary_constructor_body_error:14:3: The name of a constructor must match the name of the enclosing class.
   this(int x) : assert(1 > 2);
   ^^^^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_body_error.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_body_error.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.expect
similarity index 91%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.expect
index ced164c..7b882bc 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.expect

@@ -1,58 +1,58 @@
 Problems reported:
 
-parser/declaring_constructors/class_primary_constructor_error:1:11: Named parameter lists cannot be empty.
+parser/primary_constructors/class_primary_constructor_error:1:11: Named parameter lists cannot be empty.
 class C( {}
           ^
 
-parser/declaring_constructors/class_primary_constructor_error:2:1: Expected ')' before this.
+parser/primary_constructors/class_primary_constructor_error:2:1: Expected ')' before this.
 class C) {}
 ^^^^^
 
-parser/declaring_constructors/class_primary_constructor_error:3:10: Expected an identifier, but got '{'.
+parser/primary_constructors/class_primary_constructor_error:3:10: Expected an identifier, but got '{'.
 class C. {}
          ^
 
-parser/declaring_constructors/class_primary_constructor_error:4:9: Expected an identifier, but got '('.
+parser/primary_constructors/class_primary_constructor_error:4:9: Expected an identifier, but got '('.
 class C.() {}
         ^
 
-parser/declaring_constructors/class_primary_constructor_error:5:7: 'const' can only be used together with a primary constructor declaration.
+parser/primary_constructors/class_primary_constructor_error:5:7: 'const' can only be used together with a primary constructor declaration.
 class const C {}
       ^^^^^
 
-parser/declaring_constructors/class_primary_constructor_error:6:14: Named parameter lists cannot be empty.
+parser/primary_constructors/class_primary_constructor_error:6:14: Named parameter lists cannot be empty.
 class C<T>( {}
              ^
 
-parser/declaring_constructors/class_primary_constructor_error:7:1: Expected ')' before this.
+parser/primary_constructors/class_primary_constructor_error:7:1: Expected ')' before this.
 class C<T>) {}
 ^^^^^
 
-parser/declaring_constructors/class_primary_constructor_error:8:7: 'const' can only be used together with a primary constructor declaration.
+parser/primary_constructors/class_primary_constructor_error:8:7: 'const' can only be used together with a primary constructor declaration.
 class const C<T> {}
       ^^^^^
 
-parser/declaring_constructors/class_primary_constructor_error:9:13: Expected an identifier, but got '{'.
+parser/primary_constructors/class_primary_constructor_error:9:13: Expected an identifier, but got '{'.
 class C<T>. {}
             ^
 
-parser/declaring_constructors/class_primary_constructor_error:10:12: Expected an identifier, but got '('.
+parser/primary_constructors/class_primary_constructor_error:10:12: Expected an identifier, but got '('.
 class C<T>.() {}
            ^
 
-parser/declaring_constructors/class_primary_constructor_error:11:19: Expected an identifier, but got '{'.
+parser/primary_constructors/class_primary_constructor_error:11:19: Expected an identifier, but got '{'.
 class const C<T>. {}
                   ^
 
-parser/declaring_constructors/class_primary_constructor_error:12:18: Expected an identifier, but got '('.
+parser/primary_constructors/class_primary_constructor_error:12:18: Expected an identifier, but got '('.
 class const C<T>.() {}
                  ^
 
-parser/declaring_constructors/class_primary_constructor_error:16:7: 'const' can only be used together with a primary constructor declaration.
+parser/primary_constructors/class_primary_constructor_error:16:7: 'const' can only be used together with a primary constructor declaration.
 class const C = O with M;
       ^^^^^
 
-parser/declaring_constructors/class_primary_constructor_error:17:7: 'const' can only be used together with a primary constructor declaration.
+parser/primary_constructors/class_primary_constructor_error:17:7: 'const' can only be used together with a primary constructor declaration.
 class const C<T> = O with M;
       ^^^^^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/class_primary_constructor_error.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/class_primary_constructor_error.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.expect
similarity index 84%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.expect
index f27673d..1ee3835 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.expect

@@ -1,54 +1,54 @@
 Problems reported:
 
-parser/declaring_constructors/constructor_head_error:2:3: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/constructor_head_error:2:3: A method declaration needs an explicit list of parameters.
   new = 42;
   ^^^
 
-parser/declaring_constructors/constructor_head_error:2:7: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/constructor_head_error:2:7: Only factory constructor can specify '=' redirection.
   new = 42;
       ^
 
-parser/declaring_constructors/constructor_head_error:2:9: Expected an identifier, but got '42'.
+parser/primary_constructors/constructor_head_error:2:9: Expected an identifier, but got '42'.
   new = 42;
         ^^
 
-parser/declaring_constructors/constructor_head_error:2:7: Expected ';' after this.
+parser/primary_constructors/constructor_head_error:2:7: Expected ';' after this.
   new = 42;
       ^
 
-parser/declaring_constructors/constructor_head_error:2:9: Expected a class member, but got '42'.
+parser/primary_constructors/constructor_head_error:2:9: Expected a class member, but got '42'.
   new = 42;
         ^^
 
-parser/declaring_constructors/constructor_head_error:2:11: Expected a class member, but got ';'.
+parser/primary_constructors/constructor_head_error:2:11: Expected a class member, but got ';'.
   new = 42;
           ^
 
-parser/declaring_constructors/constructor_head_error:3:9: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/constructor_head_error:3:9: Only factory constructor can specify '=' redirection.
   new() = 42;
         ^
 
-parser/declaring_constructors/constructor_head_error:3:11: Expected an identifier, but got '42'.
+parser/primary_constructors/constructor_head_error:3:11: Expected an identifier, but got '42'.
   new() = 42;
           ^^
 
-parser/declaring_constructors/constructor_head_error:3:9: Expected ';' after this.
+parser/primary_constructors/constructor_head_error:3:9: Expected ';' after this.
   new() = 42;
         ^
 
-parser/declaring_constructors/constructor_head_error:3:11: Expected a class member, but got '42'.
+parser/primary_constructors/constructor_head_error:3:11: Expected a class member, but got '42'.
   new() = 42;
           ^^
 
-parser/declaring_constructors/constructor_head_error:3:13: Expected a class member, but got ';'.
+parser/primary_constructors/constructor_head_error:3:13: Expected a class member, but got ';'.
   new() = 42;
             ^
 
-parser/declaring_constructors/constructor_head_error:4:7: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/constructor_head_error:4:7: Only factory constructor can specify '=' redirection.
   C() = C;
       ^
 
-parser/declaring_constructors/constructor_head_error:5:12: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/constructor_head_error:5:12: Only factory constructor can specify '=' redirection.
   C.name() = C;
            ^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_error.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_error.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.expect
similarity index 79%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.expect
index 0062c59..04de931 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.expect

@@ -1,66 +1,66 @@
 Problems reported:
 
-parser/declaring_constructors/constructor_head_pre_feature:4:3: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:4:3: This requires the experimental 'primary-constructors' language feature to be enabled.
   new ();
   ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:5:3: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:5:3: This requires the experimental 'primary-constructors' language feature to be enabled.
   new () : x = 0;
   ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:6:3: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:6:3: This requires the experimental 'primary-constructors' language feature to be enabled.
   new () {}
   ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:7:3: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:7:3: This requires the experimental 'primary-constructors' language feature to be enabled.
   new () : x = 0 {}
   ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:8:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:8:9: This requires the experimental 'primary-constructors' language feature to be enabled.
   const new ();
         ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:9:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:9:9: This requires the experimental 'primary-constructors' language feature to be enabled.
   const new () : x = 0;
         ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:10:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:10:9: This requires the experimental 'primary-constructors' language feature to be enabled.
   const new () {}
         ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:11:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:11:9: This requires the experimental 'primary-constructors' language feature to be enabled.
   const new () : x = 0 {}
         ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:12:3: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:12:3: This requires the experimental 'primary-constructors' language feature to be enabled.
   new named();
   ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:13:3: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:13:3: This requires the experimental 'primary-constructors' language feature to be enabled.
   new named() : x = 0;
   ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:14:3: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:14:3: This requires the experimental 'primary-constructors' language feature to be enabled.
   new named() {}
   ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:15:3: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:15:3: This requires the experimental 'primary-constructors' language feature to be enabled.
   new named() : x = 0 {}
   ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:16:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:16:9: This requires the experimental 'primary-constructors' language feature to be enabled.
   const new named();
         ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:17:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:17:9: This requires the experimental 'primary-constructors' language feature to be enabled.
   const new named() : x = 0;
         ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:18:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:18:9: This requires the experimental 'primary-constructors' language feature to be enabled.
   const new named() {}
         ^^^
 
-parser/declaring_constructors/constructor_head_pre_feature:19:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/constructor_head_pre_feature:19:9: This requires the experimental 'primary-constructors' language feature to be enabled.
   const new named() : x = 0 {}
         ^^^
 
@@ -81,7 +81,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType({)
             handleNoIdentifier(new, methodDeclaration)
@@ -96,7 +96,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType(;)
             handleNoIdentifier(new, methodDeclaration)
@@ -120,7 +120,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType(;)
             handleNoIdentifier(new, methodDeclaration)
@@ -136,7 +136,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType(})
             handleNoIdentifier(new, methodDeclaration)
@@ -161,7 +161,7 @@
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
             handleNoType(const)
             handleNoIdentifier(new, methodDeclaration)
@@ -176,7 +176,7 @@
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
             handleNoType(const)
             handleNoIdentifier(new, methodDeclaration)
@@ -200,7 +200,7 @@
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
             handleNoType(const)
             handleNoIdentifier(new, methodDeclaration)
@@ -216,7 +216,7 @@
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
             handleNoType(const)
             handleNoIdentifier(new, methodDeclaration)
@@ -241,7 +241,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType(})
             handleIdentifier(named, methodDeclaration)
@@ -256,7 +256,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType(;)
             handleIdentifier(named, methodDeclaration)
@@ -280,7 +280,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType(;)
             handleIdentifier(named, methodDeclaration)
@@ -296,7 +296,7 @@
         beginMetadataStar(new)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
             handleNoType(})
             handleIdentifier(named, methodDeclaration)
@@ -321,7 +321,7 @@
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
             handleNoType(const)
             handleIdentifier(named, methodDeclaration)
@@ -336,7 +336,7 @@
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
             handleNoType(const)
             handleIdentifier(named, methodDeclaration)
@@ -360,7 +360,7 @@
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
             handleNoType(const)
             handleIdentifier(named, methodDeclaration)
@@ -376,7 +376,7 @@
         beginMetadataStar(const)
         endMetadataStar(0)
         beginMember()
-          handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+          handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
           beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
             handleNoType(const)
             handleIdentifier(named, methodDeclaration)

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.intertwined.expect
similarity index 95%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.intertwined.expect
index c28898f..2dd2795 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.intertwined.expect

@@ -33,8 +33,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod({, null, null, null, null, null, null, null, {, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType({)
@@ -62,8 +62,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType(;)
@@ -118,8 +118,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType(;)
@@ -149,8 +149,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType(})
@@ -207,8 +207,8 @@
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(}, null, null, null, null, null, null, const, const, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
                 listener: handleNoType(const)
@@ -236,8 +236,8 @@
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
                 listener: handleNoType(const)
@@ -292,8 +292,8 @@
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
                 listener: handleNoType(const)
@@ -323,8 +323,8 @@
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(}, null, null, null, null, null, null, const, const, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
                 listener: handleNoType(const)
@@ -381,8 +381,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType(})
@@ -411,8 +411,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType(;)
@@ -468,8 +468,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(;, null, null, null, null, null, null, null, ;, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType(;)
@@ -500,8 +500,8 @@
                 listener: beginMetadataStar(new)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(}, null, null, null, null, null, null, null, }, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, null, null, new, new, C)
                 listener: handleNoType(})
@@ -559,8 +559,8 @@
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(}, null, null, null, null, null, null, const, const, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
                 listener: handleNoType(const)
@@ -589,8 +589,8 @@
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
                 listener: handleNoType(const)
@@ -646,8 +646,8 @@
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(;, null, null, null, null, null, null, const, const, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
                 listener: handleNoType(const)
@@ -678,8 +678,8 @@
                 listener: beginMetadataStar(const)
                 listener: endMetadataStar(0)
               listener: beginMember()
-              reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
-                listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, new, new)
+              reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
+                listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, new, new)
               parseMethod(}, null, null, null, null, null, null, const, const, NoType(), null, new, new, DeclarationKind.Class, C, false)
                 listener: beginConstructor(DeclarationKind.Class, null, null, null, null, const, null, new, new, C)
                 listener: handleNoType(const)

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/constructor_head_pre_feature.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/constructor_head_pre_feature.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.expect
similarity index 93%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.expect
index 14ecc83..98f4015 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.expect

@@ -1,134 +1,134 @@
 Problems reported:
 
-parser/declaring_constructors/declaring_parameter_error:1:3: Variables can't be declared using both 'var' and a type name.
+parser/primary_constructors/declaring_parameter_error:1:3: Variables can't be declared using both 'var' and a type name.
 m(var a b) {}
   ^^^
 
-parser/declaring_constructors/declaring_parameter_error:4:5: Variables can't be declared using both 'var' and a type name.
+parser/primary_constructors/declaring_parameter_error:4:5: Variables can't be declared using both 'var' and a type name.
   C(var a b) {}
     ^^^
 
-parser/declaring_constructors/declaring_parameter_error:7:9: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:7:9: Can't have modifier 'covariant' in a primary constructor.
 class C(covariant a) {}
         ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:8:9: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:8:9: Can't have modifier 'covariant' in a primary constructor.
 class C(covariant a b) {}
         ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:9:9: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:9:9: Can't have modifier 'covariant' in a primary constructor.
 class C(covariant var a) {}
         ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:10:9: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:10:9: Can't have modifier 'covariant' in a primary constructor.
 class C(covariant final a) {}
         ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:11:9: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:11:9: Can't have modifier 'covariant' in a primary constructor.
 class C(covariant var a b) {}
         ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:12:9: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:12:9: Can't have modifier 'covariant' in a primary constructor.
 class C(covariant final a b) {}
         ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:13:9: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:13:9: Can't have modifier 'const' here.
 class C(const f()) {}
         ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:14:9: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:14:9: Can't have modifier 'const' here.
 class C(const f<T>()) {}
         ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:15:9: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:15:9: Can't have modifier 'const' here.
 class C(const void f()) {}
         ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:16:9: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:16:9: Can't have modifier 'const' here.
 class C(const void f<T>()) {}
         ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:18:8: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:18:8: Can't have modifier 'covariant' in a primary constructor.
 enum E(covariant a) {}
        ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:19:8: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:19:8: Can't have modifier 'covariant' in a primary constructor.
 enum E(covariant a b) {}
        ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:20:8: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:20:8: Can't have modifier 'covariant' in a primary constructor.
 enum E(covariant var a) {}
        ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:21:8: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:21:8: Can't have modifier 'covariant' in a primary constructor.
 enum E(covariant final a) {}
        ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:22:8: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:22:8: Can't have modifier 'covariant' in a primary constructor.
 enum E(covariant var a b) {}
        ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:23:8: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:23:8: Can't have modifier 'covariant' in a primary constructor.
 enum E(covariant final a b) {}
        ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:24:8: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:24:8: Can't have modifier 'const' here.
 enum E(const f()) {}
        ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:25:8: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:25:8: Can't have modifier 'const' here.
 enum E(const f<T>()) {}
        ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:26:8: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:26:8: Can't have modifier 'const' here.
 enum E(const void f()) {}
        ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:27:8: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:27:8: Can't have modifier 'const' here.
 enum E(const void f<T>()) {}
        ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:30:6: Variables can't be declared using both 'var' and a type name.
+parser/primary_constructors/declaring_parameter_error:30:6: Variables can't be declared using both 'var' and a type name.
   ET(var a b) {}
      ^^^
 
-parser/declaring_constructors/declaring_parameter_error:33:19: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:33:19: Can't have modifier 'covariant' in a primary constructor.
 extension type ET(covariant a) {}
                   ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:34:19: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:34:19: Can't have modifier 'covariant' in a primary constructor.
 extension type ET(covariant a b) {}
                   ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:35:19: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:35:19: Can't have modifier 'covariant' in a primary constructor.
 extension type ET(covariant var a) {}
                   ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:36:19: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:36:19: Can't have modifier 'covariant' in a primary constructor.
 extension type ET(covariant final a) {}
                   ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:37:19: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:37:19: Can't have modifier 'covariant' in a primary constructor.
 extension type ET(covariant var a b) {}
                   ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:38:19: Can't have modifier 'covariant' in a primary constructor.
+parser/primary_constructors/declaring_parameter_error:38:19: Can't have modifier 'covariant' in a primary constructor.
 extension type ET(covariant final a b) {}
                   ^^^^^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:39:19: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:39:19: Can't have modifier 'const' here.
 extension type ET(const f()) {}
                   ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:40:19: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:40:19: Can't have modifier 'const' here.
 extension type ET(const f<T>()) {}
                   ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:41:19: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:41:19: Can't have modifier 'const' here.
 extension type ET(const void f()) {}
                   ^^^^^
 
-parser/declaring_constructors/declaring_parameter_error:42:19: Can't have modifier 'const' here.
+parser/primary_constructors/declaring_parameter_error:42:19: Can't have modifier 'const' here.
 extension type ET(const void f<T>()) {}
                   ^^^^^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_error.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_error.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.expect
similarity index 88%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.expect
index 7030953..72d1b1e 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.expect

@@ -1,134 +1,134 @@
 Problems reported:
 
-parser/declaring_constructors/declaring_parameter_pre_feature:7:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:7:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(var a b) {}
         ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:9:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:9:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(var f()) {}
         ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:10:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:10:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(final f()) {}
         ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:11:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:11:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(var void f()) {}
         ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:11:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:11:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(var void f()) {}
         ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:12:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:12:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(final void f()) {}
         ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:13:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:13:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(var f<T>()) {}
         ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:14:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:14:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(final f<T>()) {}
         ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:15:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:15:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(var void f<T>()) {}
         ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:15:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:15:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(var void f<T>()) {}
         ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:16:9: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:16:9: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C(final void f<T>()) {}
         ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:23:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:23:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(var a b) {}
        ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:25:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:25:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(var f()) {}
        ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:26:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:26:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(final f()) {}
        ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:27:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:27:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(var void f()) {}
        ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:27:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:27:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(var void f()) {}
        ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:28:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:28:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(final void f()) {}
        ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:29:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:29:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(var f<T>()) {}
        ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:30:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:30:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(final f<T>()) {}
        ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:31:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:31:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(var void f<T>()) {}
        ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:31:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:31:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(var void f<T>()) {}
        ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:32:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:32:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 enum E(final void f<T>()) {}
        ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:39:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:39:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(var a b) {}
                   ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:41:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:41:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(var f()) {}
                   ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:42:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:42:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(final f()) {}
                   ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:43:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:43:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(var void f()) {}
                   ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:43:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:43:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(var void f()) {}
                   ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:44:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:44:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(final void f()) {}
                   ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:45:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:45:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(var f<T>()) {}
                   ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:46:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:46:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(final f<T>()) {}
                   ^^^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:47:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:47:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(var void f<T>()) {}
                   ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:47:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:47:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(var void f<T>()) {}
                   ^^^
 
-parser/declaring_constructors/declaring_parameter_pre_feature:48:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/declaring_parameter_pre_feature:48:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(final void f<T>()) {}
                   ^^^^^
 
@@ -269,7 +269,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleIdentifier(a, typeReference)
             handleNoTypeArguments(b)
             handleType(a, null)
@@ -326,7 +326,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleNoType(var)
@@ -358,7 +358,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleNoType(final)
@@ -390,8 +390,8 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleVoidKeyword(void)
@@ -423,7 +423,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleVoidKeyword(void)
@@ -455,7 +455,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -495,7 +495,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -535,8 +535,8 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -576,7 +576,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -736,7 +736,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleIdentifier(a, typeReference)
             handleNoTypeArguments(b)
             handleType(a, null)
@@ -791,7 +791,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleNoType(var)
@@ -822,7 +822,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleNoType(final)
@@ -853,8 +853,8 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleVoidKeyword(void)
@@ -885,7 +885,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleVoidKeyword(void)
@@ -916,7 +916,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -955,7 +955,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -994,8 +994,8 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -1034,7 +1034,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -1172,7 +1172,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleIdentifier(a, typeReference)
             handleNoTypeArguments(b)
             handleType(a, null)
@@ -1219,7 +1219,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleNoType(var)
@@ -1246,7 +1246,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleNoType(final)
@@ -1273,8 +1273,8 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleVoidKeyword(void)
@@ -1301,7 +1301,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             handleNoTypeVariables(()
             beginFunctionTypedFormalParameter(()
               handleVoidKeyword(void)
@@ -1328,7 +1328,7 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -1363,7 +1363,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -1398,8 +1398,8 @@
           beginMetadataStar(var)
           endMetadataStar(0)
           beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)
@@ -1434,7 +1434,7 @@
           beginMetadataStar(final)
           endMetadataStar(0)
           beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-            handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+            handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
             beginTypeVariables(<)
               beginMetadataStar(T)
               endMetadataStar(0)

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.intertwined.expect
similarity index 96%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.intertwined.expect
index adee58f..42f2c2f 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.intertwined.expect

@@ -236,8 +236,8 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: handleIdentifier(a, typeReference)
                   listener: handleNoTypeArguments(b)
                   listener: handleType(a, null)
@@ -330,8 +330,8 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: handleNoTypeVariables(()
                   listener: beginFunctionTypedFormalParameter(()
                   listener: handleNoType(var)
@@ -383,8 +383,8 @@
                     listener: beginMetadataStar(final)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                   listener: handleNoTypeVariables(()
                   listener: beginFunctionTypedFormalParameter(()
                   listener: handleNoType(final)
@@ -436,10 +436,10 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: handleNoTypeVariables(()
                   listener: beginFunctionTypedFormalParameter(()
                   listener: handleVoidKeyword(void)
@@ -491,8 +491,8 @@
                     listener: beginMetadataStar(final)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                   listener: handleNoTypeVariables(()
                   listener: beginFunctionTypedFormalParameter(()
                   listener: handleVoidKeyword(void)
@@ -544,8 +544,8 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: beginTypeVariables(<)
                   listener: beginMetadataStar(T)
                   listener: endMetadataStar(0)
@@ -605,8 +605,8 @@
                     listener: beginMetadataStar(final)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                   listener: beginTypeVariables(<)
                   listener: beginMetadataStar(T)
                   listener: endMetadataStar(0)
@@ -666,10 +666,10 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: beginTypeVariables(<)
                   listener: beginMetadataStar(T)
                   listener: endMetadataStar(0)
@@ -729,8 +729,8 @@
                     listener: beginMetadataStar(final)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                   listener: beginTypeVariables(<)
                   listener: beginMetadataStar(T)
                   listener: endMetadataStar(0)
@@ -976,8 +976,8 @@
                   listener: beginMetadataStar(var)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                 listener: handleIdentifier(a, typeReference)
                 listener: handleNoTypeArguments(b)
                 listener: handleType(a, null)
@@ -1060,8 +1060,8 @@
                   listener: beginMetadataStar(var)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                 listener: handleNoTypeVariables(()
                 listener: beginFunctionTypedFormalParameter(()
                 listener: handleNoType(var)
@@ -1108,8 +1108,8 @@
                   listener: beginMetadataStar(final)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                 listener: handleNoTypeVariables(()
                 listener: beginFunctionTypedFormalParameter(()
                 listener: handleNoType(final)
@@ -1156,10 +1156,10 @@
                   listener: beginMetadataStar(var)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                 listener: handleNoTypeVariables(()
                 listener: beginFunctionTypedFormalParameter(()
                 listener: handleVoidKeyword(void)
@@ -1206,8 +1206,8 @@
                   listener: beginMetadataStar(final)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                 listener: handleNoTypeVariables(()
                 listener: beginFunctionTypedFormalParameter(()
                 listener: handleVoidKeyword(void)
@@ -1254,8 +1254,8 @@
                   listener: beginMetadataStar(var)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                 listener: beginTypeVariables(<)
                 listener: beginMetadataStar(T)
                 listener: endMetadataStar(0)
@@ -1310,8 +1310,8 @@
                   listener: beginMetadataStar(final)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                 listener: beginTypeVariables(<)
                 listener: beginMetadataStar(T)
                 listener: endMetadataStar(0)
@@ -1366,10 +1366,10 @@
                   listener: beginMetadataStar(var)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                 listener: beginTypeVariables(<)
                 listener: beginMetadataStar(T)
                 listener: endMetadataStar(0)
@@ -1424,8 +1424,8 @@
                   listener: beginMetadataStar(final)
                   listener: endMetadataStar(0)
                 listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                  listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                  listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                 listener: beginTypeVariables(<)
                 listener: beginMetadataStar(T)
                 listener: endMetadataStar(0)
@@ -1646,8 +1646,8 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: handleIdentifier(a, typeReference)
                   listener: handleNoTypeArguments(b)
                   listener: handleType(a, null)
@@ -1722,8 +1722,8 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: handleNoTypeVariables(()
                   listener: beginFunctionTypedFormalParameter(()
                   listener: handleNoType(var)
@@ -1766,8 +1766,8 @@
                     listener: beginMetadataStar(final)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                   listener: handleNoTypeVariables(()
                   listener: beginFunctionTypedFormalParameter(()
                   listener: handleNoType(final)
@@ -1810,10 +1810,10 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: handleNoTypeVariables(()
                   listener: beginFunctionTypedFormalParameter(()
                   listener: handleVoidKeyword(void)
@@ -1856,8 +1856,8 @@
                     listener: beginMetadataStar(final)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                   listener: handleNoTypeVariables(()
                   listener: beginFunctionTypedFormalParameter(()
                   listener: handleVoidKeyword(void)
@@ -1900,8 +1900,8 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: beginTypeVariables(<)
                   listener: beginMetadataStar(T)
                   listener: endMetadataStar(0)
@@ -1952,8 +1952,8 @@
                     listener: beginMetadataStar(final)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                   listener: beginTypeVariables(<)
                   listener: beginMetadataStar(T)
                   listener: endMetadataStar(0)
@@ -2004,10 +2004,10 @@
                     listener: beginMetadataStar(var)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(var, MemberKind.PrimaryConstructor, null, null, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, var, var)
                   listener: beginTypeVariables(<)
                   listener: beginMetadataStar(T)
                   listener: endMetadataStar(0)
@@ -2058,8 +2058,8 @@
                     listener: beginMetadataStar(final)
                     listener: endMetadataStar(0)
                   listener: beginFormalParameter(final, MemberKind.PrimaryConstructor, null, null, final)
-                  reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
-                    listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, final, final)
+                  reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
+                    listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, final, final)
                   listener: beginTypeVariables(<)
                   listener: beginMetadataStar(T)
                   listener: endMetadataStar(0)

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/declaring_parameter_pre_feature.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/declaring_parameter_pre_feature.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.expect
similarity index 87%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.expect
index 5044ac0..4cea20e 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.expect

@@ -1,54 +1,54 @@
 Problems reported:
 
-parser/declaring_constructors/enum_primary_constructor_body_error:2:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/enum_primary_constructor_body_error:2:3: 'this' can't be used as an identifier because it's a keyword.
   this() {}
   ^^^^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:2:10: Expected '}' before this.
+parser/primary_constructors/enum_primary_constructor_body_error:2:10: Expected '}' before this.
   this() {}
          ^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:6:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/enum_primary_constructor_body_error:6:3: 'this' can't be used as an identifier because it's a keyword.
   this(int x) : assert(1 > 2) {}
   ^^^^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:6:12: Expected ',' before this.
+parser/primary_constructors/enum_primary_constructor_body_error:6:12: Expected ',' before this.
   this(int x) : assert(1 > 2) {}
            ^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:6:15: Expected '}' before this.
+parser/primary_constructors/enum_primary_constructor_body_error:6:15: Expected '}' before this.
   this(int x) : assert(1 > 2) {}
               ^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:10:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/enum_primary_constructor_body_error:10:3: 'this' can't be used as an identifier because it's a keyword.
   this();
   ^^^^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:14:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/enum_primary_constructor_body_error:14:3: 'this' can't be used as an identifier because it's a keyword.
   this(int x) : assert(1 > 2);
   ^^^^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:14:12: Expected ',' before this.
+parser/primary_constructors/enum_primary_constructor_body_error:14:12: Expected ',' before this.
   this(int x) : assert(1 > 2);
            ^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:14:15: Expected '}' before this.
+parser/primary_constructors/enum_primary_constructor_body_error:14:15: Expected '}' before this.
   this(int x) : assert(1 > 2);
               ^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:18:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/enum_primary_constructor_body_error:18:3: 'this' can't be used as an identifier because it's a keyword.
   this : assert(1 > 2);
   ^^^^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:18:8: Expected '}' before this.
+parser/primary_constructors/enum_primary_constructor_body_error:18:8: Expected '}' before this.
   this : assert(1 > 2);
        ^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:22:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/enum_primary_constructor_body_error:22:3: 'this' can't be used as an identifier because it's a keyword.
   this {}
   ^^^^
 
-parser/declaring_constructors/enum_primary_constructor_body_error:22:8: Expected '}' before this.
+parser/primary_constructors/enum_primary_constructor_body_error:22:8: Expected '}' before this.
   this {}
        ^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_body_error.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_body_error.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.expect
similarity index 91%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.expect
index 0d826ee..75455a8 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.expect

@@ -1,50 +1,50 @@
 Problems reported:
 
-parser/declaring_constructors/enum_primary_constructor_error:1:10: Named parameter lists cannot be empty.
+parser/primary_constructors/enum_primary_constructor_error:1:10: Named parameter lists cannot be empty.
 enum E( {}
          ^
 
-parser/declaring_constructors/enum_primary_constructor_error:2:1: Expected ')' before this.
+parser/primary_constructors/enum_primary_constructor_error:2:1: Expected ')' before this.
 enum E) {}
 ^^^^
 
-parser/declaring_constructors/enum_primary_constructor_error:3:9: Expected an identifier, but got '{'.
+parser/primary_constructors/enum_primary_constructor_error:3:9: Expected an identifier, but got '{'.
 enum E. {}
         ^
 
-parser/declaring_constructors/enum_primary_constructor_error:4:8: Expected an identifier, but got '('.
+parser/primary_constructors/enum_primary_constructor_error:4:8: Expected an identifier, but got '('.
 enum E.() {}
        ^
 
-parser/declaring_constructors/enum_primary_constructor_error:5:6: 'const' can only be used together with a primary constructor declaration.
+parser/primary_constructors/enum_primary_constructor_error:5:6: 'const' can only be used together with a primary constructor declaration.
 enum const E {}
      ^^^^^
 
-parser/declaring_constructors/enum_primary_constructor_error:6:13: Named parameter lists cannot be empty.
+parser/primary_constructors/enum_primary_constructor_error:6:13: Named parameter lists cannot be empty.
 enum E<T>( {}
             ^
 
-parser/declaring_constructors/enum_primary_constructor_error:7:1: Expected ')' before this.
+parser/primary_constructors/enum_primary_constructor_error:7:1: Expected ')' before this.
 enum E<T>) {}
 ^^^^
 
-parser/declaring_constructors/enum_primary_constructor_error:8:6: 'const' can only be used together with a primary constructor declaration.
+parser/primary_constructors/enum_primary_constructor_error:8:6: 'const' can only be used together with a primary constructor declaration.
 enum const E<T> {}
      ^^^^^
 
-parser/declaring_constructors/enum_primary_constructor_error:9:12: Expected an identifier, but got '{'.
+parser/primary_constructors/enum_primary_constructor_error:9:12: Expected an identifier, but got '{'.
 enum E<T>. {}
            ^
 
-parser/declaring_constructors/enum_primary_constructor_error:10:11: Expected an identifier, but got '('.
+parser/primary_constructors/enum_primary_constructor_error:10:11: Expected an identifier, but got '('.
 enum E<T>.() {}
           ^
 
-parser/declaring_constructors/enum_primary_constructor_error:11:18: Expected an identifier, but got '{'.
+parser/primary_constructors/enum_primary_constructor_error:11:18: Expected an identifier, but got '{'.
 enum const E<T>. {}
                  ^
 
-parser/declaring_constructors/enum_primary_constructor_error:12:17: Expected an identifier, but got '('.
+parser/primary_constructors/enum_primary_constructor_error:12:17: Expected an identifier, but got '('.
 enum const E<T>.() {}
                 ^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/enum_primary_constructor_error.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/enum_primary_constructor_error.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.expect
similarity index 91%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.expect
index ef01e8e..4eb838a 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.expect

@@ -1,30 +1,30 @@
 Problems reported:
 
-parser/declaring_constructors/extension_type_primary_constructor_body_error:2:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/extension_type_primary_constructor_body_error:2:3: 'this' can't be used as an identifier because it's a keyword.
   this(this.x) {}
   ^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_body_error:6:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/extension_type_primary_constructor_body_error:6:3: 'this' can't be used as an identifier because it's a keyword.
   this(this.x)  : assert(1 > 2) {}
   ^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_body_error:6:3: The name of a constructor must match the name of the enclosing class.
+parser/primary_constructors/extension_type_primary_constructor_body_error:6:3: The name of a constructor must match the name of the enclosing class.
   this(this.x)  : assert(1 > 2) {}
   ^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_body_error:10:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/extension_type_primary_constructor_body_error:10:3: 'this' can't be used as an identifier because it's a keyword.
   this(this.x) ;
   ^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_body_error:10:3: Extension types can't declare abstract members.
+parser/primary_constructors/extension_type_primary_constructor_body_error:10:3: Extension types can't declare abstract members.
   this(this.x) ;
   ^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_body_error:14:3: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/extension_type_primary_constructor_body_error:14:3: 'this' can't be used as an identifier because it's a keyword.
   this(this.x)  : assert(1 > 2);
   ^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_body_error:14:3: The name of a constructor must match the name of the enclosing class.
+parser/primary_constructors/extension_type_primary_constructor_body_error:14:3: The name of a constructor must match the name of the enclosing class.
   this(this.x)  : assert(1 > 2);
   ^^^^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_body_error.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_body_error.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.expect
similarity index 87%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.expect
index 852c29c..5e4fcda 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.expect

@@ -1,70 +1,70 @@
 Problems reported:
 
-parser/declaring_constructors/extension_type_primary_constructor_error:1:20: Named parameter lists cannot be empty.
+parser/primary_constructors/extension_type_primary_constructor_error:1:20: Named parameter lists cannot be empty.
 extension type E( {}
                    ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:2:1: Expected ')' before this.
+parser/primary_constructors/extension_type_primary_constructor_error:2:1: Expected ')' before this.
 extension type E) {}
 ^^^^^^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:3:19: Expected an identifier, but got '{'.
+parser/primary_constructors/extension_type_primary_constructor_error:3:19: Expected an identifier, but got '{'.
 extension type E. {}
                   ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:3:19: A primary constructor declaration must have formal parameters.
+parser/primary_constructors/extension_type_primary_constructor_error:3:19: A primary constructor declaration must have formal parameters.
 extension type E. {}
                   ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:4:18: Expected an identifier, but got '('.
+parser/primary_constructors/extension_type_primary_constructor_error:4:18: Expected an identifier, but got '('.
 extension type E.() {}
                  ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:5:22: An extension type declaration must have a primary constructor declaration.
+parser/primary_constructors/extension_type_primary_constructor_error:5:22: An extension type declaration must have a primary constructor declaration.
 extension type const E {}
                      ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:6:23: Named parameter lists cannot be empty.
+parser/primary_constructors/extension_type_primary_constructor_error:6:23: Named parameter lists cannot be empty.
 extension type E<T>( {}
                       ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:7:1: Expected ')' before this.
+parser/primary_constructors/extension_type_primary_constructor_error:7:1: Expected ')' before this.
 extension type E<T>) {}
 ^^^^^^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:8:25: An extension type declaration must have a primary constructor declaration.
+parser/primary_constructors/extension_type_primary_constructor_error:8:25: An extension type declaration must have a primary constructor declaration.
 extension type const E<T> {}
                         ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:9:22: Expected an identifier, but got '{'.
+parser/primary_constructors/extension_type_primary_constructor_error:9:22: Expected an identifier, but got '{'.
 extension type E<T>. {}
                      ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:9:22: A primary constructor declaration must have formal parameters.
+parser/primary_constructors/extension_type_primary_constructor_error:9:22: A primary constructor declaration must have formal parameters.
 extension type E<T>. {}
                      ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:10:21: Expected an identifier, but got '('.
+parser/primary_constructors/extension_type_primary_constructor_error:10:21: Expected an identifier, but got '('.
 extension type E<T>.() {}
                     ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:11:28: Expected an identifier, but got '{'.
+parser/primary_constructors/extension_type_primary_constructor_error:11:28: Expected an identifier, but got '{'.
 extension type const E<T>. {}
                            ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:11:28: A primary constructor declaration must have formal parameters.
+parser/primary_constructors/extension_type_primary_constructor_error:11:28: A primary constructor declaration must have formal parameters.
 extension type const E<T>. {}
                            ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:12:27: Expected an identifier, but got '('.
+parser/primary_constructors/extension_type_primary_constructor_error:12:27: Expected an identifier, but got '('.
 extension type const E<T>.() {}
                           ^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:13:21: A primary constructor declaration must have formal parameters.
+parser/primary_constructors/extension_type_primary_constructor_error:13:21: A primary constructor declaration must have formal parameters.
 extension type E<T>.named {}
                     ^^^^^
 
-parser/declaring_constructors/extension_type_primary_constructor_error:15:27: A primary constructor declaration must have formal parameters.
+parser/primary_constructors/extension_type_primary_constructor_error:15:27: A primary constructor declaration must have formal parameters.
 extension type const E<T>.named {}
                           ^^^^^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/extension_type_primary_constructor_error.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/extension_type_primary_constructor_error.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.expect
similarity index 96%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.expect
index ef474f8..b614805 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.expect

@@ -1,26 +1,26 @@
 Problems reported:
 
-parser/declaring_constructors/factory_constructor_head_pre_feature:15:14: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/factory_constructor_head_pre_feature:15:14: Only factory constructor can specify '=' redirection.
   factory () = C;
              ^
 
-parser/declaring_constructors/factory_constructor_head_pre_feature:19:12: Getters, setters and methods can't be declared to be 'const'.
+parser/primary_constructors/factory_constructor_head_pre_feature:19:12: Getters, setters and methods can't be declared to be 'const'.
   external const factory ();
            ^^^^^
 
-parser/declaring_constructors/factory_constructor_head_pre_feature:23:3: Getters, setters and methods can't be declared to be 'const'.
+parser/primary_constructors/factory_constructor_head_pre_feature:23:3: Getters, setters and methods can't be declared to be 'const'.
   const factory () => C();
   ^^^^^
 
-parser/declaring_constructors/factory_constructor_head_pre_feature:27:3: Getters, setters and methods can't be declared to be 'const'.
+parser/primary_constructors/factory_constructor_head_pre_feature:27:3: Getters, setters and methods can't be declared to be 'const'.
   const factory () {}
   ^^^^^
 
-parser/declaring_constructors/factory_constructor_head_pre_feature:31:20: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/factory_constructor_head_pre_feature:31:20: Only factory constructor can specify '=' redirection.
   const factory () = C;
                    ^
 
-parser/declaring_constructors/factory_constructor_head_pre_feature:31:3: Getters, setters and methods can't be declared to be 'const'.
+parser/primary_constructors/factory_constructor_head_pre_feature:31:3: Getters, setters and methods can't be declared to be 'const'.
   const factory () = C;
   ^^^^^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_constructor_head_pre_feature.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_constructor_head_pre_feature.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart
rename to pkg/front_end/parser_testcases/primary_constructors/factory_new.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.expect
similarity index 90%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.expect
index 8136bd7..c193285f 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.expect

@@ -1,50 +1,50 @@
 Problems reported:
 
-parser/declaring_constructors/factory_new:2:20: Factory constructors can't be named 'new'.
+parser/primary_constructors/factory_new:2:20: Factory constructors can't be named 'new'.
   external factory new();
                    ^^^
 
-parser/declaring_constructors/factory_new:3:26: Factory constructors can't be named 'new'.
+parser/primary_constructors/factory_new:3:26: Factory constructors can't be named 'new'.
   external const factory new();
                          ^^^
 
-parser/declaring_constructors/factory_new:4:11: Factory constructors can't be named 'new'.
+parser/primary_constructors/factory_new:4:11: Factory constructors can't be named 'new'.
   factory new() => 0;
           ^^^
 
-parser/declaring_constructors/factory_new:5:17: Factory constructors can't be named 'new'.
+parser/primary_constructors/factory_new:5:17: Factory constructors can't be named 'new'.
   const factory new() => 0;
                 ^^^
 
-parser/declaring_constructors/factory_new:6:11: Factory constructors can't be named 'new'.
+parser/primary_constructors/factory_new:6:11: Factory constructors can't be named 'new'.
   factory new() = C;
           ^^^
 
-parser/declaring_constructors/factory_new:7:17: Factory constructors can't be named 'new'.
+parser/primary_constructors/factory_new:7:17: Factory constructors can't be named 'new'.
   const factory new() = C;
                 ^^^
 
-parser/declaring_constructors/factory_new:9:20: 'new' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/factory_new:9:20: 'new' can't be used as an identifier because it's a keyword.
   external factory new.named();
                    ^^^
 
-parser/declaring_constructors/factory_new:10:26: 'new' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/factory_new:10:26: 'new' can't be used as an identifier because it's a keyword.
   external const factory new.named();
                          ^^^
 
-parser/declaring_constructors/factory_new:11:11: 'new' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/factory_new:11:11: 'new' can't be used as an identifier because it's a keyword.
   factory new.named() => 0;
           ^^^
 
-parser/declaring_constructors/factory_new:12:17: 'new' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/factory_new:12:17: 'new' can't be used as an identifier because it's a keyword.
   const factory new.named() => 0;
                 ^^^
 
-parser/declaring_constructors/factory_new:13:11: 'new' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/factory_new:13:11: 'new' can't be used as an identifier because it's a keyword.
   factory new.named() = C;
           ^^^
 
-parser/declaring_constructors/factory_new:14:17: 'new' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/factory_new:14:17: 'new' can't be used as an identifier because it's a keyword.
   const factory new.named() = C;
                 ^^^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/factory_new.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/factory_new.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/primary_constructors/folder.options b/pkg/front_end/parser_testcases/primary_constructors/folder.options
new file mode 100644
index 0000000..79601a4
--- /dev/null
+++ b/pkg/front_end/parser_testcases/primary_constructors/folder.options

@@ -0,0 +1 @@
+--enable-experiment=primary-constructors

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart
rename to pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.expect
similarity index 82%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.expect
index 6ffe8ab..948165e 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.expect

@@ -1,306 +1,306 @@
 Problems reported:
 
-parser/declaring_constructors/new_in_initializer:3:16: Expected an identifier, but got 'new'.
+parser/primary_constructors/new_in_initializer:3:16: Expected an identifier, but got 'new'.
   new() : this.new = 0;
                ^^^
 
-parser/declaring_constructors/new_in_initializer:3:11: Expected an assignment after the field name.
+parser/primary_constructors/new_in_initializer:3:11: Expected an assignment after the field name.
   new() : this.new = 0;
           ^^^^
 
-parser/declaring_constructors/new_in_initializer:3:16: Expected a function body, but got 'new'.
+parser/primary_constructors/new_in_initializer:3:16: Expected a function body, but got 'new'.
   new() : this.new = 0;
                ^^^
 
-parser/declaring_constructors/new_in_initializer:3:16: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:3:16: A method declaration needs an explicit list of parameters.
   new() : this.new = 0;
                ^^^
 
-parser/declaring_constructors/new_in_initializer:3:20: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/new_in_initializer:3:20: Only factory constructor can specify '=' redirection.
   new() : this.new = 0;
                    ^
 
-parser/declaring_constructors/new_in_initializer:3:22: Expected an identifier, but got '0'.
+parser/primary_constructors/new_in_initializer:3:22: Expected an identifier, but got '0'.
   new() : this.new = 0;
                      ^
 
-parser/declaring_constructors/new_in_initializer:3:20: Expected ';' after this.
+parser/primary_constructors/new_in_initializer:3:20: Expected ';' after this.
   new() : this.new = 0;
                    ^
 
-parser/declaring_constructors/new_in_initializer:3:22: Expected a class member, but got '0'.
+parser/primary_constructors/new_in_initializer:3:22: Expected a class member, but got '0'.
   new() : this.new = 0;
                      ^
 
-parser/declaring_constructors/new_in_initializer:3:23: Expected a class member, but got ';'.
+parser/primary_constructors/new_in_initializer:3:23: Expected a class member, but got ';'.
   new() : this.new = 0;
                       ^
 
-parser/declaring_constructors/new_in_initializer:4:15: Expected a function body, but got 'this'.
+parser/primary_constructors/new_in_initializer:4:15: Expected a function body, but got 'this'.
   const new() this.new = 0;
               ^^^^
 
-parser/declaring_constructors/new_in_initializer:4:15: 'this' can't be used as an identifier because it's a keyword.
+parser/primary_constructors/new_in_initializer:4:15: 'this' can't be used as an identifier because it's a keyword.
   const new() this.new = 0;
               ^^^^
 
-parser/declaring_constructors/new_in_initializer:4:15: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:4:15: A method declaration needs an explicit list of parameters.
   const new() this.new = 0;
               ^^^^
 
-parser/declaring_constructors/new_in_initializer:4:24: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/new_in_initializer:4:24: Only factory constructor can specify '=' redirection.
   const new() this.new = 0;
                        ^
 
-parser/declaring_constructors/new_in_initializer:4:26: Expected an identifier, but got '0'.
+parser/primary_constructors/new_in_initializer:4:26: Expected an identifier, but got '0'.
   const new() this.new = 0;
                          ^
 
-parser/declaring_constructors/new_in_initializer:4:24: Expected ';' after this.
+parser/primary_constructors/new_in_initializer:4:24: Expected ';' after this.
   const new() this.new = 0;
                        ^
 
-parser/declaring_constructors/new_in_initializer:4:15: The name of a constructor must match the name of the enclosing class.
+parser/primary_constructors/new_in_initializer:4:15: The name of a constructor must match the name of the enclosing class.
   const new() this.new = 0;
               ^^^^
 
-parser/declaring_constructors/new_in_initializer:4:26: Expected a class member, but got '0'.
+parser/primary_constructors/new_in_initializer:4:26: Expected a class member, but got '0'.
   const new() this.new = 0;
                          ^
 
-parser/declaring_constructors/new_in_initializer:4:27: Expected a class member, but got ';'.
+parser/primary_constructors/new_in_initializer:4:27: Expected a class member, but got ';'.
   const new() this.new = 0;
                           ^
 
-parser/declaring_constructors/new_in_initializer:5:16: Expected an identifier, but got 'new'.
+parser/primary_constructors/new_in_initializer:5:16: Expected an identifier, but got 'new'.
   new() : this.new = 0 {}
                ^^^
 
-parser/declaring_constructors/new_in_initializer:5:11: Expected an assignment after the field name.
+parser/primary_constructors/new_in_initializer:5:11: Expected an assignment after the field name.
   new() : this.new = 0 {}
           ^^^^
 
-parser/declaring_constructors/new_in_initializer:5:16: Expected a function body, but got 'new'.
+parser/primary_constructors/new_in_initializer:5:16: Expected a function body, but got 'new'.
   new() : this.new = 0 {}
                ^^^
 
-parser/declaring_constructors/new_in_initializer:5:16: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:5:16: A method declaration needs an explicit list of parameters.
   new() : this.new = 0 {}
                ^^^
 
-parser/declaring_constructors/new_in_initializer:5:20: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/new_in_initializer:5:20: Only factory constructor can specify '=' redirection.
   new() : this.new = 0 {}
                    ^
 
-parser/declaring_constructors/new_in_initializer:5:22: Expected an identifier, but got '0'.
+parser/primary_constructors/new_in_initializer:5:22: Expected an identifier, but got '0'.
   new() : this.new = 0 {}
                      ^
 
-parser/declaring_constructors/new_in_initializer:5:20: Expected ';' after this.
+parser/primary_constructors/new_in_initializer:5:20: Expected ';' after this.
   new() : this.new = 0 {}
                    ^
 
-parser/declaring_constructors/new_in_initializer:5:22: Expected a class member, but got '0'.
+parser/primary_constructors/new_in_initializer:5:22: Expected a class member, but got '0'.
   new() : this.new = 0 {}
                      ^
 
-parser/declaring_constructors/new_in_initializer:5:24: Expected an identifier, but got '{'.
+parser/primary_constructors/new_in_initializer:5:24: Expected an identifier, but got '{'.
   new() : this.new = 0 {}
                        ^
 
-parser/declaring_constructors/new_in_initializer:5:24: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:5:24: A method declaration needs an explicit list of parameters.
   new() : this.new = 0 {}
                        ^
 
-parser/declaring_constructors/new_in_initializer:6:22: Expected an identifier, but got 'new'.
+parser/primary_constructors/new_in_initializer:6:22: Expected an identifier, but got 'new'.
   const new() : this.new = 0 {}
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:6:17: Expected an assignment after the field name.
+parser/primary_constructors/new_in_initializer:6:17: Expected an assignment after the field name.
   const new() : this.new = 0 {}
                 ^^^^
 
-parser/declaring_constructors/new_in_initializer:6:22: Expected a function body, but got 'new'.
+parser/primary_constructors/new_in_initializer:6:22: Expected a function body, but got 'new'.
   const new() : this.new = 0 {}
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:6:22: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:6:22: A method declaration needs an explicit list of parameters.
   const new() : this.new = 0 {}
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:6:26: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/new_in_initializer:6:26: Only factory constructor can specify '=' redirection.
   const new() : this.new = 0 {}
                          ^
 
-parser/declaring_constructors/new_in_initializer:6:28: Expected an identifier, but got '0'.
+parser/primary_constructors/new_in_initializer:6:28: Expected an identifier, but got '0'.
   const new() : this.new = 0 {}
                            ^
 
-parser/declaring_constructors/new_in_initializer:6:26: Expected ';' after this.
+parser/primary_constructors/new_in_initializer:6:26: Expected ';' after this.
   const new() : this.new = 0 {}
                          ^
 
-parser/declaring_constructors/new_in_initializer:6:28: Expected a class member, but got '0'.
+parser/primary_constructors/new_in_initializer:6:28: Expected a class member, but got '0'.
   const new() : this.new = 0 {}
                            ^
 
-parser/declaring_constructors/new_in_initializer:6:30: Expected an identifier, but got '{'.
+parser/primary_constructors/new_in_initializer:6:30: Expected an identifier, but got '{'.
   const new() : this.new = 0 {}
                              ^
 
-parser/declaring_constructors/new_in_initializer:6:30: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:6:30: A method declaration needs an explicit list of parameters.
   const new() : this.new = 0 {}
                              ^
 
-parser/declaring_constructors/new_in_initializer:7:22: Expected an identifier, but got 'new'.
+parser/primary_constructors/new_in_initializer:7:22: Expected an identifier, but got 'new'.
   new named() : this.new = 0;
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:7:17: Expected an assignment after the field name.
+parser/primary_constructors/new_in_initializer:7:17: Expected an assignment after the field name.
   new named() : this.new = 0;
                 ^^^^
 
-parser/declaring_constructors/new_in_initializer:7:22: Expected a function body, but got 'new'.
+parser/primary_constructors/new_in_initializer:7:22: Expected a function body, but got 'new'.
   new named() : this.new = 0;
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:7:22: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:7:22: A method declaration needs an explicit list of parameters.
   new named() : this.new = 0;
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:7:26: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/new_in_initializer:7:26: Only factory constructor can specify '=' redirection.
   new named() : this.new = 0;
                          ^
 
-parser/declaring_constructors/new_in_initializer:7:28: Expected an identifier, but got '0'.
+parser/primary_constructors/new_in_initializer:7:28: Expected an identifier, but got '0'.
   new named() : this.new = 0;
                            ^
 
-parser/declaring_constructors/new_in_initializer:7:26: Expected ';' after this.
+parser/primary_constructors/new_in_initializer:7:26: Expected ';' after this.
   new named() : this.new = 0;
                          ^
 
-parser/declaring_constructors/new_in_initializer:7:28: Expected a class member, but got '0'.
+parser/primary_constructors/new_in_initializer:7:28: Expected a class member, but got '0'.
   new named() : this.new = 0;
                            ^
 
-parser/declaring_constructors/new_in_initializer:7:29: Expected a class member, but got ';'.
+parser/primary_constructors/new_in_initializer:7:29: Expected a class member, but got ';'.
   new named() : this.new = 0;
                             ^
 
-parser/declaring_constructors/new_in_initializer:8:28: Expected an identifier, but got 'new'.
+parser/primary_constructors/new_in_initializer:8:28: Expected an identifier, but got 'new'.
   const new named() : this.new = 0;
                            ^^^
 
-parser/declaring_constructors/new_in_initializer:8:23: Expected an assignment after the field name.
+parser/primary_constructors/new_in_initializer:8:23: Expected an assignment after the field name.
   const new named() : this.new = 0;
                       ^^^^
 
-parser/declaring_constructors/new_in_initializer:8:28: Expected a function body, but got 'new'.
+parser/primary_constructors/new_in_initializer:8:28: Expected a function body, but got 'new'.
   const new named() : this.new = 0;
                            ^^^
 
-parser/declaring_constructors/new_in_initializer:8:28: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:8:28: A method declaration needs an explicit list of parameters.
   const new named() : this.new = 0;
                            ^^^
 
-parser/declaring_constructors/new_in_initializer:8:32: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/new_in_initializer:8:32: Only factory constructor can specify '=' redirection.
   const new named() : this.new = 0;
                                ^
 
-parser/declaring_constructors/new_in_initializer:8:34: Expected an identifier, but got '0'.
+parser/primary_constructors/new_in_initializer:8:34: Expected an identifier, but got '0'.
   const new named() : this.new = 0;
                                  ^
 
-parser/declaring_constructors/new_in_initializer:8:32: Expected ';' after this.
+parser/primary_constructors/new_in_initializer:8:32: Expected ';' after this.
   const new named() : this.new = 0;
                                ^
 
-parser/declaring_constructors/new_in_initializer:8:34: Expected a class member, but got '0'.
+parser/primary_constructors/new_in_initializer:8:34: Expected a class member, but got '0'.
   const new named() : this.new = 0;
                                  ^
 
-parser/declaring_constructors/new_in_initializer:8:35: Expected a class member, but got ';'.
+parser/primary_constructors/new_in_initializer:8:35: Expected a class member, but got ';'.
   const new named() : this.new = 0;
                                   ^
 
-parser/declaring_constructors/new_in_initializer:9:22: Expected an identifier, but got 'new'.
+parser/primary_constructors/new_in_initializer:9:22: Expected an identifier, but got 'new'.
   new named() : this.new = 0 {}
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:9:17: Expected an assignment after the field name.
+parser/primary_constructors/new_in_initializer:9:17: Expected an assignment after the field name.
   new named() : this.new = 0 {}
                 ^^^^
 
-parser/declaring_constructors/new_in_initializer:9:22: Expected a function body, but got 'new'.
+parser/primary_constructors/new_in_initializer:9:22: Expected a function body, but got 'new'.
   new named() : this.new = 0 {}
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:9:22: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:9:22: A method declaration needs an explicit list of parameters.
   new named() : this.new = 0 {}
                      ^^^
 
-parser/declaring_constructors/new_in_initializer:9:26: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/new_in_initializer:9:26: Only factory constructor can specify '=' redirection.
   new named() : this.new = 0 {}
                          ^
 
-parser/declaring_constructors/new_in_initializer:9:28: Expected an identifier, but got '0'.
+parser/primary_constructors/new_in_initializer:9:28: Expected an identifier, but got '0'.
   new named() : this.new = 0 {}
                            ^
 
-parser/declaring_constructors/new_in_initializer:9:26: Expected ';' after this.
+parser/primary_constructors/new_in_initializer:9:26: Expected ';' after this.
   new named() : this.new = 0 {}
                          ^
 
-parser/declaring_constructors/new_in_initializer:9:28: Expected a class member, but got '0'.
+parser/primary_constructors/new_in_initializer:9:28: Expected a class member, but got '0'.
   new named() : this.new = 0 {}
                            ^
 
-parser/declaring_constructors/new_in_initializer:9:30: Expected an identifier, but got '{'.
+parser/primary_constructors/new_in_initializer:9:30: Expected an identifier, but got '{'.
   new named() : this.new = 0 {}
                              ^
 
-parser/declaring_constructors/new_in_initializer:9:30: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:9:30: A method declaration needs an explicit list of parameters.
   new named() : this.new = 0 {}
                              ^
 
-parser/declaring_constructors/new_in_initializer:10:28: Expected an identifier, but got 'new'.
+parser/primary_constructors/new_in_initializer:10:28: Expected an identifier, but got 'new'.
   const new named() : this.new = 0 {}
                            ^^^
 
-parser/declaring_constructors/new_in_initializer:10:23: Expected an assignment after the field name.
+parser/primary_constructors/new_in_initializer:10:23: Expected an assignment after the field name.
   const new named() : this.new = 0 {}
                       ^^^^
 
-parser/declaring_constructors/new_in_initializer:10:28: Expected a function body, but got 'new'.
+parser/primary_constructors/new_in_initializer:10:28: Expected a function body, but got 'new'.
   const new named() : this.new = 0 {}
                            ^^^
 
-parser/declaring_constructors/new_in_initializer:10:28: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:10:28: A method declaration needs an explicit list of parameters.
   const new named() : this.new = 0 {}
                            ^^^
 
-parser/declaring_constructors/new_in_initializer:10:32: Only factory constructor can specify '=' redirection.
+parser/primary_constructors/new_in_initializer:10:32: Only factory constructor can specify '=' redirection.
   const new named() : this.new = 0 {}
                                ^
 
-parser/declaring_constructors/new_in_initializer:10:34: Expected an identifier, but got '0'.
+parser/primary_constructors/new_in_initializer:10:34: Expected an identifier, but got '0'.
   const new named() : this.new = 0 {}
                                  ^
 
-parser/declaring_constructors/new_in_initializer:10:32: Expected ';' after this.
+parser/primary_constructors/new_in_initializer:10:32: Expected ';' after this.
   const new named() : this.new = 0 {}
                                ^
 
-parser/declaring_constructors/new_in_initializer:10:34: Expected a class member, but got '0'.
+parser/primary_constructors/new_in_initializer:10:34: Expected a class member, but got '0'.
   const new named() : this.new = 0 {}
                                  ^
 
-parser/declaring_constructors/new_in_initializer:10:36: Expected an identifier, but got '{'.
+parser/primary_constructors/new_in_initializer:10:36: Expected an identifier, but got '{'.
   const new named() : this.new = 0 {}
                                    ^
 
-parser/declaring_constructors/new_in_initializer:10:36: A method declaration needs an explicit list of parameters.
+parser/primary_constructors/new_in_initializer:10:36: A method declaration needs an explicit list of parameters.
   const new named() : this.new = 0 {}
                                    ^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_in_initializer.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_in_initializer.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_new.dart b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_new.dart
rename to pkg/front_end/parser_testcases/primary_constructors/new_new.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.expect
similarity index 90%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_new.dart.expect
index 671ed0d..f2dede8 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.expect

@@ -1,34 +1,34 @@
 Problems reported:
 
-parser/declaring_constructors/new_new:2:7: Constructors declared with the 'new' keyword can't be named 'new'.
+parser/primary_constructors/new_new:2:7: Constructors declared with the 'new' keyword can't be named 'new'.
   new new();
       ^^^
 
-parser/declaring_constructors/new_new:3:13: Constructors declared with the 'new' keyword can't be named 'new'.
+parser/primary_constructors/new_new:3:13: Constructors declared with the 'new' keyword can't be named 'new'.
   const new new();
             ^^^
 
-parser/declaring_constructors/new_new:4:7: Constructors declared with the 'new' keyword can't be named 'new'.
+parser/primary_constructors/new_new:4:7: Constructors declared with the 'new' keyword can't be named 'new'.
   new new() : this.x = 0;
       ^^^
 
-parser/declaring_constructors/new_new:5:13: Constructors declared with the 'new' keyword can't be named 'new'.
+parser/primary_constructors/new_new:5:13: Constructors declared with the 'new' keyword can't be named 'new'.
   const new new() : this.x = 0;
             ^^^
 
-parser/declaring_constructors/new_new:6:7: Constructors declared with the 'new' keyword can't be named 'new'.
+parser/primary_constructors/new_new:6:7: Constructors declared with the 'new' keyword can't be named 'new'.
   new new() {}
       ^^^
 
-parser/declaring_constructors/new_new:7:13: Constructors declared with the 'new' keyword can't be named 'new'.
+parser/primary_constructors/new_new:7:13: Constructors declared with the 'new' keyword can't be named 'new'.
   const new new() {}
             ^^^
 
-parser/declaring_constructors/new_new:8:7: Constructors declared with the 'new' keyword can't be named 'new'.
+parser/primary_constructors/new_new:8:7: Constructors declared with the 'new' keyword can't be named 'new'.
   new new() : this.x = 0 {}
       ^^^
 
-parser/declaring_constructors/new_new:9:13: Constructors declared with the 'new' keyword can't be named 'new'.
+parser/primary_constructors/new_new:9:13: Constructors declared with the 'new' keyword can't be named 'new'.
   const new new() : this.x = 0 {}
             ^^^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_new.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_new.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/new_new.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_new.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_new.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart
rename to pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.expect
similarity index 90%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.expect
index 0ec1189..c846a40 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.expect

@@ -1,34 +1,34 @@
 Problems reported:
 
-parser/declaring_constructors/new_qualified_name:2:7: Constructors declared with the 'new' keyword can't have qualified names.
+parser/primary_constructors/new_qualified_name:2:7: Constructors declared with the 'new' keyword can't have qualified names.
   new C.named();
       ^
 
-parser/declaring_constructors/new_qualified_name:3:7: Constructors declared with the 'new' keyword can't have qualified names.
+parser/primary_constructors/new_qualified_name:3:7: Constructors declared with the 'new' keyword can't have qualified names.
   new C.named() : this.i = 0;
       ^
 
-parser/declaring_constructors/new_qualified_name:4:7: Constructors declared with the 'new' keyword can't have qualified names.
+parser/primary_constructors/new_qualified_name:4:7: Constructors declared with the 'new' keyword can't have qualified names.
   new C.named() : this.i = 0 {}
       ^
 
-parser/declaring_constructors/new_qualified_name:5:7: Constructors declared with the 'new' keyword can't have qualified names.
+parser/primary_constructors/new_qualified_name:5:7: Constructors declared with the 'new' keyword can't have qualified names.
   new C.named() {}
       ^
 
-parser/declaring_constructors/new_qualified_name:6:13: Constructors declared with the 'new' keyword can't have qualified names.
+parser/primary_constructors/new_qualified_name:6:13: Constructors declared with the 'new' keyword can't have qualified names.
   const new C.named();
             ^
 
-parser/declaring_constructors/new_qualified_name:7:13: Constructors declared with the 'new' keyword can't have qualified names.
+parser/primary_constructors/new_qualified_name:7:13: Constructors declared with the 'new' keyword can't have qualified names.
   const new C.named() : this.i = 0;
             ^
 
-parser/declaring_constructors/new_qualified_name:8:13: Constructors declared with the 'new' keyword can't have qualified names.
+parser/primary_constructors/new_qualified_name:8:13: Constructors declared with the 'new' keyword can't have qualified names.
   const new C.named() : this.i = 0 {}
             ^
 
-parser/declaring_constructors/new_qualified_name:9:13: Constructors declared with the 'new' keyword can't have qualified names.
+parser/primary_constructors/new_qualified_name:9:13: Constructors declared with the 'new' keyword can't have qualified names.
   const new C.named() {}
             ^
 

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/new_qualified_name.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/new_qualified_name.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_body.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_body.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.expect
similarity index 83%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.expect
index 61d3e3b..a017561 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.expect

@@ -1,386 +1,386 @@
 Problems reported:
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:2:8: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:2:8: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C;
        ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:3:18: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:3:18: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C extends O;
                  ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:4:31: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:4:31: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C extends O implements I;
                               ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:5:38: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:5:38: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C extends O with M implements I;
                                      ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:6:25: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:6:25: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C extends O with M;
                         ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:7:21: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:7:21: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C implements I;
                     ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:8:28: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:8:28: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C with M implements I;
                            ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:9:15: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:9:15: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C with M;
               ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:10:11: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:10:11: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>;
           ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:11:24: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:11:24: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T> extends O<T>;
                        ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:12:40: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:12:40: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T> extends O<T> implements I<T>;
                                        ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:13:50: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:13:50: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T> extends O<T> with M<T> implements I<T>;
                                                  ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:14:34: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:14:34: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T> extends O<T> with M<T>;
                                  ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:15:27: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:15:27: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T> implements I<T>;
                           ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:16:37: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:16:37: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T> with M<T> implements I<T>;
                                     ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:17:21: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:17:21: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T> with M<T>;
                     ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:18:10: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:18:10: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C();
          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:19:20: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:19:20: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C() extends O;
                    ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:20:33: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:20:33: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C() extends O implements I;
                                 ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:21:40: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:21:40: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C() extends O with M implements I;
                                        ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:22:27: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:22:27: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C() extends O with M;
                           ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:23:23: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:23:23: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C() implements I;
                       ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:24:30: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:24:30: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C() with M implements I;
                              ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:25:17: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:25:17: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C() with M;
                 ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:26:13: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:26:13: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>();
             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:27:26: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:27:26: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>() extends O<T>;
                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:28:42: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:28:42: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>() extends O<T> implements I<T>;
                                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:29:52: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:29:52: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>() extends O<T> with M<T> implements I<T>;
                                                    ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:30:36: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:30:36: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>() extends O<T> with M<T>;
                                    ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:31:29: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:31:29: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>() implements I<T>;
                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:32:39: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:32:39: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>() with M<T> implements I<T>;
                                       ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:33:23: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:33:23: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>() with M<T>;
                       ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:34:16: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:34:16: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C();
                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:35:26: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:35:26: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C() extends O;
                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:36:39: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:36:39: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C() extends O implements I;
                                       ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:37:46: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:37:46: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C() extends O with M implements I;
                                              ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:38:33: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:38:33: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C() extends O with M;
                                 ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:39:29: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:39:29: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C() implements I;
                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:40:36: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:40:36: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C() with M implements I;
                                    ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:41:23: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:41:23: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C() with M;
                       ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:42:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:42:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>();
                   ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:43:32: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:43:32: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>() extends O<T>;
                                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:44:48: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:44:48: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>() extends O<T> implements I<T>;
                                                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:45:58: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:45:58: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>() extends O<T> with M<T> implements I<T>;
                                                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:46:42: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:46:42: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>() extends O<T> with M<T>;
                                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:47:35: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:47:35: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>() implements I<T>;
                                   ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:48:45: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:48:45: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>() with M<T> implements I<T>;
                                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:49:29: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:49:29: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>() with M<T>;
                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:50:16: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:50:16: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C.named();
                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:51:26: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:51:26: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C.named() extends O;
                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:52:39: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:52:39: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C.named() extends O implements I;
                                       ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:53:46: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:53:46: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C.named() extends O with M implements I;
                                              ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:54:33: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:54:33: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C.named() extends O with M;
                                 ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:55:29: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:55:29: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C.named() implements I;
                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:56:36: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:56:36: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C.named() with M implements I;
                                    ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:57:23: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:57:23: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C.named() with M;
                       ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:58:19: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:58:19: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>.named();
                   ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:59:32: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:59:32: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>.named() extends O<T>;
                                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:60:48: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:60:48: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>.named() extends O<T> implements I<T>;
                                                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:61:58: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:61:58: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>.named() extends O<T> with M<T> implements I<T>;
                                                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:62:42: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:62:42: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>.named() extends O<T> with M<T>;
                                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:63:35: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:63:35: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>.named() implements I<T>;
                                   ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:64:45: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:64:45: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>.named() with M<T> implements I<T>;
                                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:65:29: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:65:29: This requires the experimental 'primary-constructors' language feature to be enabled.
 class C<T>.named() with M<T>;
                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:66:22: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:66:22: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C.named();
                      ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:67:32: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:67:32: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C.named() extends O;
                                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:68:45: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:68:45: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C.named() extends O implements I;
                                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:69:52: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:69:52: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C.named() extends O with M implements I;
                                                    ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:70:39: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:70:39: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C.named() extends O with M;
                                       ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:71:35: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:71:35: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C.named() implements I;
                                   ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:72:42: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:72:42: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C.named() with M implements I;
                                          ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:73:29: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:73:29: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C.named() with M;
                             ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:74:25: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:74:25: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>.named();
                         ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:75:38: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:75:38: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>.named() extends O<T>;
                                      ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:76:54: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:76:54: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>.named() extends O<T> implements I<T>;
                                                      ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:77:64: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:77:64: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>.named() extends O<T> with M<T> implements I<T>;
                                                                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:78:48: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:78:48: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>.named() extends O<T> with M<T>;
                                                ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:79:41: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:79:41: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>.named() implements I<T>;
                                         ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:80:51: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:80:51: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>.named() with M<T> implements I<T>;
                                                   ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:81:35: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:81:35: This requires the experimental 'primary-constructors' language feature to be enabled.
 class const C<T>.named() with M<T>;
                                   ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:83:25: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:83:25: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(int i);
                         ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:84:38: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:84:38: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET(int i) implements I;
                                      ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:85:28: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:85:28: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET<T>(int i);
                            ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:86:44: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:86:44: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET<T>(int i) implements I<T>;
                                            ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:87:31: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:87:31: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type const ET(int i);
                               ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:88:44: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:88:44: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type const ET(int i) implements I;
                                            ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:89:34: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:89:34: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type const ET<T>(int i);
                                  ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:90:50: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:90:50: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type const ET<T>(int i) implements I<T>;
                                                  ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:91:31: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:91:31: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET.named(int i);
                               ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:92:44: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:92:44: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET.named(int i) implements I;
                                            ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:93:34: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:93:34: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET<T>.named(int i);
                                  ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:94:50: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:94:50: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type ET<T>.named(int i) implements I<T>;
                                                  ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:95:37: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:95:37: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type const ET.named(int i);
                                     ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:96:50: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:96:50: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type const ET.named(int i) implements I;
                                                  ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:97:40: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:97:40: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type const ET<T>.named(int i);
                                        ^
 
-parser/declaring_constructors/no_class_extension_type_body_pre_feature:98:56: This requires the experimental 'declaring-constructors' language feature to be enabled.
+parser/primary_constructors/no_class_extension_type_body_pre_feature:98:56: This requires the experimental 'primary-constructors' language feature to be enabled.
 extension type const ET<T>.named(int i) implements I<T>;
                                                        ^
 
@@ -397,7 +397,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -415,7 +415,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -436,7 +436,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -462,7 +462,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -485,7 +485,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -504,7 +504,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -528,7 +528,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -549,7 +549,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -573,7 +573,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -603,7 +603,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -640,7 +640,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -686,7 +686,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -725,7 +725,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -756,7 +756,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -796,7 +796,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -829,7 +829,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -848,7 +848,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -869,7 +869,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -893,7 +893,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -922,7 +922,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -948,7 +948,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -970,7 +970,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -997,7 +997,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1021,7 +1021,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1048,7 +1048,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1081,7 +1081,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1121,7 +1121,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1170,7 +1170,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1212,7 +1212,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1246,7 +1246,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1289,7 +1289,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1325,7 +1325,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1344,7 +1344,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1365,7 +1365,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1389,7 +1389,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1418,7 +1418,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1444,7 +1444,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1466,7 +1466,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1493,7 +1493,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1517,7 +1517,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1544,7 +1544,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1577,7 +1577,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1617,7 +1617,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1666,7 +1666,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1708,7 +1708,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1742,7 +1742,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1785,7 +1785,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1821,7 +1821,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1841,7 +1841,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1863,7 +1863,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1888,7 +1888,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1918,7 +1918,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1945,7 +1945,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1968,7 +1968,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -1996,7 +1996,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2021,7 +2021,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2049,7 +2049,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2083,7 +2083,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2124,7 +2124,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2174,7 +2174,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2217,7 +2217,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2252,7 +2252,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2296,7 +2296,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2333,7 +2333,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2353,7 +2353,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2375,7 +2375,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2400,7 +2400,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2430,7 +2430,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2457,7 +2457,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2480,7 +2480,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2508,7 +2508,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2533,7 +2533,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2561,7 +2561,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2595,7 +2595,7 @@
       handleClassNoWithClause()
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2636,7 +2636,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2686,7 +2686,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2729,7 +2729,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2764,7 +2764,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2808,7 +2808,7 @@
       handleType(I, null)
       handleImplements(implements, 1)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2845,7 +2845,7 @@
       handleClassWithClause(with)
       handleImplements(null, 0)
       handleClassHeader(class, class, null)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoClassBody(;)
     endClassDeclaration(class, ;)
   endTopLevelDeclaration(;)
@@ -2868,7 +2868,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor((, null, false, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -2894,7 +2894,7 @@
       handleNoTypeArguments(;)
       handleType(I, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -2925,7 +2925,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor((, null, false, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -2963,7 +2963,7 @@
       endTypeArguments(1, <, >)
       handleType(I, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -2986,7 +2986,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor((, const, false, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3012,7 +3012,7 @@
       handleNoTypeArguments(;)
       handleType(I, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3043,7 +3043,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor((, const, false, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3081,7 +3081,7 @@
       endTypeArguments(1, <, >)
       handleType(I, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3105,7 +3105,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor(., null, true, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3132,7 +3132,7 @@
       handleNoTypeArguments(;)
       handleType(I, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3164,7 +3164,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor(., null, true, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3203,7 +3203,7 @@
       endTypeArguments(1, <, >)
       handleType(I, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3227,7 +3227,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor(., const, true, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3254,7 +3254,7 @@
       handleNoTypeArguments(;)
       handleType(I, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3286,7 +3286,7 @@
         endFormalParameters(1, (, ), MemberKind.PrimaryConstructor)
       endPrimaryConstructor(., const, true, true)
       handleImplements(null, 0)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)
@@ -3325,7 +3325,7 @@
       endTypeArguments(1, <, >)
       handleType(I, null)
       handleImplements(implements, 1)
-      handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+      handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
       handleNoExtensionTypeBody(;)
     endExtensionTypeDeclaration(extension, null, extension, type, ;)
   endTopLevelDeclaration(;)

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect
similarity index 95%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect
index b85f11a..7bd0b1f 100644
--- a/pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.intertwined.expect

@@ -25,8 +25,8 @@
             parseClassOrMixinOrEnumImplementsOpt(C)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -56,8 +56,8 @@
             parseClassOrMixinOrEnumImplementsOpt(O)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -90,8 +90,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -130,8 +130,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -167,8 +167,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -198,8 +198,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -235,8 +235,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -269,8 +269,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -305,8 +305,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -348,8 +348,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -398,8 +398,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -458,8 +458,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -511,8 +511,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -554,8 +554,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -607,8 +607,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -653,8 +653,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -686,8 +686,8 @@
             parseClassOrMixinOrEnumImplementsOpt())
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -722,8 +722,8 @@
             parseClassOrMixinOrEnumImplementsOpt(O)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -761,8 +761,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -806,8 +806,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -848,8 +848,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -884,8 +884,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -926,8 +926,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -965,8 +965,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1006,8 +1006,8 @@
             parseClassOrMixinOrEnumImplementsOpt())
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1054,8 +1054,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1109,8 +1109,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1174,8 +1174,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1232,8 +1232,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1280,8 +1280,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1338,8 +1338,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1389,8 +1389,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1422,8 +1422,8 @@
             parseClassOrMixinOrEnumImplementsOpt())
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1458,8 +1458,8 @@
             parseClassOrMixinOrEnumImplementsOpt(O)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1497,8 +1497,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1542,8 +1542,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1584,8 +1584,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1620,8 +1620,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1662,8 +1662,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1701,8 +1701,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1742,8 +1742,8 @@
             parseClassOrMixinOrEnumImplementsOpt())
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1790,8 +1790,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1845,8 +1845,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1910,8 +1910,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -1968,8 +1968,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2016,8 +2016,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2074,8 +2074,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2125,8 +2125,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2160,8 +2160,8 @@
             parseClassOrMixinOrEnumImplementsOpt())
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2198,8 +2198,8 @@
             parseClassOrMixinOrEnumImplementsOpt(O)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2239,8 +2239,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2286,8 +2286,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2330,8 +2330,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2368,8 +2368,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2412,8 +2412,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2453,8 +2453,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2496,8 +2496,8 @@
             parseClassOrMixinOrEnumImplementsOpt())
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2546,8 +2546,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2603,8 +2603,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2670,8 +2670,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2730,8 +2730,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2780,8 +2780,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2840,8 +2840,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2893,8 +2893,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2928,8 +2928,8 @@
             parseClassOrMixinOrEnumImplementsOpt())
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -2966,8 +2966,8 @@
             parseClassOrMixinOrEnumImplementsOpt(O)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3007,8 +3007,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3054,8 +3054,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3098,8 +3098,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3136,8 +3136,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3180,8 +3180,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3221,8 +3221,8 @@
             parseClassOrMixinOrEnumImplementsOpt(M)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3264,8 +3264,8 @@
             parseClassOrMixinOrEnumImplementsOpt())
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3314,8 +3314,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3371,8 +3371,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3438,8 +3438,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3498,8 +3498,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3548,8 +3548,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3608,8 +3608,8 @@
               listener: handleType(I, null)
               listener: handleImplements(implements, 1)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3661,8 +3661,8 @@
             parseClassOrMixinOrEnumImplementsOpt(>)
               listener: handleImplements(null, 0)
             listener: handleClassHeader(class, class, null)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoClassBody(;)
           listener: endClassDeclaration(class, ;)
   listener: endTopLevelDeclaration(;)
@@ -3697,8 +3697,8 @@
             listener: endPrimaryConstructor((, null, false, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -3736,8 +3736,8 @@
             listener: handleNoTypeArguments(;)
             listener: handleType(I, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -3780,8 +3780,8 @@
             listener: endPrimaryConstructor((, null, false, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -3831,8 +3831,8 @@
             listener: endTypeArguments(1, <, >)
             listener: handleType(I, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -3867,8 +3867,8 @@
             listener: endPrimaryConstructor((, const, false, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -3906,8 +3906,8 @@
             listener: handleNoTypeArguments(;)
             listener: handleType(I, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -3950,8 +3950,8 @@
             listener: endPrimaryConstructor((, const, false, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4001,8 +4001,8 @@
             listener: endTypeArguments(1, <, >)
             listener: handleType(I, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4039,8 +4039,8 @@
             listener: endPrimaryConstructor(., null, true, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4080,8 +4080,8 @@
             listener: handleNoTypeArguments(;)
             listener: handleType(I, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4126,8 +4126,8 @@
             listener: endPrimaryConstructor(., null, true, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4179,8 +4179,8 @@
             listener: endTypeArguments(1, <, >)
             listener: handleType(I, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4217,8 +4217,8 @@
             listener: endPrimaryConstructor(., const, true, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4258,8 +4258,8 @@
             listener: handleNoTypeArguments(;)
             listener: handleType(I, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4304,8 +4304,8 @@
             listener: endPrimaryConstructor(., const, true, true)
           parseClassOrMixinOrEnumImplementsOpt())
             listener: handleImplements(null, 0)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)
@@ -4357,8 +4357,8 @@
             listener: endTypeArguments(1, <, >)
             listener: handleType(I, null)
             listener: handleImplements(implements, 1)
-          reportExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
-            listener: handleExperimentNotEnabled(ExperimentalFlag.declaringConstructors, ;, ;)
+          reportExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
+            listener: handleExperimentNotEnabled(ExperimentalFlag.primaryConstructors, ;, ;)
           listener: handleNoExtensionTypeBody(;)
           listener: endExtensionTypeDeclaration(extension, null, extension, type, ;)
   listener: endTopLevelDeclaration(;)

diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_class_extension_type_body_pre_feature.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_class_extension_type_body_pre_feature.dart.scanner.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart b/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart
rename to pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart.expect b/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart.intertwined.expect b/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.intertwined.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart.intertwined.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.intertwined.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart.parser.expect b/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.parser.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart.parser.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.parser.expect


diff --git a/pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart.scanner.expect b/pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.scanner.expect
similarity index 100%
rename from pkg/front_end/parser_testcases/declaring_constructors/no_extension_type_body.dart.scanner.expect
rename to pkg/front_end/parser_testcases/primary_constructors/no_extension_type_body.dart.scanner.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.modular.expect b/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.modular.expect
deleted file mode 100644
index f4a7ba8..0000000
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.modular.expect
+++ /dev/null

@@ -1,64 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:10:14: Error: Final field 'i' is not initialized.
-// Try to initialize the field in the declaration or in every constructor.
-//   final int? i; // Error
-//              ^
-//
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
-// class const C4() { // Error
-//               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:14:8: Context: Field isn't final, but constructor is 'const'.
-//   int? i;
-//        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  constructor •() → self::C1
-    : super core::Object::•()
-    ;
-}
-class C2 extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::C2
-    : super core::Object::•()
-    ;
-}
-class C3 extends core::Object {
-  final field core::int? i = null;
-  constructor •() → self::C3
-    : super core::Object::•()
-    ;
-}
-class C4 extends core::Object /*hasConstConstructor*/  {
-  field core::int? i = null;
-  const constructor •() → self::C4
-    : super core::Object::•()
-    ;
-}
-static method test() → dynamic {
-  new self::C3::•();
-  new self::C4::•();
-  #C2;
-}
-static method main() → dynamic {
-  new self::C1::•();
-  new self::C2::•();
-  #C3;
-}
-
-constants  {
-  #C1 = null
-  #C2 = self::C4 {i:#C1}
-  #C3 = self::C2 {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///class_primary_constructor.dart:
-- C4. (from org-dartlang-testcase:///class_primary_constructor.dart:13:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- C2. (from org-dartlang-testcase:///class_primary_constructor.dart:7:15)

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.transformed.expect b/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.transformed.expect
deleted file mode 100644
index f4a7ba8..0000000
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.transformed.expect
+++ /dev/null

@@ -1,64 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:10:14: Error: Final field 'i' is not initialized.
-// Try to initialize the field in the declaration or in every constructor.
-//   final int? i; // Error
-//              ^
-//
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
-// class const C4() { // Error
-//               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:14:8: Context: Field isn't final, but constructor is 'const'.
-//   int? i;
-//        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  constructor •() → self::C1
-    : super core::Object::•()
-    ;
-}
-class C2 extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::C2
-    : super core::Object::•()
-    ;
-}
-class C3 extends core::Object {
-  final field core::int? i = null;
-  constructor •() → self::C3
-    : super core::Object::•()
-    ;
-}
-class C4 extends core::Object /*hasConstConstructor*/  {
-  field core::int? i = null;
-  const constructor •() → self::C4
-    : super core::Object::•()
-    ;
-}
-static method test() → dynamic {
-  new self::C3::•();
-  new self::C4::•();
-  #C2;
-}
-static method main() → dynamic {
-  new self::C1::•();
-  new self::C2::•();
-  #C3;
-}
-
-constants  {
-  #C1 = null
-  #C2 = self::C4 {i:#C1}
-  #C3 = self::C2 {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///class_primary_constructor.dart:
-- C4. (from org-dartlang-testcase:///class_primary_constructor.dart:13:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- C2. (from org-dartlang-testcase:///class_primary_constructor.dart:7:15)

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.modular.expect b/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.modular.expect
deleted file mode 100644
index deeee777..0000000
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.modular.expect
+++ /dev/null

@@ -1,151 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
-// class const C5(var int a) {} // Error
-//               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:24: Context: Field isn't final, but constructor is 'const'.
-// class const C5(var int a) {} // Error
-//                        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  constructor •(core::int a, [core::int? b = #C1, core::int c = #C2]) → self::C1
-    : super core::Object::•()
-    ;
-}
-class C2 extends core::Object {
-  field core::int a;
-  field core::int? b;
-  field core::int c;
-  constructor •(core::int a, [core::int? b = #C1, core::int c = #C2]) → self::C2
-    : self::C2::a = a, self::C2::b = b, self::C2::c = c, super core::Object::•()
-    ;
-}
-class C3 extends core::Object {
-  final field core::int a;
-  final field core::int? b;
-  final field core::int c;
-  constructor •(final core::int a, [final core::int? b = #C1, final core::int c = #C2]) → self::C3
-    : self::C3::a = a, self::C3::b = b, self::C3::c = c, super core::Object::•()
-    ;
-}
-class C4 extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int a) → self::C4
-    : super core::Object::•()
-    ;
-}
-class C5 extends core::Object /*hasConstConstructor*/  {
-  field core::int a;
-  const constructor •(core::int a) → self::C5
-    : self::C5::a = a, super core::Object::•()
-    ;
-}
-class C6 extends core::Object /*hasConstConstructor*/  {
-  final field core::int b;
-  const constructor •(final core::int b) → self::C6
-    : self::C6::b = b, super core::Object::•()
-    ;
-}
-class C7 extends core::Object {
-  constructor •({core::int? a = #C1, required core::int b, core::int c = #C2}) → self::C7
-    : super core::Object::•()
-    ;
-}
-class C8 extends core::Object {
-  field core::int? a;
-  field core::int b;
-  field core::int c;
-  constructor •({core::int? a = #C1, required core::int b, core::int c = #C2}) → self::C8
-    : self::C8::a = a, self::C8::b = b, self::C8::c = c, super core::Object::•()
-    ;
-}
-class C9 extends core::Object {
-  final field core::int? a;
-  final field core::int b;
-  final field core::int c;
-  constructor •({final core::int? a = #C1, required final core::int b, final core::int c = #C2}) → self::C9
-    : self::C9::a = a, self::C9::b = b, self::C9::c = c, super core::Object::•()
-    ;
-}
-class C10 extends core::Object /*hasConstConstructor*/  {
-  final field core::int a;
-  final field core::int? b;
-  final field core::int c;
-  const constructor •(final core::int a, [final core::int? b = #C1, final core::int c = #C2]) → self::C10
-    : self::C10::a = a, self::C10::b = b, self::C10::c = c, super core::Object::•()
-    ;
-}
-class C11 extends core::Object /*hasConstConstructor*/  {
-  final field core::int? a;
-  final field core::int b;
-  final field core::int c;
-  const constructor •({final core::int? a = #C1, required final core::int b, final core::int c = #C2}) → self::C11
-    : self::C11::a = a, self::C11::b = b, self::C11::c = c, super core::Object::•()
-    ;
-}
-static method main() → dynamic {
-  new self::C1::•(0);
-  new self::C1::•(0, 1);
-  new self::C1::•(0, 1, 2);
-  new self::C2::•(0);
-  new self::C2::•(0, 1);
-  new self::C2::•(0, 1, 2);
-  new self::C3::•(0);
-  new self::C3::•(0, 1);
-  new self::C3::•(0, 1, 2);
-  new self::C4::•(0);
-  #C3;
-  new self::C5::•(0);
-  new self::C6::•(0);
-  #C5;
-  new self::C7::•(b: 1);
-  new self::C7::•(a: 0, b: 1);
-  new self::C7::•(a: 0, b: 1, c: 2);
-  new self::C8::•(b: 1);
-  new self::C8::•(a: 0, b: 1);
-  new self::C8::•(a: 0, b: 1, c: 2);
-  new self::C9::•(b: 1);
-  new self::C9::•(a: 0, b: 1);
-  new self::C9::•(a: 0, b: 1, c: 2);
-  new self::C10::•(0);
-  new self::C10::•(0, 1);
-  new self::C10::•(0, 1, 2);
-  #C6;
-  #C8;
-  #C10;
-  new self::C11::•(b: 1);
-  new self::C11::•(a: 0, b: 1);
-  new self::C11::•(a: 0, b: 1, c: 2);
-  #C11;
-  #C12;
-  #C13;
-}
-
-constants  {
-  #C1 = null
-  #C2 = 42
-  #C3 = self::C4 {}
-  #C4 = 0
-  #C5 = self::C6 {b:#C4}
-  #C6 = self::C10 {a:#C4, b:#C1, c:#C2}
-  #C7 = 1
-  #C8 = self::C10 {a:#C4, b:#C7, c:#C2}
-  #C9 = 2
-  #C10 = self::C10 {a:#C4, b:#C7, c:#C9}
-  #C11 = self::C11 {a:#C1, b:#C7, c:#C2}
-  #C12 = self::C11 {a:#C4, b:#C7, c:#C2}
-  #C13 = self::C11 {a:#C4, b:#C7, c:#C9}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///class_primary_declaring_parameters.dart:
-- C4. (from org-dartlang-testcase:///class_primary_declaring_parameters.dart:11:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- C6. (from org-dartlang-testcase:///class_primary_declaring_parameters.dart:15:15)
-- C10. (from org-dartlang-testcase:///class_primary_declaring_parameters.dart:23:16)
-- C11. (from org-dartlang-testcase:///class_primary_declaring_parameters.dart:25:16)

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.transformed.expect b/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.transformed.expect
deleted file mode 100644
index deeee777..0000000
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.transformed.expect
+++ /dev/null

@@ -1,151 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
-// class const C5(var int a) {} // Error
-//               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:24: Context: Field isn't final, but constructor is 'const'.
-// class const C5(var int a) {} // Error
-//                        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  constructor •(core::int a, [core::int? b = #C1, core::int c = #C2]) → self::C1
-    : super core::Object::•()
-    ;
-}
-class C2 extends core::Object {
-  field core::int a;
-  field core::int? b;
-  field core::int c;
-  constructor •(core::int a, [core::int? b = #C1, core::int c = #C2]) → self::C2
-    : self::C2::a = a, self::C2::b = b, self::C2::c = c, super core::Object::•()
-    ;
-}
-class C3 extends core::Object {
-  final field core::int a;
-  final field core::int? b;
-  final field core::int c;
-  constructor •(final core::int a, [final core::int? b = #C1, final core::int c = #C2]) → self::C3
-    : self::C3::a = a, self::C3::b = b, self::C3::c = c, super core::Object::•()
-    ;
-}
-class C4 extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int a) → self::C4
-    : super core::Object::•()
-    ;
-}
-class C5 extends core::Object /*hasConstConstructor*/  {
-  field core::int a;
-  const constructor •(core::int a) → self::C5
-    : self::C5::a = a, super core::Object::•()
-    ;
-}
-class C6 extends core::Object /*hasConstConstructor*/  {
-  final field core::int b;
-  const constructor •(final core::int b) → self::C6
-    : self::C6::b = b, super core::Object::•()
-    ;
-}
-class C7 extends core::Object {
-  constructor •({core::int? a = #C1, required core::int b, core::int c = #C2}) → self::C7
-    : super core::Object::•()
-    ;
-}
-class C8 extends core::Object {
-  field core::int? a;
-  field core::int b;
-  field core::int c;
-  constructor •({core::int? a = #C1, required core::int b, core::int c = #C2}) → self::C8
-    : self::C8::a = a, self::C8::b = b, self::C8::c = c, super core::Object::•()
-    ;
-}
-class C9 extends core::Object {
-  final field core::int? a;
-  final field core::int b;
-  final field core::int c;
-  constructor •({final core::int? a = #C1, required final core::int b, final core::int c = #C2}) → self::C9
-    : self::C9::a = a, self::C9::b = b, self::C9::c = c, super core::Object::•()
-    ;
-}
-class C10 extends core::Object /*hasConstConstructor*/  {
-  final field core::int a;
-  final field core::int? b;
-  final field core::int c;
-  const constructor •(final core::int a, [final core::int? b = #C1, final core::int c = #C2]) → self::C10
-    : self::C10::a = a, self::C10::b = b, self::C10::c = c, super core::Object::•()
-    ;
-}
-class C11 extends core::Object /*hasConstConstructor*/  {
-  final field core::int? a;
-  final field core::int b;
-  final field core::int c;
-  const constructor •({final core::int? a = #C1, required final core::int b, final core::int c = #C2}) → self::C11
-    : self::C11::a = a, self::C11::b = b, self::C11::c = c, super core::Object::•()
-    ;
-}
-static method main() → dynamic {
-  new self::C1::•(0);
-  new self::C1::•(0, 1);
-  new self::C1::•(0, 1, 2);
-  new self::C2::•(0);
-  new self::C2::•(0, 1);
-  new self::C2::•(0, 1, 2);
-  new self::C3::•(0);
-  new self::C3::•(0, 1);
-  new self::C3::•(0, 1, 2);
-  new self::C4::•(0);
-  #C3;
-  new self::C5::•(0);
-  new self::C6::•(0);
-  #C5;
-  new self::C7::•(b: 1);
-  new self::C7::•(a: 0, b: 1);
-  new self::C7::•(a: 0, b: 1, c: 2);
-  new self::C8::•(b: 1);
-  new self::C8::•(a: 0, b: 1);
-  new self::C8::•(a: 0, b: 1, c: 2);
-  new self::C9::•(b: 1);
-  new self::C9::•(a: 0, b: 1);
-  new self::C9::•(a: 0, b: 1, c: 2);
-  new self::C10::•(0);
-  new self::C10::•(0, 1);
-  new self::C10::•(0, 1, 2);
-  #C6;
-  #C8;
-  #C10;
-  new self::C11::•(b: 1);
-  new self::C11::•(a: 0, b: 1);
-  new self::C11::•(a: 0, b: 1, c: 2);
-  #C11;
-  #C12;
-  #C13;
-}
-
-constants  {
-  #C1 = null
-  #C2 = 42
-  #C3 = self::C4 {}
-  #C4 = 0
-  #C5 = self::C6 {b:#C4}
-  #C6 = self::C10 {a:#C4, b:#C1, c:#C2}
-  #C7 = 1
-  #C8 = self::C10 {a:#C4, b:#C7, c:#C2}
-  #C9 = 2
-  #C10 = self::C10 {a:#C4, b:#C7, c:#C9}
-  #C11 = self::C11 {a:#C1, b:#C7, c:#C2}
-  #C12 = self::C11 {a:#C4, b:#C7, c:#C2}
-  #C13 = self::C11 {a:#C4, b:#C7, c:#C9}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///class_primary_declaring_parameters.dart:
-- C4. (from org-dartlang-testcase:///class_primary_declaring_parameters.dart:11:15)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart)
-- C6. (from org-dartlang-testcase:///class_primary_declaring_parameters.dart:15:15)
-- C10. (from org-dartlang-testcase:///class_primary_declaring_parameters.dart:23:16)
-- C11. (from org-dartlang-testcase:///class_primary_declaring_parameters.dart:25:16)

diff --git a/pkg/front_end/testcases/declaring_constructors/folder.options b/pkg/front_end/testcases/declaring_constructors/folder.options
deleted file mode 100644
index 5f80075..0000000
--- a/pkg/front_end/testcases/declaring_constructors/folder.options
+++ /dev/null

@@ -1 +0,0 @@
---enable-experiment=declaring-constructors
\ No newline at end of file

diff --git a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.expect b/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.expect
deleted file mode 100644
index 1fda27a..0000000
--- a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.expect
+++ /dev/null

@@ -1,76 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got 'new'.
-// Try inserting an identifier before 'new'.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:11: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-//   Foo() : this.new = 42;
-//           ^^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected '{' before this.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   Foo() : this.new = 42;
-//                      ^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Expected ';' after this.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Expected a class member, but got '42'.
-//   Foo() : this.new = 42;
-//                      ^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:24: Error: Expected a class member, but got ';'.
-//   Foo() : this.new = 42;
-//                        ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: 'Foo' is already declared in this scope.
-//   Foo() : this.new = 42;
-//                ^^^
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:3: Context: Previous declaration of 'Foo'.
-//   Foo() : this.new = 42;
-//   ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got ''.
-// Try inserting an identifier before ''.
-//   Foo() : this.new = 42;
-//                ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   Foo() : this.new = 42;
-//                      ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  constructor •() → self::Foo
-    : invalid-initializer "pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:11: Error: This couldn't be parsed.
-  Foo() : this.new = 42;
-          ^" {}
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.modular.expect b/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.modular.expect
deleted file mode 100644
index 1fda27a..0000000
--- a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.modular.expect
+++ /dev/null

@@ -1,76 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got 'new'.
-// Try inserting an identifier before 'new'.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:11: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-//   Foo() : this.new = 42;
-//           ^^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected '{' before this.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   Foo() : this.new = 42;
-//                      ^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Expected ';' after this.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Expected a class member, but got '42'.
-//   Foo() : this.new = 42;
-//                      ^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:24: Error: Expected a class member, but got ';'.
-//   Foo() : this.new = 42;
-//                        ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: 'Foo' is already declared in this scope.
-//   Foo() : this.new = 42;
-//                ^^^
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:3: Context: Previous declaration of 'Foo'.
-//   Foo() : this.new = 42;
-//   ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got ''.
-// Try inserting an identifier before ''.
-//   Foo() : this.new = 42;
-//                ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   Foo() : this.new = 42;
-//                      ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  constructor •() → self::Foo
-    : invalid-initializer "pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:11: Error: This couldn't be parsed.
-  Foo() : this.new = 42;
-          ^" {}
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.outline.expect b/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.outline.expect
deleted file mode 100644
index 4ea3cee..0000000
--- a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.outline.expect
+++ /dev/null

@@ -1,59 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got 'new'.
-// Try inserting an identifier before 'new'.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:11: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-//   Foo() : this.new = 42;
-//           ^^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected '{' before this.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   Foo() : this.new = 42;
-//                      ^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Expected ';' after this.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Expected a class member, but got '42'.
-//   Foo() : this.new = 42;
-//                      ^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:24: Error: Expected a class member, but got ';'.
-//   Foo() : this.new = 42;
-//                        ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: 'Foo' is already declared in this scope.
-//   Foo() : this.new = 42;
-//                ^^^
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:3: Context: Previous declaration of 'Foo'.
-//   Foo() : this.new = 42;
-//   ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  constructor •() → self::Foo
-    ;
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.transformed.expect b/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.transformed.expect
deleted file mode 100644
index 1fda27a..0000000
--- a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.strong.transformed.expect
+++ /dev/null

@@ -1,76 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got 'new'.
-// Try inserting an identifier before 'new'.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:11: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-//   Foo() : this.new = 42;
-//           ^^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected '{' before this.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   Foo() : this.new = 42;
-//                ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   Foo() : this.new = 42;
-//                      ^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Expected ';' after this.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Expected a class member, but got '42'.
-//   Foo() : this.new = 42;
-//                      ^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:24: Error: Expected a class member, but got ';'.
-//   Foo() : this.new = 42;
-//                        ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: 'Foo' is already declared in this scope.
-//   Foo() : this.new = 42;
-//                ^^^
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:3: Context: Previous declaration of 'Foo'.
-//   Foo() : this.new = 42;
-//   ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got ''.
-// Try inserting an identifier before ''.
-//   Foo() : this.new = 42;
-//                ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:20: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   Foo() : this.new = 42;
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:22: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   Foo() : this.new = 42;
-//                      ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  constructor •() → self::Foo
-    : invalid-initializer "pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart:7:11: Error: This couldn't be parsed.
-  Foo() : this.new = 42;
-          ^" {}
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.expect b/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.expect
deleted file mode 100644
index 836c3ec..0000000
--- a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.expect
+++ /dev/null

@@ -1,28 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:6:11: Error: The name of a constructor must match the name of the enclosing class.
-//   factory a.b() => throw '';
-//           ^
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:5:7: Context: The name of the enclosing class is 'C1'.
-// class C1 {
-//       ^^
-//
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:10:7: Error: Constructors declared with the 'new' keyword can't have qualified names.
-// Try removing the class name prefix from the qualified name or removing the 'new' keyword.
-//   new a.b();
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  static factory b() → self::C1
-    return throw "";
-}
-class C2 extends core::Object {
-  constructor b() → self::C2
-    : super core::Object::•()
-    ;
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.modular.expect b/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.modular.expect
deleted file mode 100644
index 836c3ec..0000000
--- a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.modular.expect
+++ /dev/null

@@ -1,28 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:6:11: Error: The name of a constructor must match the name of the enclosing class.
-//   factory a.b() => throw '';
-//           ^
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:5:7: Context: The name of the enclosing class is 'C1'.
-// class C1 {
-//       ^^
-//
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:10:7: Error: Constructors declared with the 'new' keyword can't have qualified names.
-// Try removing the class name prefix from the qualified name or removing the 'new' keyword.
-//   new a.b();
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  static factory b() → self::C1
-    return throw "";
-}
-class C2 extends core::Object {
-  constructor b() → self::C2
-    : super core::Object::•()
-    ;
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.outline.expect b/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.outline.expect
deleted file mode 100644
index 81e3953..0000000
--- a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.outline.expect
+++ /dev/null

@@ -1,27 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:6:11: Error: The name of a constructor must match the name of the enclosing class.
-//   factory a.b() => throw '';
-//           ^
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:5:7: Context: The name of the enclosing class is 'C1'.
-// class C1 {
-//       ^^
-//
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:10:7: Error: Constructors declared with the 'new' keyword can't have qualified names.
-// Try removing the class name prefix from the qualified name or removing the 'new' keyword.
-//   new a.b();
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  static factory b() → self::C1
-    ;
-}
-class C2 extends core::Object {
-  constructor b() → self::C2
-    ;
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.transformed.expect b/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.transformed.expect
deleted file mode 100644
index 836c3ec..0000000
--- a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.strong.transformed.expect
+++ /dev/null

@@ -1,28 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:6:11: Error: The name of a constructor must match the name of the enclosing class.
-//   factory a.b() => throw '';
-//           ^
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:5:7: Context: The name of the enclosing class is 'C1'.
-// class C1 {
-//       ^^
-//
-// pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart:10:7: Error: Constructors declared with the 'new' keyword can't have qualified names.
-// Try removing the class name prefix from the qualified name or removing the 'new' keyword.
-//   new a.b();
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  static factory b() → self::C1
-    return throw "";
-}
-class C2 extends core::Object {
-  constructor b() → self::C2
-    : super core::Object::•()
-    ;
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.expect b/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.expect
deleted file mode 100644
index 69c0318..0000000
--- a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.expect
+++ /dev/null

@@ -1,142 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:3: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   new = 42;
-//   ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   new = 42;
-//         ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Expected ';' after this.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Expected a class member, but got '42'.
-//   new = 42;
-//         ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:11: Error: Expected a class member, but got ';'.
-//   new = 42;
-//           ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   new() = 42;
-//           ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Expected ';' after this.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Expected a class member, but got '42'.
-//   new() = 42;
-//           ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:13: Error: Expected a class member, but got ';'.
-//   new() = 42;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:8: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   C3() = C3;
-//        ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:13: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   C4.name() = C4;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Couldn't find constructor 'C4'.
-//   C4.name() = C4;
-//               ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   new = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   new() = 42;
-//           ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:8: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   C3() = C3;
-//        ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   C3() = C3;
-//          ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:13: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   C4.name() = C4;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   C4.name() = C4;
-//               ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  constructor •() → self::C1
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
-Try removing the return type.
-  new = 42;
-        ^";
-}
-class C2 extends core::Object {
-  constructor •() → self::C2
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
-Try removing the return type.
-  new() = 42;
-          ^";
-}
-class C3 extends core::Object {
-  constructor •() → self::C3
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
-Try removing the return type.
-  C3() = C3;
-         ^";
-}
-class C4 extends core::Object {
-  constructor name() → self::C4
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
-Try removing the return type.
-  C4.name() = C4;
-              ^";
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.modular.expect b/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.modular.expect
deleted file mode 100644
index 69c0318..0000000
--- a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.modular.expect
+++ /dev/null

@@ -1,142 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:3: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   new = 42;
-//   ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   new = 42;
-//         ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Expected ';' after this.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Expected a class member, but got '42'.
-//   new = 42;
-//         ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:11: Error: Expected a class member, but got ';'.
-//   new = 42;
-//           ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   new() = 42;
-//           ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Expected ';' after this.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Expected a class member, but got '42'.
-//   new() = 42;
-//           ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:13: Error: Expected a class member, but got ';'.
-//   new() = 42;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:8: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   C3() = C3;
-//        ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:13: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   C4.name() = C4;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Couldn't find constructor 'C4'.
-//   C4.name() = C4;
-//               ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   new = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   new() = 42;
-//           ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:8: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   C3() = C3;
-//        ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   C3() = C3;
-//          ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:13: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   C4.name() = C4;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   C4.name() = C4;
-//               ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  constructor •() → self::C1
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
-Try removing the return type.
-  new = 42;
-        ^";
-}
-class C2 extends core::Object {
-  constructor •() → self::C2
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
-Try removing the return type.
-  new() = 42;
-          ^";
-}
-class C3 extends core::Object {
-  constructor •() → self::C3
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
-Try removing the return type.
-  C3() = C3;
-         ^";
-}
-class C4 extends core::Object {
-  constructor name() → self::C4
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
-Try removing the return type.
-  C4.name() = C4;
-              ^";
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.outline.expect b/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.outline.expect
deleted file mode 100644
index 3568b14..0000000
--- a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.outline.expect
+++ /dev/null

@@ -1,86 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:3: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   new = 42;
-//   ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   new = 42;
-//         ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Expected ';' after this.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Expected a class member, but got '42'.
-//   new = 42;
-//         ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:11: Error: Expected a class member, but got ';'.
-//   new = 42;
-//           ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   new() = 42;
-//           ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Expected ';' after this.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Expected a class member, but got '42'.
-//   new() = 42;
-//           ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:13: Error: Expected a class member, but got ';'.
-//   new() = 42;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:8: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   C3() = C3;
-//        ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:13: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   C4.name() = C4;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Couldn't find constructor 'C4'.
-//   C4.name() = C4;
-//               ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  constructor •() → self::C1
-    ;
-}
-class C2 extends core::Object {
-  constructor •() → self::C2
-    ;
-}
-class C3 extends core::Object {
-  constructor •() → self::C3
-    ;
-}
-class C4 extends core::Object {
-  constructor name() → self::C4
-    ;
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.transformed.expect b/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.transformed.expect
deleted file mode 100644
index 69c0318..0000000
--- a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.strong.transformed.expect
+++ /dev/null

@@ -1,142 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:3: Error: A method declaration needs an explicit list of parameters.
-// Try adding a parameter list to the method declaration.
-//   new = 42;
-//   ^^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   new = 42;
-//         ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Expected ';' after this.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Expected a class member, but got '42'.
-//   new = 42;
-//         ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:11: Error: Expected a class member, but got ';'.
-//   new = 42;
-//           ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Expected an identifier, but got '42'.
-// Try inserting an identifier before '42'.
-//   new() = 42;
-//           ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Expected ';' after this.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Expected a class member, but got '42'.
-//   new() = 42;
-//           ^^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:13: Error: Expected a class member, but got ';'.
-//   new() = 42;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:8: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   C3() = C3;
-//        ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:13: Error: Only factory constructor can specify '=' redirection.
-// Try making this a factory constructor, or remove the redirection.
-//   C4.name() = C4;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Couldn't find constructor 'C4'.
-//   C4.name() = C4;
-//               ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:7: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   new = 42;
-//       ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   new = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:9: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   new() = 42;
-//         ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   new() = 42;
-//           ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:8: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   C3() = C3;
-//        ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   C3() = C3;
-//          ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:13: Error: Expected a function body or '=>'.
-// Try adding {}.
-//   C4.name() = C4;
-//             ^
-//
-// pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
-// Try removing the return type.
-//   C4.name() = C4;
-//               ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  constructor •() → self::C1
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
-Try removing the return type.
-  new = 42;
-        ^";
-}
-class C2 extends core::Object {
-  constructor •() → self::C2
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
-Try removing the return type.
-  new() = 42;
-          ^";
-}
-class C3 extends core::Object {
-  constructor •() → self::C3
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
-Try removing the return type.
-  C3() = C3;
-         ^";
-}
-class C4 extends core::Object {
-  constructor name() → self::C4
-    : super core::Object::•()
-    invalid-expression "pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
-Try removing the return type.
-  C4.name() = C4;
-              ^";
-}

diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.modular.expect b/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.modular.expect
deleted file mode 100644
index e333c9e..0000000
--- a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.modular.expect
+++ /dev/null

@@ -1,93 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
-// extension type ET3(final int i) {}
-//                              ^
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
-// extension type ET4(i) {} // Error
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
-// extension type ET5(var i) {} // Error
-//                        ^
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
-// extension type ET6(final i) {} // Error
-//                          ^
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
-// extension type ET6(final i) {} // Error
-//                          ^
-//
-import self as self;
-import "dart:core" as core;
-
-extension type ET1(core::int i) {
-  abstract extension-type-member representation-field get i() → core::int;
-  constructor • = self::ET1|constructor#;
-  constructor tearoff • = self::ET1|constructor#_#new#tearOff;
-}
-extension type ET2(core::int i) {
-  abstract extension-type-member representation-field get i() → core::int;
-  constructor • = self::ET2|constructor#;
-  constructor tearoff • = self::ET2|constructor#_#new#tearOff;
-}
-extension type ET3(core::int i) {
-  abstract extension-type-member representation-field get i() → core::int;
-  constructor • = self::ET3|constructor#;
-  constructor tearoff • = self::ET3|constructor#_#new#tearOff;
-}
-extension type ET4(invalid-type i) {
-  abstract extension-type-member representation-field get i() → invalid-type;
-  constructor • = self::ET4|constructor#;
-  constructor tearoff • = self::ET4|constructor#_#new#tearOff;
-}
-extension type ET5(invalid-type i) {
-  abstract extension-type-member representation-field get i() → invalid-type;
-  constructor • = self::ET5|constructor#;
-  constructor tearoff • = self::ET5|constructor#_#new#tearOff;
-}
-extension type ET6(invalid-type i) {
-  abstract extension-type-member representation-field get i() → invalid-type;
-  constructor • = self::ET6|constructor#;
-  constructor tearoff • = self::ET6|constructor#_#new#tearOff;
-}
-static extension-type-member method ET1|constructor#(core::int i) → self::ET1% /* erasure=core::int, declared=! */ {
-  lowered final self::ET1% /* erasure=core::int, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET1|constructor#_#new#tearOff(core::int i) → self::ET1% /* erasure=core::int, declared=! */
-  return self::ET1|constructor#(i);
-static extension-type-member method ET2|constructor#(core::int i) → self::ET2% /* erasure=core::int, declared=! */ {
-  lowered final self::ET2% /* erasure=core::int, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET2|constructor#_#new#tearOff(core::int i) → self::ET2% /* erasure=core::int, declared=! */
-  return self::ET2|constructor#(i);
-static extension-type-member method ET3|constructor#(final core::int i) → self::ET3% /* erasure=core::int, declared=! */ {
-  lowered final self::ET3% /* erasure=core::int, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET3|constructor#_#new#tearOff(core::int i) → self::ET3% /* erasure=core::int, declared=! */
-  return self::ET3|constructor#(i);
-static extension-type-member method ET4|constructor#(invalid-type i) → self::ET4% /* erasure=invalid-type, declared=! */ {
-  lowered final self::ET4% /* erasure=invalid-type, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET4|constructor#_#new#tearOff(invalid-type i) → self::ET4% /* erasure=invalid-type, declared=! */
-  return self::ET4|constructor#(i);
-static extension-type-member method ET5|constructor#(invalid-type i) → self::ET5% /* erasure=invalid-type, declared=! */ {
-  lowered final self::ET5% /* erasure=invalid-type, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET5|constructor#_#new#tearOff(invalid-type i) → self::ET5% /* erasure=invalid-type, declared=! */
-  return self::ET5|constructor#(i);
-static extension-type-member method ET6|constructor#(final invalid-type i) → self::ET6% /* erasure=invalid-type, declared=! */ {
-  lowered final self::ET6% /* erasure=invalid-type, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET6|constructor#_#new#tearOff(invalid-type i) → self::ET6% /* erasure=invalid-type, declared=! */
-  return self::ET6|constructor#(i);

diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.transformed.expect b/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.transformed.expect
deleted file mode 100644
index e333c9e..0000000
--- a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.transformed.expect
+++ /dev/null

@@ -1,93 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
-// extension type ET3(final int i) {}
-//                              ^
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
-// extension type ET4(i) {} // Error
-//                    ^
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
-// extension type ET5(var i) {} // Error
-//                        ^
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
-// extension type ET6(final i) {} // Error
-//                          ^
-//
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
-// extension type ET6(final i) {} // Error
-//                          ^
-//
-import self as self;
-import "dart:core" as core;
-
-extension type ET1(core::int i) {
-  abstract extension-type-member representation-field get i() → core::int;
-  constructor • = self::ET1|constructor#;
-  constructor tearoff • = self::ET1|constructor#_#new#tearOff;
-}
-extension type ET2(core::int i) {
-  abstract extension-type-member representation-field get i() → core::int;
-  constructor • = self::ET2|constructor#;
-  constructor tearoff • = self::ET2|constructor#_#new#tearOff;
-}
-extension type ET3(core::int i) {
-  abstract extension-type-member representation-field get i() → core::int;
-  constructor • = self::ET3|constructor#;
-  constructor tearoff • = self::ET3|constructor#_#new#tearOff;
-}
-extension type ET4(invalid-type i) {
-  abstract extension-type-member representation-field get i() → invalid-type;
-  constructor • = self::ET4|constructor#;
-  constructor tearoff • = self::ET4|constructor#_#new#tearOff;
-}
-extension type ET5(invalid-type i) {
-  abstract extension-type-member representation-field get i() → invalid-type;
-  constructor • = self::ET5|constructor#;
-  constructor tearoff • = self::ET5|constructor#_#new#tearOff;
-}
-extension type ET6(invalid-type i) {
-  abstract extension-type-member representation-field get i() → invalid-type;
-  constructor • = self::ET6|constructor#;
-  constructor tearoff • = self::ET6|constructor#_#new#tearOff;
-}
-static extension-type-member method ET1|constructor#(core::int i) → self::ET1% /* erasure=core::int, declared=! */ {
-  lowered final self::ET1% /* erasure=core::int, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET1|constructor#_#new#tearOff(core::int i) → self::ET1% /* erasure=core::int, declared=! */
-  return self::ET1|constructor#(i);
-static extension-type-member method ET2|constructor#(core::int i) → self::ET2% /* erasure=core::int, declared=! */ {
-  lowered final self::ET2% /* erasure=core::int, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET2|constructor#_#new#tearOff(core::int i) → self::ET2% /* erasure=core::int, declared=! */
-  return self::ET2|constructor#(i);
-static extension-type-member method ET3|constructor#(final core::int i) → self::ET3% /* erasure=core::int, declared=! */ {
-  lowered final self::ET3% /* erasure=core::int, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET3|constructor#_#new#tearOff(core::int i) → self::ET3% /* erasure=core::int, declared=! */
-  return self::ET3|constructor#(i);
-static extension-type-member method ET4|constructor#(invalid-type i) → self::ET4% /* erasure=invalid-type, declared=! */ {
-  lowered final self::ET4% /* erasure=invalid-type, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET4|constructor#_#new#tearOff(invalid-type i) → self::ET4% /* erasure=invalid-type, declared=! */
-  return self::ET4|constructor#(i);
-static extension-type-member method ET5|constructor#(invalid-type i) → self::ET5% /* erasure=invalid-type, declared=! */ {
-  lowered final self::ET5% /* erasure=invalid-type, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET5|constructor#_#new#tearOff(invalid-type i) → self::ET5% /* erasure=invalid-type, declared=! */
-  return self::ET5|constructor#(i);
-static extension-type-member method ET6|constructor#(final invalid-type i) → self::ET6% /* erasure=invalid-type, declared=! */ {
-  lowered final self::ET6% /* erasure=invalid-type, declared=! */ #this = i;
-  return #this;
-}
-static extension-type-member synthetic method ET6|constructor#_#new#tearOff(invalid-type i) → self::ET6% /* erasure=invalid-type, declared=! */
-  return self::ET6|constructor#(i);

diff --git a/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.expect b/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.expect
index 6197de3..7e79199 100644
--- a/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.expect
+++ b/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.expect

@@ -2,8 +2,8 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart:7:8: Error: This requires the experimental 'declaring-constructors' language feature to be enabled.
-// Try passing the '--enable-experiment=declaring-constructors' command line option.
+// pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart:7:8: Error: This requires the experimental 'primary-constructors' language feature to be enabled.
+// Try passing the '--enable-experiment=primary-constructors' command line option.
 // class A(String foo) {
 //        ^
 //

diff --git a/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.modular.expect b/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.modular.expect
index d713dae..94008a5 100644
--- a/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.modular.expect

@@ -2,8 +2,8 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart:7:8: Error: This requires the experimental 'declaring-constructors' language feature to be enabled.
-// Try passing the '--enable-experiment=declaring-constructors' command line option.
+// pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart:7:8: Error: This requires the experimental 'primary-constructors' language feature to be enabled.
+// Try passing the '--enable-experiment=primary-constructors' command line option.
 // class A(String foo) {
 //        ^
 //

diff --git a/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.outline.expect b/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.outline.expect
index 6c74593..3a1b4cd 100644
--- a/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.outline.expect

@@ -2,8 +2,8 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart:7:8: Error: This requires the experimental 'declaring-constructors' language feature to be enabled.
-// Try passing the '--enable-experiment=declaring-constructors' command line option.
+// pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart:7:8: Error: This requires the experimental 'primary-constructors' language feature to be enabled.
+// Try passing the '--enable-experiment=primary-constructors' command line option.
 // class A(String foo) {
 //        ^
 //

diff --git a/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.transformed.expect b/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.transformed.expect
index 6197de3..7e79199 100644
--- a/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart.strong.transformed.expect

@@ -2,8 +2,8 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart:7:8: Error: This requires the experimental 'declaring-constructors' language feature to be enabled.
-// Try passing the '--enable-experiment=declaring-constructors' command line option.
+// pkg/front_end/testcases/extension_types/with_dependencies/issue53209_2/main.dart:7:8: Error: This requires the experimental 'primary-constructors' language feature to be enabled.
+// Try passing the '--enable-experiment=primary-constructors' command line option.
 // class A(String foo) {
 //        ^
 //

diff --git a/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.expect b/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.expect
index 81fb047..6fc897e 100644
--- a/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.expect
+++ b/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.expect

@@ -2,8 +2,8 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart:6:20: Error: This requires the experimental 'declaring-constructors' language feature to be enabled.
-// Try passing the '--enable-experiment=declaring-constructors' command line option.
+// pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart:6:20: Error: This requires the experimental 'primary-constructors' language feature to be enabled.
+// Try passing the '--enable-experiment=primary-constructors' command line option.
 // extension type ET1(var int a) {}
 //                    ^^^
 //

diff --git a/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.modular.expect b/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.modular.expect
index 81fb047..6fc897e 100644
--- a/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.modular.expect

@@ -2,8 +2,8 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart:6:20: Error: This requires the experimental 'declaring-constructors' language feature to be enabled.
-// Try passing the '--enable-experiment=declaring-constructors' command line option.
+// pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart:6:20: Error: This requires the experimental 'primary-constructors' language feature to be enabled.
+// Try passing the '--enable-experiment=primary-constructors' command line option.
 // extension type ET1(var int a) {}
 //                    ^^^
 //

diff --git a/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.outline.expect b/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.outline.expect
index 0e7e9b7..97157e3 100644
--- a/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.outline.expect

@@ -2,8 +2,8 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart:6:20: Error: This requires the experimental 'declaring-constructors' language feature to be enabled.
-// Try passing the '--enable-experiment=declaring-constructors' command line option.
+// pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart:6:20: Error: This requires the experimental 'primary-constructors' language feature to be enabled.
+// Try passing the '--enable-experiment=primary-constructors' command line option.
 // extension type ET1(var int a) {}
 //                    ^^^
 //

diff --git a/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.transformed.expect b/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.transformed.expect
index 81fb047..6fc897e 100644
--- a/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart.strong.transformed.expect

@@ -2,8 +2,8 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart:6:20: Error: This requires the experimental 'declaring-constructors' language feature to be enabled.
-// Try passing the '--enable-experiment=declaring-constructors' command line option.
+// pkg/front_end/testcases/general/declaring_parameter_pre_feature.dart:6:20: Error: This requires the experimental 'primary-constructors' language feature to be enabled.
+// Try passing the '--enable-experiment=primary-constructors' command line option.
 // extension type ET1(var int a) {}
 //                    ^^^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart
rename to pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart


diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.expect
similarity index 76%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect
rename to pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.expect
index f4a7ba8..a1e22b2 100644
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.expect

@@ -2,15 +2,15 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:10:14: Error: Final field 'i' is not initialized.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:10:14: Error: Final field 'i' is not initialized.
 // Try to initialize the field in the declaration or in every constructor.
 //   final int? i; // Error
 //              ^
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
 // class const C4() { // Error
 //               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:14:8: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:14:8: Context: Field isn't final, but constructor is 'const'.
 //   int? i;
 //        ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.modular.expect
similarity index 76%
copy from pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect
copy to pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.modular.expect
index f4a7ba8..a1e22b2 100644
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.modular.expect

@@ -2,15 +2,15 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:10:14: Error: Final field 'i' is not initialized.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:10:14: Error: Final field 'i' is not initialized.
 // Try to initialize the field in the declaration or in every constructor.
 //   final int? i; // Error
 //              ^
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
 // class const C4() { // Error
 //               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:14:8: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:14:8: Context: Field isn't final, but constructor is 'const'.
 //   int? i;
 //        ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.outline.expect
rename to pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.transformed.expect
similarity index 76%
copy from pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect
copy to pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.transformed.expect
index f4a7ba8..a1e22b2 100644
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.strong.transformed.expect

@@ -2,15 +2,15 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:10:14: Error: Final field 'i' is not initialized.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:10:14: Error: Final field 'i' is not initialized.
 // Try to initialize the field in the declaration or in every constructor.
 //   final int? i; // Error
 //              ^
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
 // class const C4() { // Error
 //               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart:14:8: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart:14:8: Context: Field isn't final, but constructor is 'const'.
 //   int? i;
 //        ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_constructor.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/class_primary_constructor.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart
rename to pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart


diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.expect
similarity index 93%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect
rename to pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.expect
index deeee777..c9d8e23 100644
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.expect

@@ -2,10 +2,10 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
 // class const C5(var int a) {} // Error
 //               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:24: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart:13:24: Context: Field isn't final, but constructor is 'const'.
 // class const C5(var int a) {} // Error
 //                        ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.modular.expect
similarity index 93%
copy from pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect
copy to pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.modular.expect
index deeee777..c9d8e23 100644
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.modular.expect

@@ -2,10 +2,10 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
 // class const C5(var int a) {} // Error
 //               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:24: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart:13:24: Context: Field isn't final, but constructor is 'const'.
 // class const C5(var int a) {} // Error
 //                        ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.outline.expect
rename to pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.transformed.expect
similarity index 93%
copy from pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect
copy to pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.transformed.expect
index deeee777..c9d8e23 100644
--- a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.strong.transformed.expect

@@ -2,10 +2,10 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart:13:15: Error: Constructor is marked 'const' so all fields must be final.
 // class const C5(var int a) {} // Error
 //               ^
-// pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart:13:24: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart:13:24: Context: Field isn't final, but constructor is 'const'.
 // class const C5(var int a) {} // Error
 //                        ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/class_primary_declaring_parameters.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/class_primary_declaring_parameters.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart b/pkg/front_end/testcases/primary_constructors/constructor_head.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructor_head.dart
rename to pkg/front_end/testcases/primary_constructors/constructor_head.dart


diff --git a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.expect
similarity index 77%
rename from pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.expect
rename to pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.expect
index 6a15c11..4b59ceb 100644
--- a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.expect

@@ -2,30 +2,30 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:33:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:33:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new () {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:38:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:38:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new () : x = 0 {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:69:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:69:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new named() {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:74:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:74:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new named() : x = 0 {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:29:9: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:29:9: Error: Constructor is marked 'const' so all fields must be final.
 //   const new () : x = 0;
 //         ^
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:28:7: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:28:7: Context: Field isn't final, but constructor is 'const'.
 //   var x;
 //       ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.modular.expect b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.modular.expect
similarity index 77%
rename from pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.modular.expect
rename to pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.modular.expect
index 6a15c11..4b59ceb 100644
--- a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.modular.expect

@@ -2,30 +2,30 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:33:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:33:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new () {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:38:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:38:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new () : x = 0 {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:69:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:69:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new named() {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:74:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:74:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new named() : x = 0 {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:29:9: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:29:9: Error: Constructor is marked 'const' so all fields must be final.
 //   const new () : x = 0;
 //         ^
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:28:7: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:28:7: Context: Field isn't final, but constructor is 'const'.
 //   var x;
 //       ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.outline.expect
similarity index 80%
rename from pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.outline.expect
rename to pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.outline.expect
index 29d3b1a..1e82db6 100644
--- a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.outline.expect

@@ -2,22 +2,22 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:33:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:33:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new () {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:38:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:38:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new () : x = 0 {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:69:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:69:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new named() {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:74:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:74:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new named() : x = 0 {}
 //   ^^^^^

diff --git a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.transformed.expect b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.transformed.expect
similarity index 77%
rename from pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.transformed.expect
rename to pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.transformed.expect
index 6a15c11..4b59ceb 100644
--- a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.strong.transformed.expect

@@ -2,30 +2,30 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:33:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:33:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new () {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:38:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:38:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new () : x = 0 {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:69:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:69:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new named() {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:74:3: Error: A const constructor can't have a body.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:74:3: Error: A const constructor can't have a body.
 // Try removing either the 'const' keyword or the body.
 //   const new named() : x = 0 {}
 //   ^^^^^
 //
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:29:9: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:29:9: Error: Constructor is marked 'const' so all fields must be final.
 //   const new () : x = 0;
 //         ^
-// pkg/front_end/testcases/declaring_constructors/constructor_head.dart:28:7: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/constructor_head.dart:28:7: Context: Field isn't final, but constructor is 'const'.
 //   var x;
 //       ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructor_head.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/constructor_head.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/constructor_head.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/constructor_head.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructor_head.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/constructor_head.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/constructors.dart b/pkg/front_end/testcases/primary_constructors/constructors.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructors.dart
rename to pkg/front_end/testcases/primary_constructors/constructors.dart


diff --git a/pkg/front_end/testcases/declaring_constructors/constructors.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/constructors.dart.strong.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructors.dart.strong.expect
rename to pkg/front_end/testcases/primary_constructors/constructors.dart.strong.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/constructors.dart.strong.modular.expect b/pkg/front_end/testcases/primary_constructors/constructors.dart.strong.modular.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructors.dart.strong.modular.expect
rename to pkg/front_end/testcases/primary_constructors/constructors.dart.strong.modular.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/constructors.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/constructors.dart.strong.outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructors.dart.strong.outline.expect
rename to pkg/front_end/testcases/primary_constructors/constructors.dart.strong.outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/constructors.dart.strong.transformed.expect b/pkg/front_end/testcases/primary_constructors/constructors.dart.strong.transformed.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructors.dart.strong.transformed.expect
rename to pkg/front_end/testcases/primary_constructors/constructors.dart.strong.transformed.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/constructors.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/constructors.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructors.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/constructors.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/constructors.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/constructors.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/constructors.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/constructors.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart
rename to pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart


diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.expect
similarity index 72%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.expect
index f4acc8f..58259f3 100644
--- a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.expect

@@ -2,24 +2,24 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:5:8: Error: Generative enum constructors must be marked as 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:5:8: Error: Generative enum constructors must be marked as 'const'.
 // enum E1() { // Error
 //        ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 // Try using a constructor or factory that is 'const'.
 //   a
 //   ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:15:14: Error: Final field 'b' is not initialized.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:15:14: Error: Final field 'b' is not initialized.
 // Try to initialize the field in the declaration or in every constructor.
 //   final int? b; // Error
 //              ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:18:14: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:18:14: Error: Constructor is marked 'const' so all fields must be final.
 // enum const E4() { // Error
 //              ^
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:20:8: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:20:8: Context: Field isn't final, but constructor is 'const'.
 //   int? b;
 //        ^
 //
@@ -27,11 +27,11 @@
 import "dart:core" as core;
 
 class E1 extends core::_Enum /*isEnum*/  {
-  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 Try using a constructor or factory that is 'const'.
   a
   ^";
-  static const field core::List<self::E1> values = invalid-expression "pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+  static const field core::List<self::E1> values = invalid-expression "pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 Try using a constructor or factory that is 'const'.
   a
   ^";

diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.modular.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.modular.expect
similarity index 72%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.modular.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.modular.expect
index f4acc8f..58259f3 100644
--- a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.modular.expect

@@ -2,24 +2,24 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:5:8: Error: Generative enum constructors must be marked as 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:5:8: Error: Generative enum constructors must be marked as 'const'.
 // enum E1() { // Error
 //        ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 // Try using a constructor or factory that is 'const'.
 //   a
 //   ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:15:14: Error: Final field 'b' is not initialized.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:15:14: Error: Final field 'b' is not initialized.
 // Try to initialize the field in the declaration or in every constructor.
 //   final int? b; // Error
 //              ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:18:14: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:18:14: Error: Constructor is marked 'const' so all fields must be final.
 // enum const E4() { // Error
 //              ^
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:20:8: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:20:8: Context: Field isn't final, but constructor is 'const'.
 //   int? b;
 //        ^
 //
@@ -27,11 +27,11 @@
 import "dart:core" as core;
 
 class E1 extends core::_Enum /*isEnum*/  {
-  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 Try using a constructor or factory that is 'const'.
   a
   ^";
-  static const field core::List<self::E1> values = invalid-expression "pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+  static const field core::List<self::E1> values = invalid-expression "pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 Try using a constructor or factory that is 'const'.
   a
   ^";

diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.outline.expect
similarity index 86%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.outline.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.outline.expect
index d2725c2..a68ed91 100644
--- a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.outline.expect

@@ -2,11 +2,11 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:5:8: Error: Generative enum constructors must be marked as 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:5:8: Error: Generative enum constructors must be marked as 'const'.
 // enum E1() { // Error
 //        ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 // Try using a constructor or factory that is 'const'.
 //   a
 //   ^
@@ -15,7 +15,7 @@
 import "dart:core" as core;
 
 class E1 extends core::_Enum /*isEnum*/  {
-  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 Try using a constructor or factory that is 'const'.
   a
   ^";

diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.transformed.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.transformed.expect
similarity index 72%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.transformed.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.transformed.expect
index f4acc8f..58259f3 100644
--- a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.strong.transformed.expect

@@ -2,24 +2,24 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:5:8: Error: Generative enum constructors must be marked as 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:5:8: Error: Generative enum constructors must be marked as 'const'.
 // enum E1() { // Error
 //        ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 // Try using a constructor or factory that is 'const'.
 //   a
 //   ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:15:14: Error: Final field 'b' is not initialized.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:15:14: Error: Final field 'b' is not initialized.
 // Try to initialize the field in the declaration or in every constructor.
 //   final int? b; // Error
 //              ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:18:14: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:18:14: Error: Constructor is marked 'const' so all fields must be final.
 // enum const E4() { // Error
 //              ^
-// pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:20:8: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:20:8: Context: Field isn't final, but constructor is 'const'.
 //   int? b;
 //        ^
 //
@@ -27,11 +27,11 @@
 import "dart:core" as core;
 
 class E1 extends core::_Enum /*isEnum*/  {
-  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+  enum-element static const field invalid-type a = invalid-expression "pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 Try using a constructor or factory that is 'const'.
   a
   ^";
-  static const field core::List<self::E1> values = invalid-expression "pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
+  static const field core::List<self::E1> values = invalid-expression "pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart:6:3: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
 Try using a constructor or factory that is 'const'.
   a
   ^";

diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_constructor.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_constructor.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart
rename to pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart


diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.expect
similarity index 91%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.expect
index 08658f9..cf13570 100644
--- a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.expect

@@ -2,18 +2,18 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:31:15: Error: Can't find '}' to match '{'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:31:15: Error: Can't find '}' to match '{'.
 // enum const E7({int? a, required int b, int c = 42]) {
 //               ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:31:50: Error: Expected '}' before this.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:31:50: Error: Expected '}' before this.
 // enum const E7({int? a, required int b, int c = 42]) {
 //                                                  ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:7:14: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:7:14: Error: Constructor is marked 'const' so all fields must be final.
 // enum const E2(var int i) { x(0) } // Error
 //              ^
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:7:23: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:7:23: Context: Field isn't final, but constructor is 'const'.
 // enum const E2(var int i) { x(0) } // Error
 //                       ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.modular.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.modular.expect
similarity index 91%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.modular.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.modular.expect
index 08658f9..cf13570 100644
--- a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.modular.expect
+++ b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.modular.expect

@@ -2,18 +2,18 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:31:15: Error: Can't find '}' to match '{'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:31:15: Error: Can't find '}' to match '{'.
 // enum const E7({int? a, required int b, int c = 42]) {
 //               ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:31:50: Error: Expected '}' before this.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:31:50: Error: Expected '}' before this.
 // enum const E7({int? a, required int b, int c = 42]) {
 //                                                  ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:7:14: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:7:14: Error: Constructor is marked 'const' so all fields must be final.
 // enum const E2(var int i) { x(0) } // Error
 //              ^
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:7:23: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:7:23: Context: Field isn't final, but constructor is 'const'.
 // enum const E2(var int i) { x(0) } // Error
 //                       ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.outline.expect
similarity index 97%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.outline.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.outline.expect
index 0b0715f..caa91ea 100644
--- a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.outline.expect

@@ -2,11 +2,11 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:31:15: Error: Can't find '}' to match '{'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:31:15: Error: Can't find '}' to match '{'.
 // enum const E7({int? a, required int b, int c = 42]) {
 //               ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:31:50: Error: Expected '}' before this.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:31:50: Error: Expected '}' before this.
 // enum const E7({int? a, required int b, int c = 42]) {
 //                                                  ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.transformed.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.transformed.expect
similarity index 91%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.transformed.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.transformed.expect
index 08658f9..cf13570 100644
--- a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.strong.transformed.expect

@@ -2,18 +2,18 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:31:15: Error: Can't find '}' to match '{'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:31:15: Error: Can't find '}' to match '{'.
 // enum const E7({int? a, required int b, int c = 42]) {
 //               ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:31:50: Error: Expected '}' before this.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:31:50: Error: Expected '}' before this.
 // enum const E7({int? a, required int b, int c = 42]) {
 //                                                  ^
 //
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:7:14: Error: Constructor is marked 'const' so all fields must be final.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:7:14: Error: Constructor is marked 'const' so all fields must be final.
 // enum const E2(var int i) { x(0) } // Error
 //              ^
-// pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart:7:23: Context: Field isn't final, but constructor is 'const'.
+// pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart:7:23: Context: Field isn't final, but constructor is 'const'.
 // enum const E2(var int i) { x(0) } // Error
 //                       ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/enum_primary_declaring_parameters.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/enum_primary_declaring_parameters.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/primary_constructors/folder.options b/pkg/front_end/testcases/primary_constructors/folder.options
new file mode 100644
index 0000000..79601a4
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/folder.options

@@ -0,0 +1 @@
+--enable-experiment=primary-constructors

diff --git a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart
rename to pkg/front_end/testcases/primary_constructors/new_in_initializer.dart


diff --git a/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.expect
new file mode 100644
index 0000000..9aa6c9f
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.expect

@@ -0,0 +1,76 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got 'new'.
+// Try inserting an identifier before 'new'.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:11: Error: Expected an assignment after the field name.
+// To initialize a field, use the syntax 'name = value'.
+//   Foo() : this.new = 42;
+//           ^^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected '{' before this.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   Foo() : this.new = 42;
+//                      ^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Expected ';' after this.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Expected a class member, but got '42'.
+//   Foo() : this.new = 42;
+//                      ^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:24: Error: Expected a class member, but got ';'.
+//   Foo() : this.new = 42;
+//                        ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: 'Foo' is already declared in this scope.
+//   Foo() : this.new = 42;
+//                ^^^
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:3: Context: Previous declaration of 'Foo'.
+//   Foo() : this.new = 42;
+//   ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got ''.
+// Try inserting an identifier before ''.
+//   Foo() : this.new = 42;
+//                ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   Foo() : this.new = 42;
+//                      ^
+//
+import self as self;
+import "dart:core" as core;
+
+class Foo extends core::Object {
+  constructor •() → self::Foo
+    : invalid-initializer "pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:11: Error: This couldn't be parsed.
+  Foo() : this.new = 42;
+          ^" {}
+}

diff --git a/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.modular.expect b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.modular.expect
new file mode 100644
index 0000000..9aa6c9f
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.modular.expect

@@ -0,0 +1,76 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got 'new'.
+// Try inserting an identifier before 'new'.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:11: Error: Expected an assignment after the field name.
+// To initialize a field, use the syntax 'name = value'.
+//   Foo() : this.new = 42;
+//           ^^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected '{' before this.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   Foo() : this.new = 42;
+//                      ^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Expected ';' after this.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Expected a class member, but got '42'.
+//   Foo() : this.new = 42;
+//                      ^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:24: Error: Expected a class member, but got ';'.
+//   Foo() : this.new = 42;
+//                        ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: 'Foo' is already declared in this scope.
+//   Foo() : this.new = 42;
+//                ^^^
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:3: Context: Previous declaration of 'Foo'.
+//   Foo() : this.new = 42;
+//   ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got ''.
+// Try inserting an identifier before ''.
+//   Foo() : this.new = 42;
+//                ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   Foo() : this.new = 42;
+//                      ^
+//
+import self as self;
+import "dart:core" as core;
+
+class Foo extends core::Object {
+  constructor •() → self::Foo
+    : invalid-initializer "pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:11: Error: This couldn't be parsed.
+  Foo() : this.new = 42;
+          ^" {}
+}

diff --git a/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.outline.expect
new file mode 100644
index 0000000..081d666
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.outline.expect

@@ -0,0 +1,59 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got 'new'.
+// Try inserting an identifier before 'new'.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:11: Error: Expected an assignment after the field name.
+// To initialize a field, use the syntax 'name = value'.
+//   Foo() : this.new = 42;
+//           ^^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected '{' before this.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   Foo() : this.new = 42;
+//                      ^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Expected ';' after this.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Expected a class member, but got '42'.
+//   Foo() : this.new = 42;
+//                      ^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:24: Error: Expected a class member, but got ';'.
+//   Foo() : this.new = 42;
+//                        ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: 'Foo' is already declared in this scope.
+//   Foo() : this.new = 42;
+//                ^^^
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:3: Context: Previous declaration of 'Foo'.
+//   Foo() : this.new = 42;
+//   ^^^
+//
+import self as self;
+import "dart:core" as core;
+
+class Foo extends core::Object {
+  constructor •() → self::Foo
+    ;
+}

diff --git a/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.transformed.expect b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.transformed.expect
new file mode 100644
index 0000000..9aa6c9f
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.strong.transformed.expect

@@ -0,0 +1,76 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got 'new'.
+// Try inserting an identifier before 'new'.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:11: Error: Expected an assignment after the field name.
+// To initialize a field, use the syntax 'name = value'.
+//   Foo() : this.new = 42;
+//           ^^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected '{' before this.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   Foo() : this.new = 42;
+//                ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   Foo() : this.new = 42;
+//                      ^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Expected ';' after this.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Expected a class member, but got '42'.
+//   Foo() : this.new = 42;
+//                      ^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:24: Error: Expected a class member, but got ';'.
+//   Foo() : this.new = 42;
+//                        ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: 'Foo' is already declared in this scope.
+//   Foo() : this.new = 42;
+//                ^^^
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:3: Context: Previous declaration of 'Foo'.
+//   Foo() : this.new = 42;
+//   ^^^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:16: Error: Expected an identifier, but got ''.
+// Try inserting an identifier before ''.
+//   Foo() : this.new = 42;
+//                ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:20: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   Foo() : this.new = 42;
+//                    ^
+//
+// pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:22: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   Foo() : this.new = 42;
+//                      ^
+//
+import self as self;
+import "dart:core" as core;
+
+class Foo extends core::Object {
+  constructor •() → self::Foo
+    : invalid-initializer "pkg/front_end/testcases/primary_constructors/new_in_initializer.dart:7:11: Error: This couldn't be parsed.
+  Foo() : this.new = 42;
+          ^" {}
+}

diff --git a/pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/new_in_initializer.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/new_in_initializer.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart
rename to pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart


diff --git a/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.expect
new file mode 100644
index 0000000..c87e5f8
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.expect

@@ -0,0 +1,28 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:6:11: Error: The name of a constructor must match the name of the enclosing class.
+//   factory a.b() => throw '';
+//           ^
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:5:7: Context: The name of the enclosing class is 'C1'.
+// class C1 {
+//       ^^
+//
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:10:7: Error: Constructors declared with the 'new' keyword can't have qualified names.
+// Try removing the class name prefix from the qualified name or removing the 'new' keyword.
+//   new a.b();
+//       ^
+//
+import self as self;
+import "dart:core" as core;
+
+class C1 extends core::Object {
+  static factory b() → self::C1
+    return throw "";
+}
+class C2 extends core::Object {
+  constructor b() → self::C2
+    : super core::Object::•()
+    ;
+}

diff --git a/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.modular.expect b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.modular.expect
new file mode 100644
index 0000000..c87e5f8
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.modular.expect

@@ -0,0 +1,28 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:6:11: Error: The name of a constructor must match the name of the enclosing class.
+//   factory a.b() => throw '';
+//           ^
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:5:7: Context: The name of the enclosing class is 'C1'.
+// class C1 {
+//       ^^
+//
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:10:7: Error: Constructors declared with the 'new' keyword can't have qualified names.
+// Try removing the class name prefix from the qualified name or removing the 'new' keyword.
+//   new a.b();
+//       ^
+//
+import self as self;
+import "dart:core" as core;
+
+class C1 extends core::Object {
+  static factory b() → self::C1
+    return throw "";
+}
+class C2 extends core::Object {
+  constructor b() → self::C2
+    : super core::Object::•()
+    ;
+}

diff --git a/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.outline.expect
new file mode 100644
index 0000000..d2bc788
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.outline.expect

@@ -0,0 +1,27 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:6:11: Error: The name of a constructor must match the name of the enclosing class.
+//   factory a.b() => throw '';
+//           ^
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:5:7: Context: The name of the enclosing class is 'C1'.
+// class C1 {
+//       ^^
+//
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:10:7: Error: Constructors declared with the 'new' keyword can't have qualified names.
+// Try removing the class name prefix from the qualified name or removing the 'new' keyword.
+//   new a.b();
+//       ^
+//
+import self as self;
+import "dart:core" as core;
+
+class C1 extends core::Object {
+  static factory b() → self::C1
+    ;
+}
+class C2 extends core::Object {
+  constructor b() → self::C2
+    ;
+}

diff --git a/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.transformed.expect b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.transformed.expect
new file mode 100644
index 0000000..c87e5f8
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.strong.transformed.expect

@@ -0,0 +1,28 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:6:11: Error: The name of a constructor must match the name of the enclosing class.
+//   factory a.b() => throw '';
+//           ^
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:5:7: Context: The name of the enclosing class is 'C1'.
+// class C1 {
+//       ^^
+//
+// pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart:10:7: Error: Constructors declared with the 'new' keyword can't have qualified names.
+// Try removing the class name prefix from the qualified name or removing the 'new' keyword.
+//   new a.b();
+//       ^
+//
+import self as self;
+import "dart:core" as core;
+
+class C1 extends core::Object {
+  static factory b() → self::C1
+    return throw "";
+}
+class C2 extends core::Object {
+  constructor b() → self::C2
+    : super core::Object::•()
+    ;
+}

diff --git a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/qualified_constructor_name.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/qualified_constructor_name.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart
rename to pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart


diff --git a/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.expect
new file mode 100644
index 0000000..b98bf6c
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.expect

@@ -0,0 +1,142 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:3: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   new = 42;
+//   ^^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   new = 42;
+//         ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Expected ';' after this.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Expected a class member, but got '42'.
+//   new = 42;
+//         ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:11: Error: Expected a class member, but got ';'.
+//   new = 42;
+//           ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   new() = 42;
+//           ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Expected ';' after this.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Expected a class member, but got '42'.
+//   new() = 42;
+//           ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:13: Error: Expected a class member, but got ';'.
+//   new() = 42;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:8: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   C3() = C3;
+//        ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:13: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   C4.name() = C4;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Couldn't find constructor 'C4'.
+//   C4.name() = C4;
+//               ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   new = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   new() = 42;
+//           ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:8: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   C3() = C3;
+//        ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   C3() = C3;
+//          ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:13: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   C4.name() = C4;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   C4.name() = C4;
+//               ^
+//
+import self as self;
+import "dart:core" as core;
+
+class C1 extends core::Object {
+  constructor •() → self::C1
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
+Try removing the return type.
+  new = 42;
+        ^";
+}
+class C2 extends core::Object {
+  constructor •() → self::C2
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
+Try removing the return type.
+  new() = 42;
+          ^";
+}
+class C3 extends core::Object {
+  constructor •() → self::C3
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
+Try removing the return type.
+  C3() = C3;
+         ^";
+}
+class C4 extends core::Object {
+  constructor name() → self::C4
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
+Try removing the return type.
+  C4.name() = C4;
+              ^";
+}

diff --git a/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.modular.expect b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.modular.expect
new file mode 100644
index 0000000..b98bf6c
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.modular.expect

@@ -0,0 +1,142 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:3: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   new = 42;
+//   ^^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   new = 42;
+//         ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Expected ';' after this.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Expected a class member, but got '42'.
+//   new = 42;
+//         ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:11: Error: Expected a class member, but got ';'.
+//   new = 42;
+//           ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   new() = 42;
+//           ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Expected ';' after this.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Expected a class member, but got '42'.
+//   new() = 42;
+//           ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:13: Error: Expected a class member, but got ';'.
+//   new() = 42;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:8: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   C3() = C3;
+//        ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:13: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   C4.name() = C4;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Couldn't find constructor 'C4'.
+//   C4.name() = C4;
+//               ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   new = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   new() = 42;
+//           ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:8: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   C3() = C3;
+//        ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   C3() = C3;
+//          ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:13: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   C4.name() = C4;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   C4.name() = C4;
+//               ^
+//
+import self as self;
+import "dart:core" as core;
+
+class C1 extends core::Object {
+  constructor •() → self::C1
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
+Try removing the return type.
+  new = 42;
+        ^";
+}
+class C2 extends core::Object {
+  constructor •() → self::C2
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
+Try removing the return type.
+  new() = 42;
+          ^";
+}
+class C3 extends core::Object {
+  constructor •() → self::C3
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
+Try removing the return type.
+  C3() = C3;
+         ^";
+}
+class C4 extends core::Object {
+  constructor name() → self::C4
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
+Try removing the return type.
+  C4.name() = C4;
+              ^";
+}

diff --git a/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.outline.expect
new file mode 100644
index 0000000..7e3a233
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.outline.expect

@@ -0,0 +1,86 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:3: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   new = 42;
+//   ^^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   new = 42;
+//         ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Expected ';' after this.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Expected a class member, but got '42'.
+//   new = 42;
+//         ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:11: Error: Expected a class member, but got ';'.
+//   new = 42;
+//           ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   new() = 42;
+//           ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Expected ';' after this.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Expected a class member, but got '42'.
+//   new() = 42;
+//           ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:13: Error: Expected a class member, but got ';'.
+//   new() = 42;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:8: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   C3() = C3;
+//        ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:13: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   C4.name() = C4;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Couldn't find constructor 'C4'.
+//   C4.name() = C4;
+//               ^
+//
+import self as self;
+import "dart:core" as core;
+
+class C1 extends core::Object {
+  constructor •() → self::C1
+    ;
+}
+class C2 extends core::Object {
+  constructor •() → self::C2
+    ;
+}
+class C3 extends core::Object {
+  constructor •() → self::C3
+    ;
+}
+class C4 extends core::Object {
+  constructor name() → self::C4
+    ;
+}

diff --git a/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.transformed.expect b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.transformed.expect
new file mode 100644
index 0000000..b98bf6c
--- /dev/null
+++ b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.strong.transformed.expect

@@ -0,0 +1,142 @@
+library;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:3: Error: A method declaration needs an explicit list of parameters.
+// Try adding a parameter list to the method declaration.
+//   new = 42;
+//   ^^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   new = 42;
+//         ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Expected ';' after this.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Expected a class member, but got '42'.
+//   new = 42;
+//         ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:11: Error: Expected a class member, but got ';'.
+//   new = 42;
+//           ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Expected an identifier, but got '42'.
+// Try inserting an identifier before '42'.
+//   new() = 42;
+//           ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Expected ';' after this.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Expected a class member, but got '42'.
+//   new() = 42;
+//           ^^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:13: Error: Expected a class member, but got ';'.
+//   new() = 42;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:8: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   C3() = C3;
+//        ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:13: Error: Only factory constructor can specify '=' redirection.
+// Try making this a factory constructor, or remove the redirection.
+//   C4.name() = C4;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Couldn't find constructor 'C4'.
+//   C4.name() = C4;
+//               ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:7: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   new = 42;
+//       ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   new = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:9: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   new() = 42;
+//         ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   new() = 42;
+//           ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:8: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   C3() = C3;
+//        ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   C3() = C3;
+//          ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:13: Error: Expected a function body or '=>'.
+// Try adding {}.
+//   C4.name() = C4;
+//             ^
+//
+// pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
+// Try removing the return type.
+//   C4.name() = C4;
+//               ^
+//
+import self as self;
+import "dart:core" as core;
+
+class C1 extends core::Object {
+  constructor •() → self::C1
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:6:9: Error: Constructors can't have a return type.
+Try removing the return type.
+  new = 42;
+        ^";
+}
+class C2 extends core::Object {
+  constructor •() → self::C2
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:10:11: Error: Constructors can't have a return type.
+Try removing the return type.
+  new() = 42;
+          ^";
+}
+class C3 extends core::Object {
+  constructor •() → self::C3
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:14:10: Error: Constructors can't have a return type.
+Try removing the return type.
+  C3() = C3;
+         ^";
+}
+class C4 extends core::Object {
+  constructor name() → self::C4
+    : super core::Object::•()
+    invalid-expression "pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart:18:15: Error: Constructors can't have a return type.
+Try removing the return type.
+  C4.name() = C4;
+              ^";
+}

diff --git a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/redirecting_non_factory.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/redirecting_non_factory.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart
rename to pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart


diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.expect
similarity index 85%
rename from pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect
rename to pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.expect
index e333c9e..11a086e 100644
--- a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.expect

@@ -2,23 +2,23 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
 // extension type ET3(final int i) {}
 //                              ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
 // extension type ET4(i) {} // Error
 //                    ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
 // extension type ET5(var i) {} // Error
 //                        ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
 // extension type ET6(final i) {} // Error
 //                          ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
 // extension type ET6(final i) {} // Error
 //                          ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.modular.expect
similarity index 85%
copy from pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect
copy to pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.modular.expect
index e333c9e..11a086e 100644
--- a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.modular.expect

@@ -2,23 +2,23 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
 // extension type ET3(final int i) {}
 //                              ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
 // extension type ET4(i) {} // Error
 //                    ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
 // extension type ET5(var i) {} // Error
 //                        ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
 // extension type ET6(final i) {} // Error
 //                          ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
 // extension type ET6(final i) {} // Error
 //                          ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.outline.expect b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.outline.expect
similarity index 84%
rename from pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.outline.expect
rename to pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.outline.expect
index 25a5958..dc6fd19 100644
--- a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.outline.expect
+++ b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.outline.expect

@@ -2,23 +2,23 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
 // extension type ET3(final int i) {}
 //                              ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
 // extension type ET4(i) {} // Error
 //                    ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
 // extension type ET5(var i) {} // Error
 //                        ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
 // extension type ET6(final i) {} // Error
 //                          ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
 // extension type ET6(final i) {} // Error
 //                          ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.transformed.expect
similarity index 85%
copy from pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect
copy to pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.transformed.expect
index e333c9e..11a086e 100644
--- a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.strong.expect
+++ b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.strong.transformed.expect

@@ -2,23 +2,23 @@
 //
 // Problems in library:
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:11:30: Error: Representation fields can't have modifiers.
 // extension type ET3(final int i) {}
 //                              ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:13:20: Error: Expected a representation type.
 // extension type ET4(i) {} // Error
 //                    ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:15:24: Error: Expected a representation type.
 // extension type ET5(var i) {} // Error
 //                        ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:17:26: Error: Expected a representation type.
 // extension type ET6(final i) {} // Error
 //                          ^
 //
-// pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
+// pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart:17:26: Error: Representation fields can't have modifiers.
 // extension type ET6(final i) {} // Error
 //                          ^
 //

diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.textual_outline.expect b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.textual_outline.expect
rename to pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.textual_outline.expect


diff --git a/pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/declaring_constructors/representation_field_modifier.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/primary_constructors/representation_field_modifier.dart.textual_outline_modelled.expect


diff --git a/pkg/front_end/testcases/strong.status b/pkg/front_end/testcases/strong.status
index e151acb..dd6a6f9 100644
--- a/pkg/front_end/testcases/strong.status
+++ b/pkg/front_end/testcases/strong.status

@@ -22,7 +22,6 @@
 dartdevc/inference_update_2/issue52452: semiFuzzFailureOnForceRebuildBodies # privacy.
 dartdevc/redirecting_factory_from_dill/main.no_link: semiFuzzFailureOnForceRebuildBodies # privacy.
 dartdevc/redirecting_factory_from_dill/main: semiFuzzFailureOnForceRebuildBodies # privacy.
-declaring_constructors/constructors: semiFuzzFailureOnForceRebuildBodies
 extension_types/inherited_representation_field: semiFuzzFailureOnForceRebuildBodies # privacy.
 extension_types/issue53446: semiFuzzFailureOnForceRebuildBodies # privacy.
 extensions/internal_resolution: semiFuzzFailureOnForceRebuildBodies # unnamed extensions
@@ -74,6 +73,7 @@
 patterns/issue55310: semiFuzzFailureOnForceRebuildBodies # can't split because of sealed class.
 patterns/pattern_matching: semiFuzzFailureOnForceRebuildBodies # can't split because of sealed class.
 patterns/private_names_in_object_patterns: semiFuzzFailureOnForceRebuildBodies # can't match on private field in split out library.
+primary_constructors/constructors: semiFuzzFailureOnForceRebuildBodies
 private_named_parameters/access_in_initializer: semiFuzzFailureOnForceRebuildBodies # private fields in class.
 private_named_parameters/initializing_formal: semiFuzzFailureOnForceRebuildBodies # private field in class.
 records/issue51940: semiFuzzFailureOnForceRebuildBodies # can't split because of sealed class.

diff --git a/pkg/front_end/testcases/textual_outline.status b/pkg/front_end/testcases/textual_outline.status
index f618bd1..4a9eaa5 100644
--- a/pkg/front_end/testcases/textual_outline.status
+++ b/pkg/front_end/testcases/textual_outline.status

@@ -31,11 +31,11 @@
 triple_shift/invalid_operator: FormatterCrash
 
 coverage/digit-separators/separators_errors_test: EmptyOutput
-declaring_constructors/enum_primary_declaring_parameters: EmptyOutput
 general/error_recovery/issue_38415.crash: EmptyOutput
 general/error_recovery/issue_39024.crash: EmptyOutput
 general/error_recovery/issue_39058.crash: EmptyOutput
 general/issue49357a: EmptyOutput
+primary_constructors/enum_primary_declaring_parameters: EmptyOutput
 rasta/bad_interpolation: EmptyOutput
 rasta/issue_000035: EmptyOutput
 rasta/issue_000035a: EmptyOutput
@@ -49,8 +49,6 @@
 regress/utf_16_le_content.crash: EmptyOutput
 
 enhanced_parts/conditional_parts: UnknownChunk
-declaring_constructors/new_in_initializer: UnknownChunk # Test has parser errors
-declaring_constructors/redirecting_non_factory: UnknownChunk # Test has parser errors
 general/error_recovery/constructor_recovery_operator.crash: UnknownChunk # Test has parser errors
 general/error_recovery/issue_39058_prime.crash: UnknownChunk # Test has parser errors
 general/error_recovery/issue_39202.crash: UnknownChunk # Test has parser errors
@@ -58,6 +56,8 @@
 general/issue41842: UnknownChunk # Test has parser errors
 general/issue43363: UnknownChunk # Test has parser errors
 general/issue54006: UnknownChunk # Test has parser errors
+primary_constructors/new_in_initializer: UnknownChunk # Test has parser errors
+primary_constructors/redirecting_non_factory: UnknownChunk # Test has parser errors
 rasta/issue_000046: UnknownChunk # Test has parser errors
 rasta/malformed_const_constructor: UnknownChunk # Test has parser errors
 regress/ambiguous_builder_01: UnknownChunk # Test has parser errors

diff --git a/pkg/linter/lib/src/rules/avoid_final_parameters.dart b/pkg/linter/lib/src/rules/avoid_final_parameters.dart
index ec402c3..4d133fa 100644
--- a/pkg/linter/lib/src/rules/avoid_final_parameters.dart
+++ b/pkg/linter/lib/src/rules/avoid_final_parameters.dart

@@ -35,7 +35,7 @@
     // This lint isn't relevant with primary constructors enabled
     // as `final` is no longer used to indicate a parameter is final,
     // but rather as a declaring parameter in a primary constructor.
-    if (context.isFeatureEnabled(Feature.declaring_constructors)) return;
+    if (context.isFeatureEnabled(Feature.primary_constructors)) return;
 
     var visitor = _Visitor(this);
     registry.addConstructorDeclaration(this, visitor);

diff --git a/pkg/linter/lib/src/rules/prefer_final_parameters.dart b/pkg/linter/lib/src/rules/prefer_final_parameters.dart
index a37b6ba..1f86339 100644
--- a/pkg/linter/lib/src/rules/prefer_final_parameters.dart
+++ b/pkg/linter/lib/src/rules/prefer_final_parameters.dart

@@ -44,7 +44,7 @@
     // This lint isn't relevant with primary constructors enabled
     // as `final` is no longer used to indicate a parameter is final,
     // but rather as a declaring parameter in a primary constructor.
-    if (context.isFeatureEnabled(Feature.declaring_constructors)) return;
+    if (context.isFeatureEnabled(Feature.primary_constructors)) return;
 
     var visitor = _Visitor(this);
     registry.addConstructorDeclaration(this, visitor);

diff --git a/pkg/linter/test/rules/avoid_final_parameters_test.dart b/pkg/linter/test/rules/avoid_final_parameters_test.dart
index 994e73d..328c573 100644
--- a/pkg/linter/test/rules/avoid_final_parameters_test.dart
+++ b/pkg/linter/test/rules/avoid_final_parameters_test.dart

@@ -19,7 +19,7 @@
 class AvoidFinalParametersPrePrimaryConstructorsTest extends LintRuleTest {
   @override
   List<String> get experiments =>
-      super.experiments..remove(Feature.declaring_constructors.enableString);
+      super.experiments..remove(Feature.primary_constructors.enableString);
 
   @override
   String get lintRule => LintNames.avoid_final_parameters;

diff --git a/pkg/linter/test/rules/prefer_final_parameters_test.dart b/pkg/linter/test/rules/prefer_final_parameters_test.dart
index 4efe557..037f080 100644
--- a/pkg/linter/test/rules/prefer_final_parameters_test.dart
+++ b/pkg/linter/test/rules/prefer_final_parameters_test.dart

@@ -21,8 +21,7 @@
   @override
   List<String> get experiments => super.experiments
       .where(
-        (experiment) =>
-            experiment != Feature.declaring_constructors.enableString,
+        (experiment) => experiment != Feature.primary_constructors.enableString,
       )
       .toList();
 

diff --git a/tests/language/interface/injection1_test.dart b/tests/language/interface/injection1_test.dart
index dc36fa9..4d4e558 100644
--- a/tests/language/interface/injection1_test.dart
+++ b/tests/language/interface/injection1_test.dart

@@ -14,7 +14,7 @@
 // [cfe] 'I' is already declared in this scope.
 //                           ^
 // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED_OFF_BY_DEFAULT
-// [cfe] This requires the experimental 'declaring-constructors' language feature to be enabled.
+// [cfe] This requires the experimental 'primary-constructors' language feature to be enabled.
 
 class C implements I { }
 

diff --git a/tests/language/interface/injection2_test.dart b/tests/language/interface/injection2_test.dart
index a88e30f..2522505 100644
--- a/tests/language/interface/injection2_test.dart
+++ b/tests/language/interface/injection2_test.dart

@@ -14,7 +14,7 @@
 // [cfe] 'C' is already declared in this scope.
 //                  ^
 // [analyzer] SYNTACTIC_ERROR.EXPERIMENT_NOT_ENABLED_OFF_BY_DEFAULT
-// [cfe] This requires the experimental 'declaring-constructors' language feature to be enabled.
+// [cfe] This requires the experimental 'primary-constructors' language feature to be enabled.
 
 main() {
   Expect.isFalse(new C() is S);

diff --git a/tests/language/declaring_constructors/feature_disabled_error_test.dart b/tests/language/primary_constructors/feature_disabled_error_test.dart
similarity index 100%
rename from tests/language/declaring_constructors/feature_disabled_error_test.dart
rename to tests/language/primary_constructors/feature_disabled_error_test.dart


diff --git a/tests/language/declaring_constructors/feature_enabled_error_test.dart b/tests/language/primary_constructors/feature_enabled_error_test.dart
similarity index 100%
rename from tests/language/declaring_constructors/feature_enabled_error_test.dart
rename to tests/language/primary_constructors/feature_enabled_error_test.dart


diff --git a/tests/language/declaring_constructors/header/extension_type_error_test.dart b/tests/language/primary_constructors/header/extension_type_error_test.dart
similarity index 94%
rename from tests/language/declaring_constructors/header/extension_type_error_test.dart
rename to tests/language/primary_constructors/header/extension_type_error_test.dart
index c047379..823b734 100644
--- a/tests/language/declaring_constructors/header/extension_type_error_test.dart
+++ b/tests/language/primary_constructors/header/extension_type_error_test.dart

@@ -6,7 +6,7 @@
 // constructor that has exactly one declaring parameter which is final. This is
 // the test for in-header constructors
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 extension type ET1(var int i);
 //                 ^

diff --git a/tests/language/declaring_constructors/header/extension_type_test.dart b/tests/language/primary_constructors/header/extension_type_test.dart
similarity index 91%
rename from tests/language/declaring_constructors/header/extension_type_test.dart
rename to tests/language/primary_constructors/header/extension_type_test.dart
index 08196ae..c4b0fb5 100644
--- a/tests/language/declaring_constructors/header/extension_type_test.dart
+++ b/tests/language/primary_constructors/header/extension_type_test.dart

@@ -5,7 +5,7 @@
 // The modifier `final` on the representation variable in an extension type
 // primary constructor can be specified or omitted.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import 'package:expect/expect.dart';
 

diff --git a/tests/language/declaring_constructors/header/header_generative_constructor_error_test.dart b/tests/language/primary_constructors/header/header_generative_constructor_error_test.dart
similarity index 94%
rename from tests/language/declaring_constructors/header/header_generative_constructor_error_test.dart
rename to tests/language/primary_constructors/header/header_generative_constructor_error_test.dart
index ad026ca..0730427 100644
--- a/tests/language/declaring_constructors/header/header_generative_constructor_error_test.dart
+++ b/tests/language/primary_constructors/header/header_generative_constructor_error_test.dart

@@ -5,7 +5,7 @@
 // A class that has a declaring header constructor cannot have any other
 // non-redirecting generative constructors.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C1(var int x) {
   C1.named(this.x);

diff --git a/tests/language/declaring_constructors/header/header_generative_constructor_test.dart b/tests/language/primary_constructors/header/header_generative_constructor_test.dart
similarity index 92%
rename from tests/language/declaring_constructors/header/header_generative_constructor_test.dart
rename to tests/language/primary_constructors/header/header_generative_constructor_test.dart
index e750b07..2f2088f 100644
--- a/tests/language/declaring_constructors/header/header_generative_constructor_test.dart
+++ b/tests/language/primary_constructors/header/header_generative_constructor_test.dart

@@ -5,7 +5,7 @@
 // A class that has a declaring header constructor can have redirecting
 // generative constructors and factory constructors.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import 'package:expect/expect.dart';
 

diff --git a/tests/language/declaring_constructors/header/in_body_initializer_test.dart b/tests/language/primary_constructors/header/in_body_initializer_test.dart
similarity index 95%
rename from tests/language/declaring_constructors/header/in_body_initializer_test.dart
rename to tests/language/primary_constructors/header/in_body_initializer_test.dart
index d65db43..96da020 100644
--- a/tests/language/declaring_constructors/header/in_body_initializer_test.dart
+++ b/tests/language/primary_constructors/header/in_body_initializer_test.dart

@@ -6,7 +6,7 @@
 // These elements are placed in the class body in a declaration that provides
 // "the rest" of the constructor declaration which is given in the header.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import 'package:expect/expect.dart';
 

diff --git a/tests/language/declaring_constructors/header/optional_parameter_nonconstant_default_error_test.dart b/tests/language/primary_constructors/header/optional_parameter_nonconstant_default_error_test.dart
similarity index 90%
rename from tests/language/declaring_constructors/header/optional_parameter_nonconstant_default_error_test.dart
rename to tests/language/primary_constructors/header/optional_parameter_nonconstant_default_error_test.dart
index 678bbf5..7e04b74 100644
--- a/tests/language/declaring_constructors/header/optional_parameter_nonconstant_default_error_test.dart
+++ b/tests/language/primary_constructors/header/optional_parameter_nonconstant_default_error_test.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 // Tests that declaring constructors with optional parameters cannot have
 // non-constant default values in a header declaring constructor.

diff --git a/tests/language/declaring_constructors/short_syntax/factory_ambiguity_error_test.dart b/tests/language/primary_constructors/short_syntax/factory_ambiguity_error_test.dart
similarity index 90%
rename from tests/language/declaring_constructors/short_syntax/factory_ambiguity_error_test.dart
rename to tests/language/primary_constructors/short_syntax/factory_ambiguity_error_test.dart
index 223d4e2..1ababc8 100644
--- a/tests/language/declaring_constructors/short_syntax/factory_ambiguity_error_test.dart
+++ b/tests/language/primary_constructors/short_syntax/factory_ambiguity_error_test.dart

@@ -5,7 +5,7 @@
 // `factory() => C();` is a factory constructor whose name is the name of the
 // enclosing class, and not a method.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C {
   final int x;

diff --git a/tests/language/declaring_constructors/short_syntax/factory_named_test.dart b/tests/language/primary_constructors/short_syntax/factory_named_test.dart
similarity index 91%
rename from tests/language/declaring_constructors/short_syntax/factory_named_test.dart
rename to tests/language/primary_constructors/short_syntax/factory_named_test.dart
index 9251dea..e0c7845 100644
--- a/tests/language/declaring_constructors/short_syntax/factory_named_test.dart
+++ b/tests/language/primary_constructors/short_syntax/factory_named_test.dart

@@ -5,7 +5,7 @@
 // Using `factory name()` to declare named factory constructors with new shorter
 // syntax.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import "package:expect/expect.dart";
 

diff --git a/tests/language/declaring_constructors/short_syntax/factory_test.dart b/tests/language/primary_constructors/short_syntax/factory_test.dart
similarity index 91%
rename from tests/language/declaring_constructors/short_syntax/factory_test.dart
rename to tests/language/primary_constructors/short_syntax/factory_test.dart
index 300a4ba..1ec47df 100644
--- a/tests/language/declaring_constructors/short_syntax/factory_test.dart
+++ b/tests/language/primary_constructors/short_syntax/factory_test.dart

@@ -5,7 +5,7 @@
 // `factory() => C();` is a factory constructor whose name is the name of the
 // enclosing class, and not a method.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import "package:expect/expect.dart";
 

diff --git a/tests/language/declaring_constructors/short_syntax/new_test.dart b/tests/language/primary_constructors/short_syntax/new_test.dart
similarity index 93%
rename from tests/language/declaring_constructors/short_syntax/new_test.dart
rename to tests/language/primary_constructors/short_syntax/new_test.dart
index b310e32..ca84024 100644
--- a/tests/language/declaring_constructors/short_syntax/new_test.dart
+++ b/tests/language/primary_constructors/short_syntax/new_test.dart

@@ -4,7 +4,7 @@
 
 // Using `new` to declare constructors.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import "package:expect/expect.dart";
 

diff --git a/tests/language/declaring_constructors/syntax/class_header_test.dart b/tests/language/primary_constructors/syntax/class_header_test.dart
similarity index 94%
rename from tests/language/declaring_constructors/syntax/class_header_test.dart
rename to tests/language/primary_constructors/syntax/class_header_test.dart
index 1ab3aba..59c47e9 100644
--- a/tests/language/declaring_constructors/syntax/class_header_test.dart
+++ b/tests/language/primary_constructors/syntax/class_header_test.dart

@@ -4,7 +4,7 @@
 
 // Tests declaring constructors with various clauses.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import "package:expect/expect.dart";
 

diff --git a/tests/language/declaring_constructors/syntax/const_in_header_and_body_error_test.dart b/tests/language/primary_constructors/syntax/const_in_header_and_body_error_test.dart
similarity index 93%
rename from tests/language/declaring_constructors/syntax/const_in_header_and_body_error_test.dart
rename to tests/language/primary_constructors/syntax/const_in_header_and_body_error_test.dart
index de1fdd2..2e71494 100644
--- a/tests/language/declaring_constructors/syntax/const_in_header_and_body_error_test.dart
+++ b/tests/language/primary_constructors/syntax/const_in_header_and_body_error_test.dart

@@ -5,7 +5,7 @@
 // It is an error to have the `const` keyword on both the header and body
 // part of a declaring constructor.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class const C1(final int x) {
   const this : assert(1 != 2);

diff --git a/tests/language/declaring_constructors/syntax/covariant_super_this_error_test.dart b/tests/language/primary_constructors/syntax/covariant_super_this_error_test.dart
similarity index 95%
rename from tests/language/declaring_constructors/syntax/covariant_super_this_error_test.dart
rename to tests/language/primary_constructors/syntax/covariant_super_this_error_test.dart
index dbfd42b..44d9516 100644
--- a/tests/language/declaring_constructors/syntax/covariant_super_this_error_test.dart
+++ b/tests/language/primary_constructors/syntax/covariant_super_this_error_test.dart

@@ -6,7 +6,7 @@
 // form `this.v`, or `super.v` where `v` is an identifier, and the parameter has
 // the modifier `covariant`.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 // `covariant` with `this.x`
 

diff --git a/tests/language/declaring_constructors/syntax/covariant_var_test.dart b/tests/language/primary_constructors/syntax/covariant_var_test.dart
similarity index 93%
rename from tests/language/declaring_constructors/syntax/covariant_var_test.dart
rename to tests/language/primary_constructors/syntax/covariant_var_test.dart
index c697d0d..8cdccc6 100644
--- a/tests/language/declaring_constructors/syntax/covariant_var_test.dart
+++ b/tests/language/primary_constructors/syntax/covariant_var_test.dart

@@ -4,7 +4,7 @@
 
 // Allow the modifier `covariant` in declaring parameters.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import 'package:expect/expect.dart';
 

diff --git a/tests/language/declaring_constructors/syntax/covariant_with_final_error_test.dart b/tests/language/primary_constructors/syntax/covariant_with_final_error_test.dart
similarity index 93%
rename from tests/language/declaring_constructors/syntax/covariant_with_final_error_test.dart
rename to tests/language/primary_constructors/syntax/covariant_with_final_error_test.dart
index f3af511..08beb55 100644
--- a/tests/language/declaring_constructors/syntax/covariant_with_final_error_test.dart
+++ b/tests/language/primary_constructors/syntax/covariant_with_final_error_test.dart

@@ -4,7 +4,7 @@
 
 // It is an error for a formal parameter to be both `covariant` and `final`.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C1(covariant final int x);
 //      ^

diff --git a/tests/language/declaring_constructors/syntax/covariant_without_var_error_test.dart b/tests/language/primary_constructors/syntax/covariant_without_var_error_test.dart
similarity index 91%
rename from tests/language/declaring_constructors/syntax/covariant_without_var_error_test.dart
rename to tests/language/primary_constructors/syntax/covariant_without_var_error_test.dart
index 15cb848..9090f46 100644
--- a/tests/language/declaring_constructors/syntax/covariant_without_var_error_test.dart
+++ b/tests/language/primary_constructors/syntax/covariant_without_var_error_test.dart

@@ -5,7 +5,7 @@
 // It is an error for a formal parameter to have the `covariant` modifier
 // but not the `var` modifier.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C1(covariant int x);
 //      ^

diff --git a/tests/language/declaring_constructors/syntax/empty_body_error_test.dart b/tests/language/primary_constructors/syntax/empty_body_error_test.dart
similarity index 93%
rename from tests/language/declaring_constructors/syntax/empty_body_error_test.dart
rename to tests/language/primary_constructors/syntax/empty_body_error_test.dart
index d3ad64b..2d8cd55 100644
--- a/tests/language/declaring_constructors/syntax/empty_body_error_test.dart
+++ b/tests/language/primary_constructors/syntax/empty_body_error_test.dart

@@ -5,7 +5,7 @@
 // For mixins, an empty body, `{}`, cannot be replaced by `;`. Enums require a
 // non-empty declaration.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C1;
 

diff --git a/tests/language/declaring_constructors/syntax/empty_body_test.dart b/tests/language/primary_constructors/syntax/empty_body_test.dart
similarity index 89%
rename from tests/language/declaring_constructors/syntax/empty_body_test.dart
rename to tests/language/primary_constructors/syntax/empty_body_test.dart
index 25c6ed4..d0808de 100644
--- a/tests/language/declaring_constructors/syntax/empty_body_test.dart
+++ b/tests/language/primary_constructors/syntax/empty_body_test.dart

@@ -4,7 +4,7 @@
 
 // An empty class body, `{}`, can be replaced by `;`.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C1;
 

diff --git a/tests/language/declaring_constructors/syntax/final_formal_parameter_error_test.dart b/tests/language/primary_constructors/syntax/final_formal_parameter_error_test.dart
similarity index 94%
rename from tests/language/declaring_constructors/syntax/final_formal_parameter_error_test.dart
rename to tests/language/primary_constructors/syntax/final_formal_parameter_error_test.dart
index 660acf67..7f0ad0b 100644
--- a/tests/language/declaring_constructors/syntax/final_formal_parameter_error_test.dart
+++ b/tests/language/primary_constructors/syntax/final_formal_parameter_error_test.dart

@@ -5,7 +5,7 @@
 // Declaring any formal parameters with the `final` modifier is a compile-time
 // error.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C {
   void method(final int x, [final int y = 1]) {}

diff --git a/tests/language/declaring_constructors/syntax/header_syntax_test.dart b/tests/language/primary_constructors/syntax/header_syntax_test.dart
similarity index 97%
rename from tests/language/declaring_constructors/syntax/header_syntax_test.dart
rename to tests/language/primary_constructors/syntax/header_syntax_test.dart
index 20fc6c7..6ca73f2 100644
--- a/tests/language/declaring_constructors/syntax/header_syntax_test.dart
+++ b/tests/language/primary_constructors/syntax/header_syntax_test.dart

@@ -4,7 +4,7 @@
 
 // A basic declaring header constructor.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import 'package:expect/expect.dart';
 

diff --git a/tests/language/declaring_constructors/syntax/late_external_error_test.dart b/tests/language/primary_constructors/syntax/late_external_error_test.dart
similarity index 87%
rename from tests/language/declaring_constructors/syntax/late_external_error_test.dart
rename to tests/language/primary_constructors/syntax/late_external_error_test.dart
index ebb709c..d6598fe 100644
--- a/tests/language/declaring_constructors/syntax/late_external_error_test.dart
+++ b/tests/language/primary_constructors/syntax/late_external_error_test.dart

@@ -5,7 +5,7 @@
 // `late` and `external` instance variables cannot be introduced by a declaring
 // parameter.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C1(late int x, external double d);
 //       ^

diff --git a/tests/language/declaring_constructors/syntax/late_external_test.dart b/tests/language/primary_constructors/syntax/late_external_test.dart
similarity index 87%
rename from tests/language/declaring_constructors/syntax/late_external_test.dart
rename to tests/language/primary_constructors/syntax/late_external_test.dart
index 48b795c..e62af7a 100644
--- a/tests/language/declaring_constructors/syntax/late_external_test.dart
+++ b/tests/language/primary_constructors/syntax/late_external_test.dart

@@ -4,7 +4,7 @@
 
 // `late` and `external` must be initialized in the body.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import "package:expect/expect.dart";
 

diff --git a/tests/language/declaring_constructors/syntax/mixin_class_test.dart b/tests/language/primary_constructors/syntax/mixin_class_test.dart
similarity index 92%
rename from tests/language/declaring_constructors/syntax/mixin_class_test.dart
rename to tests/language/primary_constructors/syntax/mixin_class_test.dart
index f7dd886..7ca516c 100644
--- a/tests/language/declaring_constructors/syntax/mixin_class_test.dart
+++ b/tests/language/primary_constructors/syntax/mixin_class_test.dart

@@ -4,7 +4,7 @@
 
 // Body and header constructor syntax for mixin classes.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 import "package:expect/expect.dart";
 

diff --git a/tests/language/declaring_constructors/syntax/mixin_error_test.dart b/tests/language/primary_constructors/syntax/mixin_error_test.dart
similarity index 95%
rename from tests/language/declaring_constructors/syntax/mixin_error_test.dart
rename to tests/language/primary_constructors/syntax/mixin_error_test.dart
index bdd227a..5c25752 100644
--- a/tests/language/declaring_constructors/syntax/mixin_error_test.dart
+++ b/tests/language/primary_constructors/syntax/mixin_error_test.dart

@@ -4,7 +4,7 @@
 
 // Mixins cannot have declaring header/body constructors.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C1;
 

diff --git a/tests/language/declaring_constructors/syntax/no_parameter_list_error_test.dart b/tests/language/primary_constructors/syntax/no_parameter_list_error_test.dart
similarity index 87%
rename from tests/language/declaring_constructors/syntax/no_parameter_list_error_test.dart
rename to tests/language/primary_constructors/syntax/no_parameter_list_error_test.dart
index 21128e3..c013400 100644
--- a/tests/language/declaring_constructors/syntax/no_parameter_list_error_test.dart
+++ b/tests/language/primary_constructors/syntax/no_parameter_list_error_test.dart

@@ -5,7 +5,7 @@
 // It is an error if a class does not have a primary constructor, but the body
 // of the class contains a primary constructor body.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C {
   this : assert(1 != 2);

diff --git a/tests/language/declaring_constructors/syntax/required_with_default_error_test.dart b/tests/language/primary_constructors/syntax/required_with_default_error_test.dart
similarity index 90%
rename from tests/language/declaring_constructors/syntax/required_with_default_error_test.dart
rename to tests/language/primary_constructors/syntax/required_with_default_error_test.dart
index 9264236..2bd965e 100644
--- a/tests/language/declaring_constructors/syntax/required_with_default_error_test.dart
+++ b/tests/language/primary_constructors/syntax/required_with_default_error_test.dart

@@ -5,7 +5,7 @@
 // It is an error for a named parameter to be both `required` and have a
 // default value.
 
-// SharedOptions=--enable-experiment=declaring-constructors
+// SharedOptions=--enable-experiment=primary-constructors
 
 class C1({required var int x = 0});
 //       ^

diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml
index b248b62..d29ff89 100644
--- a/tools/experimental_features.yaml
+++ b/tools/experimental_features.yaml

@@ -176,7 +176,7 @@
     #     print(C(message: 'feature enabled')._message);
     #   }
 
-  declaring-constructors:
+  primary-constructors:
     help: "Less verbose constructors."
 
   anonymous-methods: