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: #61526
Change-Id: Id649447a50917ba5bcddb49661555889dc81ba14
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/464761
Reviewed-by: Johnni Winther <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Erik Ernst <[email protected]>
Reviewed-by: Michael Thomsen <[email protected]>

Author: kallentu

pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart

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

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

@@ -325,8 +325,8 @@ class Parser {
   /// `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 @@ class Parser {
        ),
        _isEnhancedPartsFeatureEnabled = experimentalFeatures
            .isExperimentEnabled(ExperimentalFlag.enhancedParts),
-       _isDeclaringConstructorsFeatureEnabled = experimentalFeatures
-           .isExperimentEnabled(ExperimentalFlag.declaringConstructors),
+       _isPrimaryConstructorsFeatureEnabled = experimentalFeatures
+           .isExperimentEnabled(ExperimentalFlag.primaryConstructors),
        _isPrivateNamedParametersEnabled = experimentalFeatures
            .isExperimentEnabled(ExperimentalFlag.privateNamedParameters);
 
@@ -2215,9 +2215,9 @@ class Parser {
                 codes.codeFunctionTypedParameterVar,
               );
             } else {
-              if (!_isDeclaringConstructorsFeatureEnabled) {
+              if (!_isPrimaryConstructorsFeatureEnabled) {
                 reportExperimentNotEnabled(
-                  ExperimentalFlag.declaringConstructors,
+                  ExperimentalFlag.primaryConstructors,
                   varFinalOrConst,
                   varFinalOrConst,
                 );
@@ -2237,9 +2237,9 @@ class Parser {
             codes.codeFunctionTypedParameterVar,
           );
         } else {
-          if (!_isDeclaringConstructorsFeatureEnabled) {
+          if (!_isPrimaryConstructorsFeatureEnabled) {
             reportExperimentNotEnabled(
-              ExperimentalFlag.declaringConstructors,
+              ExperimentalFlag.primaryConstructors,
               varFinalOrConst,
               varFinalOrConst,
             );
@@ -2258,9 +2258,9 @@ class Parser {
           if (memberKind != MemberKind.PrimaryConstructor) {
             reportRecoverableError(varFinalOrConst, codes.codeTypeAfterVar);
           } else {
-            if (!_isDeclaringConstructorsFeatureEnabled) {
+            if (!_isPrimaryConstructorsFeatureEnabled) {
               reportExperimentNotEnabled(
-                ExperimentalFlag.declaringConstructors,
+                ExperimentalFlag.primaryConstructors,
                 varOrFinal,
                 varOrFinal,
               );
@@ -3072,9 +3072,9 @@ class Parser {
     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 @@ class Parser {
     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 @@ class Parser {
     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 @@ class Parser {
           );
           listener.endMember();
           return token;
-        } else if (_isDeclaringConstructorsFeatureEnabled &&
+        } else if (_isPrimaryConstructorsFeatureEnabled &&
             next2.isA(TokenType.OPEN_PAREN)) {
           if (typeInfo == noType &&
               covariantToken == null &&
@@ -5350,9 +5350,9 @@ class Parser {
         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,
             );

pkg/_fe_analyzer_shared/messages.yaml

@@ -2446,7 +2446,7 @@ NewConstructorQualifiedName:
   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 @@ NewConstructorNewName:
   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 @@ FactoryConstructorNewName:
   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 '';

pkg/analysis_server/test/src/services/correction/fix/make_final_test.dart

@@ -467,8 +467,7 @@ class PreferFinalParametersBulkTest extends BulkFixProcessorTest {
   @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 @@ class PreferFinalParametersTest extends FixProcessorLintTest {
   @override
   List<String> get experiments => super.experiments
       .where(
-        (experiment) =>
-            experiment != Feature.declaring_constructors.enableString,
+        (experiment) => experiment != Feature.primary_constructors.enableString,
       )
       .toList();
 

pkg/analyzer/api.txt

@@ -400,7 +400,6 @@ package:analyzer/dart/analysis/features.dart:
     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 @@ package:analyzer/dart/analysis/features.dart:
     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)

pkg/analyzer/lib/dart/analysis/features.dart

@@ -18,10 +18,6 @@ abstract class Feature {
   /// 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 @@ abstract class Feature {
   /// 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;

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -108,7 +108,7 @@ testFineAfterLibraryAnalyzerHook;
 // 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.