[dot-shorthands][co19] Rename enum-shorthands flag to dot-shorthands (and roll co19 to b14b080)
We've decided to rename enum shorthands to dot shorthands. It describes the entire feature better. It's not only for enum values. We'll update the experiment name before the implementation goes in, that way our users can use a flag that matches the actual feature name.
Additionally, roll co19 to b14b0802e696a60c79b00d0f052e26fb986f0faf so we can avoid an infra failure with co19 using what's now an unknown feature flag (enum-shorthands).
2025-02-06 sgrekhov22@gmail.com Fixes dart-lang/co19#3067. Rename the static access shorthand feature experiment flag (dart-lang/co19#3068)
Cq-Include-Trybots: luci.dart.try:analyzer-linux-release-try
Bug: https://github.com/dart-lang/sdk/issues/57037
Change-Id: I031e3bce8166145b24dbb77acf259d78e6e00f0a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/407603
Reviewed-by: Alexander Thomas <athom@google.com>
Reviewed-by: Erik Ernst <eernst@google.com>
Commit-Queue: Kallen Tu <kallentu@google.com>
diff --git a/DEPS b/DEPS
index d06c265..5033a4f 100644
--- a/DEPS
+++ b/DEPS
@@ -54,7 +54,7 @@
# co19 is a cipd package automatically generated for each co19 commit.
# Use tests/co19/update.sh to update this hash.
- "co19_rev": "dd7fa9c980a47c5196c192046f5d4a43dbce70ef",
+ "co19_rev": "b14b0802e696a60c79b00d0f052e26fb986f0faf",
# The internal benchmarks to use. See go/dart-benchmarks-internal
"benchmarks_internal_rev": "6e26684f965f797471d9d424beef5cf0908c60ee",
diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
index 9419dd2..8641fbd 100644
--- a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
@@ -59,6 +59,13 @@
experimentEnabledVersion: const Version(3, 6),
experimentReleasedVersion: const Version(3, 6)),
+ dotShorthands(
+ name: 'dot-shorthands',
+ isEnabledByDefault: false,
+ isExpired: false,
+ experimentEnabledVersion: defaultLanguageVersion,
+ experimentReleasedVersion: defaultLanguageVersion),
+
enhancedEnums(
name: 'enhanced-enums',
isEnabledByDefault: true,
@@ -73,13 +80,6 @@
experimentEnabledVersion: defaultLanguageVersion,
experimentReleasedVersion: const Version(3, 6)),
- enumShorthands(
- name: 'enum-shorthands',
- isEnabledByDefault: false,
- isExpired: false,
- experimentEnabledVersion: defaultLanguageVersion,
- experimentReleasedVersion: defaultLanguageVersion),
-
extensionMethods(
name: 'extension-methods',
isEnabledByDefault: true,
diff --git a/pkg/analyzer/lib/dart/analysis/features.dart b/pkg/analyzer/lib/dart/analysis/features.dart
index 7b8c74b..ccc622a 100644
--- a/pkg/analyzer/lib/dart/analysis/features.dart
+++ b/pkg/analyzer/lib/dart/analysis/features.dart
@@ -31,15 +31,15 @@
static final control_flow_collections =
ExperimentalFeatures.control_flow_collections;
+ /// Feature information for dot shorthands.
+ static final dot_shorthands = ExperimentalFeatures.dot_shorthands;
+
/// Feature information for enhanced enums.
static final enhanced_enums = ExperimentalFeatures.enhanced_enums;
/// Feature information for enhanced parts.
static final enhanced_parts = ExperimentalFeatures.enhanced_parts;
- /// Feature information for enum shorthands.
- static final enum_shorthands = ExperimentalFeatures.enum_shorthands;
-
/// Feature information for extension methods.
static final extension_methods = ExperimentalFeatures.extension_methods;
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index 7d9460f..10266a4 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -97,7 +97,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 = 429;
+ static const int DATA_VERSION = 430;
/// 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 8e6d831..796c872 100644
--- a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart
@@ -24,9 +24,9 @@
EnableString.control_flow_collections:
ExperimentalFeatures.control_flow_collections,
EnableString.digit_separators: ExperimentalFeatures.digit_separators,
+ EnableString.dot_shorthands: ExperimentalFeatures.dot_shorthands,
EnableString.enhanced_enums: ExperimentalFeatures.enhanced_enums,
EnableString.enhanced_parts: ExperimentalFeatures.enhanced_parts,
- EnableString.enum_shorthands: ExperimentalFeatures.enum_shorthands,
EnableString.extension_methods: ExperimentalFeatures.extension_methods,
EnableString.generic_metadata: ExperimentalFeatures.generic_metadata,
EnableString.getter_setter_error: ExperimentalFeatures.getter_setter_error,
@@ -84,15 +84,15 @@
/// String to enable the experiment "digit-separators"
static const String digit_separators = 'digit-separators';
+ /// String to enable the experiment "dot-shorthands"
+ static const String dot_shorthands = 'dot-shorthands';
+
/// String to enable the experiment "enhanced-enums"
static const String enhanced_enums = 'enhanced-enums';
/// String to enable the experiment "enhanced-parts"
static const String enhanced_parts = 'enhanced-parts';
- /// String to enable the experiment "enum-shorthands"
- static const String enum_shorthands = 'enum-shorthands';
-
/// String to enable the experiment "extension-methods"
static const String extension_methods = 'extension-methods';
@@ -258,8 +258,19 @@
channels: ["stable", "beta", "dev", "main"],
);
- static final enhanced_enums = ExperimentalFeature(
+ static final dot_shorthands = ExperimentalFeature(
index: 7,
+ enableString: EnableString.dot_shorthands,
+ isEnabledByDefault: IsEnabledByDefault.dot_shorthands,
+ isExpired: IsExpired.dot_shorthands,
+ documentation: 'Shorter dot syntax for static accesses.',
+ experimentalReleaseVersion: null,
+ releaseVersion: null,
+ channels: ["stable", "beta", "dev", "main"],
+ );
+
+ static final enhanced_enums = ExperimentalFeature(
+ index: 8,
enableString: EnableString.enhanced_enums,
isEnabledByDefault: IsEnabledByDefault.enhanced_enums,
isExpired: IsExpired.enhanced_enums,
@@ -270,7 +281,7 @@
);
static final enhanced_parts = ExperimentalFeature(
- index: 8,
+ index: 9,
enableString: EnableString.enhanced_parts,
isEnabledByDefault: IsEnabledByDefault.enhanced_parts,
isExpired: IsExpired.enhanced_parts,
@@ -280,17 +291,6 @@
channels: ["stable", "beta", "dev", "main"],
);
- static final enum_shorthands = ExperimentalFeature(
- index: 9,
- enableString: EnableString.enum_shorthands,
- isEnabledByDefault: IsEnabledByDefault.enum_shorthands,
- isExpired: IsExpired.enum_shorthands,
- documentation: 'Shorter dot syntax for enum values.',
- experimentalReleaseVersion: null,
- releaseVersion: null,
- channels: ["stable", "beta", "dev", "main"],
- );
-
static final extension_methods = ExperimentalFeature(
index: 10,
enableString: EnableString.extension_methods,
@@ -631,15 +631,15 @@
/// Default state of the experiment "digit-separators"
static const bool digit_separators = true;
+ /// Default state of the experiment "dot-shorthands"
+ static const bool dot_shorthands = false;
+
/// Default state of the experiment "enhanced-enums"
static const bool enhanced_enums = true;
/// Default state of the experiment "enhanced-parts"
static const bool enhanced_parts = false;
- /// Default state of the experiment "enum-shorthands"
- static const bool enum_shorthands = false;
-
/// Default state of the experiment "extension-methods"
static const bool extension_methods = true;
@@ -750,15 +750,15 @@
/// Expiration status of the experiment "digit-separators"
static const bool digit_separators = true;
+ /// Expiration status of the experiment "dot-shorthands"
+ static const bool dot_shorthands = false;
+
/// Expiration status of the experiment "enhanced-enums"
static const bool enhanced_enums = true;
/// Expiration status of the experiment "enhanced-parts"
static const bool enhanced_parts = false;
- /// Expiration status of the experiment "enum-shorthands"
- static const bool enum_shorthands = false;
-
/// Expiration status of the experiment "extension-methods"
static const bool extension_methods = true;
@@ -869,15 +869,15 @@
/// Current state for the flag "digit-separators"
bool get digit_separators => isEnabled(ExperimentalFeatures.digit_separators);
+ /// Current state for the flag "dot-shorthands"
+ bool get dot_shorthands => isEnabled(ExperimentalFeatures.dot_shorthands);
+
/// Current state for the flag "enhanced-enums"
bool get enhanced_enums => isEnabled(ExperimentalFeatures.enhanced_enums);
/// Current state for the flag "enhanced-parts"
bool get enhanced_parts => isEnabled(ExperimentalFeatures.enhanced_parts);
- /// Current state for the flag "enum-shorthands"
- bool get enum_shorthands => isEnabled(ExperimentalFeatures.enum_shorthands);
-
/// Current state for the flag "extension-methods"
bool get extension_methods =>
isEnabled(ExperimentalFeatures.extension_methods);
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 deafcce..c2bd41b 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
@@ -115,6 +115,14 @@
experimentEnabledVersion: const Version(3, 6),
experimentReleasedVersion: const Version(3, 6));
+ static const ExperimentalFlag dotShorthands = const ExperimentalFlag(
+ name: 'dot-shorthands',
+ isEnabledByDefault: false,
+ isExpired: false,
+ enabledVersion: defaultLanguageVersion,
+ experimentEnabledVersion: defaultLanguageVersion,
+ experimentReleasedVersion: defaultLanguageVersion);
+
static const ExperimentalFlag enhancedEnums = const ExperimentalFlag(
name: 'enhanced-enums',
isEnabledByDefault: true,
@@ -131,14 +139,6 @@
experimentEnabledVersion: defaultLanguageVersion,
experimentReleasedVersion: const Version(3, 6));
- static const ExperimentalFlag enumShorthands = const ExperimentalFlag(
- name: 'enum-shorthands',
- isEnabledByDefault: false,
- isExpired: false,
- enabledVersion: defaultLanguageVersion,
- experimentEnabledVersion: defaultLanguageVersion,
- experimentReleasedVersion: defaultLanguageVersion);
-
static const ExperimentalFlag extensionMethods = const ExperimentalFlag(
name: 'extension-methods',
isEnabledByDefault: true,
@@ -442,6 +442,10 @@
GlobalFeature get digitSeparators => _digitSeparators ??=
_computeGlobalFeature(ExperimentalFlag.digitSeparators);
+ GlobalFeature? _dotShorthands;
+ GlobalFeature get dotShorthands =>
+ _dotShorthands ??= _computeGlobalFeature(ExperimentalFlag.dotShorthands);
+
GlobalFeature? _enhancedEnums;
GlobalFeature get enhancedEnums =>
_enhancedEnums ??= _computeGlobalFeature(ExperimentalFlag.enhancedEnums);
@@ -450,10 +454,6 @@
GlobalFeature get enhancedParts =>
_enhancedParts ??= _computeGlobalFeature(ExperimentalFlag.enhancedParts);
- GlobalFeature? _enumShorthands;
- GlobalFeature get enumShorthands => _enumShorthands ??=
- _computeGlobalFeature(ExperimentalFlag.enumShorthands);
-
GlobalFeature? _extensionMethods;
GlobalFeature get extensionMethods => _extensionMethods ??=
_computeGlobalFeature(ExperimentalFlag.extensionMethods);
@@ -621,6 +621,11 @@
_digitSeparators ??= globalFeatures._computeLibraryFeature(
ExperimentalFlag.digitSeparators, canonicalUri, libraryVersion);
+ LibraryFeature? _dotShorthands;
+ LibraryFeature get dotShorthands =>
+ _dotShorthands ??= globalFeatures._computeLibraryFeature(
+ ExperimentalFlag.dotShorthands, canonicalUri, libraryVersion);
+
LibraryFeature? _enhancedEnums;
LibraryFeature get enhancedEnums =>
_enhancedEnums ??= globalFeatures._computeLibraryFeature(
@@ -631,11 +636,6 @@
_enhancedParts ??= globalFeatures._computeLibraryFeature(
ExperimentalFlag.enhancedParts, canonicalUri, libraryVersion);
- LibraryFeature? _enumShorthands;
- LibraryFeature get enumShorthands =>
- _enumShorthands ??= globalFeatures._computeLibraryFeature(
- ExperimentalFlag.enumShorthands, canonicalUri, libraryVersion);
-
LibraryFeature? _extensionMethods;
LibraryFeature get extensionMethods =>
_extensionMethods ??= globalFeatures._computeLibraryFeature(
@@ -798,12 +798,12 @@
return controlFlowCollections;
case shared.ExperimentalFlag.digitSeparators:
return digitSeparators;
+ case shared.ExperimentalFlag.dotShorthands:
+ return dotShorthands;
case shared.ExperimentalFlag.enhancedEnums:
return enhancedEnums;
case shared.ExperimentalFlag.enhancedParts:
return enhancedParts;
- case shared.ExperimentalFlag.enumShorthands:
- return enumShorthands;
case shared.ExperimentalFlag.extensionMethods:
return extensionMethods;
case shared.ExperimentalFlag.genericMetadata:
@@ -882,12 +882,12 @@
return ExperimentalFlag.controlFlowCollections;
case "digit-separators":
return ExperimentalFlag.digitSeparators;
+ case "dot-shorthands":
+ return ExperimentalFlag.dotShorthands;
case "enhanced-enums":
return ExperimentalFlag.enhancedEnums;
case "enhanced-parts":
return ExperimentalFlag.enhancedParts;
- case "enum-shorthands":
- return ExperimentalFlag.enumShorthands;
case "extension-methods":
return ExperimentalFlag.extensionMethods;
case "generic-metadata":
@@ -965,12 +965,12 @@
ExperimentalFlag.controlFlowCollections.isEnabledByDefault,
ExperimentalFlag.digitSeparators:
ExperimentalFlag.digitSeparators.isEnabledByDefault,
+ ExperimentalFlag.dotShorthands:
+ ExperimentalFlag.dotShorthands.isEnabledByDefault,
ExperimentalFlag.enhancedEnums:
ExperimentalFlag.enhancedEnums.isEnabledByDefault,
ExperimentalFlag.enhancedParts:
ExperimentalFlag.enhancedParts.isEnabledByDefault,
- ExperimentalFlag.enumShorthands:
- ExperimentalFlag.enumShorthands.isEnabledByDefault,
ExperimentalFlag.extensionMethods:
ExperimentalFlag.extensionMethods.isEnabledByDefault,
ExperimentalFlag.genericMetadata:
@@ -1039,9 +1039,9 @@
shared.ExperimentalFlag.controlFlowCollections:
ExperimentalFlag.controlFlowCollections,
shared.ExperimentalFlag.digitSeparators: ExperimentalFlag.digitSeparators,
+ shared.ExperimentalFlag.dotShorthands: ExperimentalFlag.dotShorthands,
shared.ExperimentalFlag.enhancedEnums: ExperimentalFlag.enhancedEnums,
shared.ExperimentalFlag.enhancedParts: ExperimentalFlag.enhancedParts,
- shared.ExperimentalFlag.enumShorthands: ExperimentalFlag.enumShorthands,
shared.ExperimentalFlag.extensionMethods: ExperimentalFlag.extensionMethods,
shared.ExperimentalFlag.genericMetadata: ExperimentalFlag.genericMetadata,
shared.ExperimentalFlag.getterSetterError: ExperimentalFlag.getterSetterError,
diff --git a/tests/language/enum_shorthands/constructor/constructor_cascade_test.dart b/tests/language/enum_shorthands/constructor/constructor_cascade_test.dart
index 13917f6..6b1d9ce 100644
--- a/tests/language/enum_shorthands/constructor/constructor_cascade_test.dart
+++ b/tests/language/enum_shorthands/constructor/constructor_cascade_test.dart
@@ -4,7 +4,7 @@
// Context type is propagated down in cascades for constructor enum shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/constructor/constructor_collection_literal_test.dart b/tests/language/enum_shorthands/constructor/constructor_collection_literal_test.dart
index 4e6a1d1..b01b9c8 100644
--- a/tests/language/enum_shorthands/constructor/constructor_collection_literal_test.dart
+++ b/tests/language/enum_shorthands/constructor/constructor_collection_literal_test.dart
@@ -5,7 +5,7 @@
// Context type is propagated down in collection literals.
// Testing with constructor shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/constructor/constructor_error_test.dart b/tests/language/enum_shorthands/constructor/constructor_error_test.dart
index 6bc8a0c..88b401f 100644
--- a/tests/language/enum_shorthands/constructor/constructor_error_test.dart
+++ b/tests/language/enum_shorthands/constructor/constructor_error_test.dart
@@ -4,7 +4,7 @@
// Errors involving enum shorthands of constructors.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/constructor/constructor_future_or_test.dart b/tests/language/enum_shorthands/constructor/constructor_future_or_test.dart
index 756f79b..edd3305 100644
--- a/tests/language/enum_shorthands/constructor/constructor_future_or_test.dart
+++ b/tests/language/enum_shorthands/constructor/constructor_future_or_test.dart
@@ -5,7 +5,7 @@
// `FutureOr<S>` denotes the same namespace as `S` for enum shorthands on
// constructors.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'dart:async';
diff --git a/tests/language/enum_shorthands/constructor/constructor_if_null_error_test.dart b/tests/language/enum_shorthands/constructor/constructor_if_null_error_test.dart
index f721f34..0fb2f4d 100644
--- a/tests/language/enum_shorthands/constructor/constructor_if_null_error_test.dart
+++ b/tests/language/enum_shorthands/constructor/constructor_if_null_error_test.dart
@@ -4,7 +4,7 @@
// Errors with `??` and enum shorthands with constructors.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/constructor/constructor_if_null_test.dart b/tests/language/enum_shorthands/constructor/constructor_if_null_test.dart
index 6978292..22619b8 100644
--- a/tests/language/enum_shorthands/constructor/constructor_if_null_test.dart
+++ b/tests/language/enum_shorthands/constructor/constructor_if_null_test.dart
@@ -4,7 +4,7 @@
// Context type is propagated down in an if-null `??` expression.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'package:expect/expect.dart';
diff --git a/tests/language/enum_shorthands/constructor/constructor_test.dart b/tests/language/enum_shorthands/constructor/constructor_test.dart
index 7255d6b..41aa9d8 100644
--- a/tests/language/enum_shorthands/constructor/constructor_test.dart
+++ b/tests/language/enum_shorthands/constructor/constructor_test.dart
@@ -4,7 +4,7 @@
// Testing shorthands for constructor calls.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/enum_shorthand_helper.dart b/tests/language/enum_shorthands/enum_shorthand_helper.dart
index 69cbdcb..99b1672 100644
--- a/tests/language/enum_shorthands/enum_shorthand_helper.dart
+++ b/tests/language/enum_shorthands/enum_shorthand_helper.dart
@@ -4,7 +4,7 @@
// Common classes and enums for testing enum shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
enum Color { red, green, blue }
diff --git a/tests/language/enum_shorthands/equality/equality_ctor_error_test.dart b/tests/language/enum_shorthands/equality/equality_ctor_error_test.dart
index 1f777e5..3c1ecba 100644
--- a/tests/language/enum_shorthands/equality/equality_ctor_error_test.dart
+++ b/tests/language/enum_shorthands/equality/equality_ctor_error_test.dart
@@ -4,7 +4,7 @@
// Testing erroneous ways of using shorthands with the `==` and `!=` operators.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/equality/equality_ctor_test.dart b/tests/language/enum_shorthands/equality/equality_ctor_test.dart
index 7a9cc78..e049b91 100644
--- a/tests/language/enum_shorthands/equality/equality_ctor_test.dart
+++ b/tests/language/enum_shorthands/equality/equality_ctor_test.dart
@@ -4,7 +4,7 @@
// Testing the == and != behaviour for enum shorthands with constructors.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/equality/equality_error_test.dart b/tests/language/enum_shorthands/equality/equality_error_test.dart
index c60fb77..98b69e8 100644
--- a/tests/language/enum_shorthands/equality/equality_error_test.dart
+++ b/tests/language/enum_shorthands/equality/equality_error_test.dart
@@ -4,7 +4,7 @@
// Testing erroneous ways of using shorthands with the `==` and `!=` operators.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/equality/equality_member_error_test.dart b/tests/language/enum_shorthands/equality/equality_member_error_test.dart
index 828c179..6a6d7ab 100644
--- a/tests/language/enum_shorthands/equality/equality_member_error_test.dart
+++ b/tests/language/enum_shorthands/equality/equality_member_error_test.dart
@@ -5,7 +5,7 @@
// Testing erroneous ways of using shorthands with the `==` and `!=` operators
// for static members.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/equality/equality_member_test.dart b/tests/language/enum_shorthands/equality/equality_member_test.dart
index 6a7b2b2..4473aab 100644
--- a/tests/language/enum_shorthands/equality/equality_member_test.dart
+++ b/tests/language/enum_shorthands/equality/equality_member_test.dart
@@ -4,7 +4,7 @@
// Testing the == and != behaviour for enum shorthands with static members.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/equality/equality_selector_chain_error_test.dart b/tests/language/enum_shorthands/equality/equality_selector_chain_error_test.dart
index 7efa78f..8d122d9 100644
--- a/tests/language/enum_shorthands/equality/equality_selector_chain_error_test.dart
+++ b/tests/language/enum_shorthands/equality/equality_selector_chain_error_test.dart
@@ -5,7 +5,7 @@
// Testing erroneous ways of using shorthands with the `==` and `!=` operators
// with selector chains.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/equality/equality_selector_chain_test.dart b/tests/language/enum_shorthands/equality/equality_selector_chain_test.dart
index 8a1b9a0..fceb7ff 100644
--- a/tests/language/enum_shorthands/equality/equality_selector_chain_test.dart
+++ b/tests/language/enum_shorthands/equality/equality_selector_chain_test.dart
@@ -4,7 +4,7 @@
// Testing the == and != behaviour for enum shorthands with selector chains.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/equality/equality_test.dart b/tests/language/enum_shorthands/equality/equality_test.dart
index f11e36f..57306c5 100644
--- a/tests/language/enum_shorthands/equality/equality_test.dart
+++ b/tests/language/enum_shorthands/equality/equality_test.dart
@@ -4,7 +4,7 @@
// Testing the == and != behaviour for enum shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/language_defined/bool_context_error_test.dart b/tests/language/enum_shorthands/language_defined/bool_context_error_test.dart
index 52ed2c3..6a1eec1 100644
--- a/tests/language/enum_shorthands/language_defined/bool_context_error_test.dart
+++ b/tests/language/enum_shorthands/language_defined/bool_context_error_test.dart
@@ -6,7 +6,7 @@
// (`if`, `||`, `while`), using an enum shorthand will match members in the
// `bool` class.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/language_defined/bool_from_environment_test.dart b/tests/language/enum_shorthands/language_defined/bool_from_environment_test.dart
index 4d28dbd..bee9a98 100644
--- a/tests/language/enum_shorthands/language_defined/bool_from_environment_test.dart
+++ b/tests/language/enum_shorthands/language_defined/bool_from_environment_test.dart
@@ -6,7 +6,7 @@
// using an enum shorthand will match the `fromEnvironment` member in the
// `bool` class.
-// SharedOptions=--enable-experiment=enum-shorthands -Da=true
+// SharedOptions=--enable-experiment=dot-shorthands -Da=true
import 'package:expect/expect.dart';
diff --git a/tests/language/enum_shorthands/language_defined/bool_parse_test.dart b/tests/language/enum_shorthands/language_defined/bool_parse_test.dart
index 27d2986..5a85464 100644
--- a/tests/language/enum_shorthands/language_defined/bool_parse_test.dart
+++ b/tests/language/enum_shorthands/language_defined/bool_parse_test.dart
@@ -5,7 +5,7 @@
// When the context type is a language-defined bool (`if`, `||`, `while`),
// using an enum shorthand will match the `parse` member in the `bool` class.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'package:expect/expect.dart';
diff --git a/tests/language/enum_shorthands/language_defined/bool_try_parse_test.dart b/tests/language/enum_shorthands/language_defined/bool_try_parse_test.dart
index 94e409c..db27b04 100644
--- a/tests/language/enum_shorthands/language_defined/bool_try_parse_test.dart
+++ b/tests/language/enum_shorthands/language_defined/bool_try_parse_test.dart
@@ -5,7 +5,7 @@
// When the context type is a language-defined bool (`if`, `||`, `while`),
// using an enum shorthand will match the `tryParse` member in the `bool` class.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'package:expect/expect.dart';
diff --git a/tests/language/enum_shorthands/language_defined/iterable_context_test.dart b/tests/language/enum_shorthands/language_defined/iterable_context_test.dart
index f252fb7..0b553c1 100644
--- a/tests/language/enum_shorthands/language_defined/iterable_context_test.dart
+++ b/tests/language/enum_shorthands/language_defined/iterable_context_test.dart
@@ -4,7 +4,7 @@
// Context type is language-defined `Iterable` or `Stream`.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
void main() async {
var iter = [1, 2];
diff --git a/tests/language/enum_shorthands/member/static_method_cascade_test.dart b/tests/language/enum_shorthands/member/static_method_cascade_test.dart
index 930a180..18a1c4e 100644
--- a/tests/language/enum_shorthands/member/static_method_cascade_test.dart
+++ b/tests/language/enum_shorthands/member/static_method_cascade_test.dart
@@ -5,7 +5,7 @@
// Context type is propagated down in cascades for static member enum
// shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/member/static_method_collection_literal_test.dart b/tests/language/enum_shorthands/member/static_method_collection_literal_test.dart
index a7bf76e..d317fa2 100644
--- a/tests/language/enum_shorthands/member/static_method_collection_literal_test.dart
+++ b/tests/language/enum_shorthands/member/static_method_collection_literal_test.dart
@@ -5,7 +5,7 @@
// Context type is propagated down in collection literals.
// Testing with static method shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/member/static_method_future_or_test.dart b/tests/language/enum_shorthands/member/static_method_future_or_test.dart
index 3057295..a33bc3f3 100644
--- a/tests/language/enum_shorthands/member/static_method_future_or_test.dart
+++ b/tests/language/enum_shorthands/member/static_method_future_or_test.dart
@@ -5,7 +5,7 @@
// `FutureOr<S>` denotes the same namespace as `S` for enum shorthands on
// static members.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'dart:async';
diff --git a/tests/language/enum_shorthands/member/static_method_if_null_error_test.dart b/tests/language/enum_shorthands/member/static_method_if_null_error_test.dart
index 98be551..8581961 100644
--- a/tests/language/enum_shorthands/member/static_method_if_null_error_test.dart
+++ b/tests/language/enum_shorthands/member/static_method_if_null_error_test.dart
@@ -4,7 +4,7 @@
// Errors with `??` and enum shorthands with static members.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/member/static_method_if_null_test.dart b/tests/language/enum_shorthands/member/static_method_if_null_test.dart
index 324d4a5..e37e9e4 100644
--- a/tests/language/enum_shorthands/member/static_method_if_null_test.dart
+++ b/tests/language/enum_shorthands/member/static_method_if_null_test.dart
@@ -4,7 +4,7 @@
// Context type is propagated down in an if-null `??` expression.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'package:expect/expect.dart';
diff --git a/tests/language/enum_shorthands/member/static_method_test.dart b/tests/language/enum_shorthands/member/static_method_test.dart
index 94135af..c4c9ab3 100644
--- a/tests/language/enum_shorthands/member/static_method_test.dart
+++ b/tests/language/enum_shorthands/member/static_method_test.dart
@@ -5,7 +5,7 @@
// Basic usages of enum shorthands with static members in classes and extension
// types.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/member/static_method_type_parameter_error_test.dart b/tests/language/enum_shorthands/member/static_method_type_parameter_error_test.dart
index 3d344dc..892f8d7 100644
--- a/tests/language/enum_shorthands/member/static_method_type_parameter_error_test.dart
+++ b/tests/language/enum_shorthands/member/static_method_type_parameter_error_test.dart
@@ -5,7 +5,7 @@
// Errors when the type parameters of the shorthand methods don't match the
// context type.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/multiple/import_prefix_test.dart b/tests/language/enum_shorthands/multiple/import_prefix_test.dart
index b29ff4c..89bcc02 100644
--- a/tests/language/enum_shorthands/multiple/import_prefix_test.dart
+++ b/tests/language/enum_shorthands/multiple/import_prefix_test.dart
@@ -4,7 +4,7 @@
// Contexts with a prefix import should still work with enum shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart' as prefix;
diff --git a/tests/language/enum_shorthands/multiple/nested_test.dart b/tests/language/enum_shorthands/multiple/nested_test.dart
index 8aeafd9..915f389 100644
--- a/tests/language/enum_shorthands/multiple/nested_test.dart
+++ b/tests/language/enum_shorthands/multiple/nested_test.dart
@@ -4,7 +4,7 @@
// Nested enum shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/multiple/selector_chain_test.dart b/tests/language/enum_shorthands/multiple/selector_chain_test.dart
index e8129cd..30bb92f 100644
--- a/tests/language/enum_shorthands/multiple/selector_chain_test.dart
+++ b/tests/language/enum_shorthands/multiple/selector_chain_test.dart
@@ -5,7 +5,7 @@
// Enum shorthands selector chains in collections, cascades, `??` and other
// contexts.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'dart:async';
diff --git a/tests/language/enum_shorthands/multiple/type_alias_test.dart b/tests/language/enum_shorthands/multiple/type_alias_test.dart
index 08d1b25..bd444af 100644
--- a/tests/language/enum_shorthands/multiple/type_alias_test.dart
+++ b/tests/language/enum_shorthands/multiple/type_alias_test.dart
@@ -4,7 +4,7 @@
// Type aliases with enum shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
typedef ClassAlias = A<int>;
typedef ExtensionAlias = AExt<int>;
diff --git a/tests/language/enum_shorthands/no_context/simple_identifier_no_context_error_test.dart b/tests/language/enum_shorthands/no_context/simple_identifier_no_context_error_test.dart
index 73f0ba5..2664532 100644
--- a/tests/language/enum_shorthands/no_context/simple_identifier_no_context_error_test.dart
+++ b/tests/language/enum_shorthands/no_context/simple_identifier_no_context_error_test.dart
@@ -5,7 +5,7 @@
// Test that there are no crashes when enum shorthands are used in places
// with no context type, or it's not allowed.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_cascade_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_cascade_test.dart
index 47bb2cf..a80c94f 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_cascade_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_cascade_test.dart
@@ -4,7 +4,7 @@
// Context type is propagated down in cascades.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_collection_literal_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_collection_literal_test.dart
index 9971973..d7e6e2a 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_collection_literal_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_collection_literal_test.dart
@@ -4,7 +4,7 @@
// Context type is propagated down in collection literals.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_error_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_error_test.dart
index cd66041..790d0ab 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_error_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_error_test.dart
@@ -5,7 +5,7 @@
// Erroneous ways to use shorthands for simple identifiers and const simple
// identifiers.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_extends_error_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_extends_error_test.dart
index 6546531..4a1d18e 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_extends_error_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_extends_error_test.dart
@@ -6,7 +6,7 @@
// the static members of `T`. It is a compile-time error to use an enum
// shorthand for type `X` in these cases.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'dart:async';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_future_or_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_future_or_test.dart
index a21cd31..2fbc0cc 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_future_or_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_future_or_test.dart
@@ -4,7 +4,7 @@
// `FutureOr<S>` denotes the same namespace as `S` for enum shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import 'dart:async';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_if_null_error_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_if_null_error_test.dart
index fe8ef83..485a276 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_if_null_error_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_if_null_error_test.dart
@@ -4,7 +4,7 @@
// Errors with `??` and enum shorthands with static properties or enums.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_if_null_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_if_null_test.dart
index 488ee6a..5ebac35 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_if_null_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_if_null_test.dart
@@ -4,7 +4,7 @@
// Context type is propagated down in an if-null `??` expression.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
import 'package:expect/expect.dart';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_nullable_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_nullable_test.dart
index 91653c7..5ef814e 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_nullable_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_nullable_test.dart
@@ -4,7 +4,7 @@
// `T?` denotes the same namespace as `T` for enum shorthands.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tests/language/enum_shorthands/simple/simple_identifier_test.dart b/tests/language/enum_shorthands/simple/simple_identifier_test.dart
index c5ca377..7b6e3c0 100644
--- a/tests/language/enum_shorthands/simple/simple_identifier_test.dart
+++ b/tests/language/enum_shorthands/simple/simple_identifier_test.dart
@@ -4,7 +4,7 @@
// Shorthands for simple identifiers and const simple identifiers.
-// SharedOptions=--enable-experiment=enum-shorthands
+// SharedOptions=--enable-experiment=dot-shorthands
import '../enum_shorthand_helper.dart';
diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml
index 4f87f64..737d279 100644
--- a/tools/experimental_features.yaml
+++ b/tools/experimental_features.yaml
@@ -148,8 +148,8 @@
inference-update-4:
help: "A bundle of updates to type inference."
- enum-shorthands:
- help: "Shorter dot syntax for enum values."
+ dot-shorthands:
+ help: "Shorter dot syntax for static accesses."
getter-setter-error:
help: "Stop reporting errors about mismatching types in a getter/setter pair."
