Skip to content

Commit 89e545c

Browse files
kallentuCommit Queue
authored and
Commit Queue
committed
[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 [email protected] 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: #57037 Change-Id: I031e3bce8166145b24dbb77acf259d78e6e00f0a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/407603 Reviewed-by: Alexander Thomas <[email protected]> Reviewed-by: Erik Ernst <[email protected]> Commit-Queue: Kallen Tu <[email protected]>
1 parent e0b0c33 commit 89e545c

File tree

49 files changed

+106
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+106
-106
lines changed

DEPS

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ vars = {
5454

5555
# co19 is a cipd package automatically generated for each co19 commit.
5656
# Use tests/co19/update.sh to update this hash.
57-
"co19_rev": "dd7fa9c980a47c5196c192046f5d4a43dbce70ef",
57+
"co19_rev": "b14b0802e696a60c79b00d0f052e26fb986f0faf",
5858

5959
# The internal benchmarks to use. See go/dart-benchmarks-internal
6060
"benchmarks_internal_rev": "6e26684f965f797471d9d424beef5cf0908c60ee",

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ enum ExperimentalFlag {
5959
experimentEnabledVersion: const Version(3, 6),
6060
experimentReleasedVersion: const Version(3, 6)),
6161

62+
dotShorthands(
63+
name: 'dot-shorthands',
64+
isEnabledByDefault: false,
65+
isExpired: false,
66+
experimentEnabledVersion: defaultLanguageVersion,
67+
experimentReleasedVersion: defaultLanguageVersion),
68+
6269
enhancedEnums(
6370
name: 'enhanced-enums',
6471
isEnabledByDefault: true,
@@ -73,13 +80,6 @@ enum ExperimentalFlag {
7380
experimentEnabledVersion: defaultLanguageVersion,
7481
experimentReleasedVersion: const Version(3, 6)),
7582

76-
enumShorthands(
77-
name: 'enum-shorthands',
78-
isEnabledByDefault: false,
79-
isExpired: false,
80-
experimentEnabledVersion: defaultLanguageVersion,
81-
experimentReleasedVersion: defaultLanguageVersion),
82-
8383
extensionMethods(
8484
name: 'extension-methods',
8585
isEnabledByDefault: true,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ abstract class Feature {
3131
static final control_flow_collections =
3232
ExperimentalFeatures.control_flow_collections;
3333

34+
/// Feature information for dot shorthands.
35+
static final dot_shorthands = ExperimentalFeatures.dot_shorthands;
36+
3437
/// Feature information for enhanced enums.
3538
static final enhanced_enums = ExperimentalFeatures.enhanced_enums;
3639

3740
/// Feature information for enhanced parts.
3841
static final enhanced_parts = ExperimentalFeatures.enhanced_parts;
3942

40-
/// Feature information for enum shorthands.
41-
static final enum_shorthands = ExperimentalFeatures.enum_shorthands;
42-
4343
/// Feature information for extension methods.
4444
static final extension_methods = ExperimentalFeatures.extension_methods;
4545

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ import 'package:meta/meta.dart';
9797
// TODO(scheglov): Clean up the list of implicitly analyzed files.
9898
class AnalysisDriver {
9999
/// The version of data format, should be incremented on every format change.
100-
static const int DATA_VERSION = 429;
100+
static const int DATA_VERSION = 430;
101101

102102
/// The number of exception contexts allowed to write. Once this field is
103103
/// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/analysis/experiments.g.dart

+26-26
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ final _knownFeatures = <String, ExperimentalFeature>{
2424
EnableString.control_flow_collections:
2525
ExperimentalFeatures.control_flow_collections,
2626
EnableString.digit_separators: ExperimentalFeatures.digit_separators,
27+
EnableString.dot_shorthands: ExperimentalFeatures.dot_shorthands,
2728
EnableString.enhanced_enums: ExperimentalFeatures.enhanced_enums,
2829
EnableString.enhanced_parts: ExperimentalFeatures.enhanced_parts,
29-
EnableString.enum_shorthands: ExperimentalFeatures.enum_shorthands,
3030
EnableString.extension_methods: ExperimentalFeatures.extension_methods,
3131
EnableString.generic_metadata: ExperimentalFeatures.generic_metadata,
3232
EnableString.getter_setter_error: ExperimentalFeatures.getter_setter_error,
@@ -84,15 +84,15 @@ class EnableString {
8484
/// String to enable the experiment "digit-separators"
8585
static const String digit_separators = 'digit-separators';
8686

87+
/// String to enable the experiment "dot-shorthands"
88+
static const String dot_shorthands = 'dot-shorthands';
89+
8790
/// String to enable the experiment "enhanced-enums"
8891
static const String enhanced_enums = 'enhanced-enums';
8992

9093
/// String to enable the experiment "enhanced-parts"
9194
static const String enhanced_parts = 'enhanced-parts';
9295

93-
/// String to enable the experiment "enum-shorthands"
94-
static const String enum_shorthands = 'enum-shorthands';
95-
9696
/// String to enable the experiment "extension-methods"
9797
static const String extension_methods = 'extension-methods';
9898

@@ -258,8 +258,19 @@ class ExperimentalFeatures {
258258
channels: ["stable", "beta", "dev", "main"],
259259
);
260260

261-
static final enhanced_enums = ExperimentalFeature(
261+
static final dot_shorthands = ExperimentalFeature(
262262
index: 7,
263+
enableString: EnableString.dot_shorthands,
264+
isEnabledByDefault: IsEnabledByDefault.dot_shorthands,
265+
isExpired: IsExpired.dot_shorthands,
266+
documentation: 'Shorter dot syntax for static accesses.',
267+
experimentalReleaseVersion: null,
268+
releaseVersion: null,
269+
channels: ["stable", "beta", "dev", "main"],
270+
);
271+
272+
static final enhanced_enums = ExperimentalFeature(
273+
index: 8,
263274
enableString: EnableString.enhanced_enums,
264275
isEnabledByDefault: IsEnabledByDefault.enhanced_enums,
265276
isExpired: IsExpired.enhanced_enums,
@@ -270,7 +281,7 @@ class ExperimentalFeatures {
270281
);
271282

272283
static final enhanced_parts = ExperimentalFeature(
273-
index: 8,
284+
index: 9,
274285
enableString: EnableString.enhanced_parts,
275286
isEnabledByDefault: IsEnabledByDefault.enhanced_parts,
276287
isExpired: IsExpired.enhanced_parts,
@@ -280,17 +291,6 @@ class ExperimentalFeatures {
280291
channels: ["stable", "beta", "dev", "main"],
281292
);
282293

283-
static final enum_shorthands = ExperimentalFeature(
284-
index: 9,
285-
enableString: EnableString.enum_shorthands,
286-
isEnabledByDefault: IsEnabledByDefault.enum_shorthands,
287-
isExpired: IsExpired.enum_shorthands,
288-
documentation: 'Shorter dot syntax for enum values.',
289-
experimentalReleaseVersion: null,
290-
releaseVersion: null,
291-
channels: ["stable", "beta", "dev", "main"],
292-
);
293-
294294
static final extension_methods = ExperimentalFeature(
295295
index: 10,
296296
enableString: EnableString.extension_methods,
@@ -631,15 +631,15 @@ class IsEnabledByDefault {
631631
/// Default state of the experiment "digit-separators"
632632
static const bool digit_separators = true;
633633

634+
/// Default state of the experiment "dot-shorthands"
635+
static const bool dot_shorthands = false;
636+
634637
/// Default state of the experiment "enhanced-enums"
635638
static const bool enhanced_enums = true;
636639

637640
/// Default state of the experiment "enhanced-parts"
638641
static const bool enhanced_parts = false;
639642

640-
/// Default state of the experiment "enum-shorthands"
641-
static const bool enum_shorthands = false;
642-
643643
/// Default state of the experiment "extension-methods"
644644
static const bool extension_methods = true;
645645

@@ -750,15 +750,15 @@ class IsExpired {
750750
/// Expiration status of the experiment "digit-separators"
751751
static const bool digit_separators = true;
752752

753+
/// Expiration status of the experiment "dot-shorthands"
754+
static const bool dot_shorthands = false;
755+
753756
/// Expiration status of the experiment "enhanced-enums"
754757
static const bool enhanced_enums = true;
755758

756759
/// Expiration status of the experiment "enhanced-parts"
757760
static const bool enhanced_parts = false;
758761

759-
/// Expiration status of the experiment "enum-shorthands"
760-
static const bool enum_shorthands = false;
761-
762762
/// Expiration status of the experiment "extension-methods"
763763
static const bool extension_methods = true;
764764

@@ -869,15 +869,15 @@ mixin _CurrentState {
869869
/// Current state for the flag "digit-separators"
870870
bool get digit_separators => isEnabled(ExperimentalFeatures.digit_separators);
871871

872+
/// Current state for the flag "dot-shorthands"
873+
bool get dot_shorthands => isEnabled(ExperimentalFeatures.dot_shorthands);
874+
872875
/// Current state for the flag "enhanced-enums"
873876
bool get enhanced_enums => isEnabled(ExperimentalFeatures.enhanced_enums);
874877

875878
/// Current state for the flag "enhanced-parts"
876879
bool get enhanced_parts => isEnabled(ExperimentalFeatures.enhanced_parts);
877880

878-
/// Current state for the flag "enum-shorthands"
879-
bool get enum_shorthands => isEnabled(ExperimentalFeatures.enum_shorthands);
880-
881881
/// Current state for the flag "extension-methods"
882882
bool get extension_methods =>
883883
isEnabled(ExperimentalFeatures.extension_methods);

pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart

+24-24
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ class ExperimentalFlag {
115115
experimentEnabledVersion: const Version(3, 6),
116116
experimentReleasedVersion: const Version(3, 6));
117117

118+
static const ExperimentalFlag dotShorthands = const ExperimentalFlag(
119+
name: 'dot-shorthands',
120+
isEnabledByDefault: false,
121+
isExpired: false,
122+
enabledVersion: defaultLanguageVersion,
123+
experimentEnabledVersion: defaultLanguageVersion,
124+
experimentReleasedVersion: defaultLanguageVersion);
125+
118126
static const ExperimentalFlag enhancedEnums = const ExperimentalFlag(
119127
name: 'enhanced-enums',
120128
isEnabledByDefault: true,
@@ -131,14 +139,6 @@ class ExperimentalFlag {
131139
experimentEnabledVersion: defaultLanguageVersion,
132140
experimentReleasedVersion: const Version(3, 6));
133141

134-
static const ExperimentalFlag enumShorthands = const ExperimentalFlag(
135-
name: 'enum-shorthands',
136-
isEnabledByDefault: false,
137-
isExpired: false,
138-
enabledVersion: defaultLanguageVersion,
139-
experimentEnabledVersion: defaultLanguageVersion,
140-
experimentReleasedVersion: defaultLanguageVersion);
141-
142142
static const ExperimentalFlag extensionMethods = const ExperimentalFlag(
143143
name: 'extension-methods',
144144
isEnabledByDefault: true,
@@ -442,6 +442,10 @@ class GlobalFeatures {
442442
GlobalFeature get digitSeparators => _digitSeparators ??=
443443
_computeGlobalFeature(ExperimentalFlag.digitSeparators);
444444

445+
GlobalFeature? _dotShorthands;
446+
GlobalFeature get dotShorthands =>
447+
_dotShorthands ??= _computeGlobalFeature(ExperimentalFlag.dotShorthands);
448+
445449
GlobalFeature? _enhancedEnums;
446450
GlobalFeature get enhancedEnums =>
447451
_enhancedEnums ??= _computeGlobalFeature(ExperimentalFlag.enhancedEnums);
@@ -450,10 +454,6 @@ class GlobalFeatures {
450454
GlobalFeature get enhancedParts =>
451455
_enhancedParts ??= _computeGlobalFeature(ExperimentalFlag.enhancedParts);
452456

453-
GlobalFeature? _enumShorthands;
454-
GlobalFeature get enumShorthands => _enumShorthands ??=
455-
_computeGlobalFeature(ExperimentalFlag.enumShorthands);
456-
457457
GlobalFeature? _extensionMethods;
458458
GlobalFeature get extensionMethods => _extensionMethods ??=
459459
_computeGlobalFeature(ExperimentalFlag.extensionMethods);
@@ -621,6 +621,11 @@ class LibraryFeatures {
621621
_digitSeparators ??= globalFeatures._computeLibraryFeature(
622622
ExperimentalFlag.digitSeparators, canonicalUri, libraryVersion);
623623

624+
LibraryFeature? _dotShorthands;
625+
LibraryFeature get dotShorthands =>
626+
_dotShorthands ??= globalFeatures._computeLibraryFeature(
627+
ExperimentalFlag.dotShorthands, canonicalUri, libraryVersion);
628+
624629
LibraryFeature? _enhancedEnums;
625630
LibraryFeature get enhancedEnums =>
626631
_enhancedEnums ??= globalFeatures._computeLibraryFeature(
@@ -631,11 +636,6 @@ class LibraryFeatures {
631636
_enhancedParts ??= globalFeatures._computeLibraryFeature(
632637
ExperimentalFlag.enhancedParts, canonicalUri, libraryVersion);
633638

634-
LibraryFeature? _enumShorthands;
635-
LibraryFeature get enumShorthands =>
636-
_enumShorthands ??= globalFeatures._computeLibraryFeature(
637-
ExperimentalFlag.enumShorthands, canonicalUri, libraryVersion);
638-
639639
LibraryFeature? _extensionMethods;
640640
LibraryFeature get extensionMethods =>
641641
_extensionMethods ??= globalFeatures._computeLibraryFeature(
@@ -798,12 +798,12 @@ class LibraryFeatures {
798798
return controlFlowCollections;
799799
case shared.ExperimentalFlag.digitSeparators:
800800
return digitSeparators;
801+
case shared.ExperimentalFlag.dotShorthands:
802+
return dotShorthands;
801803
case shared.ExperimentalFlag.enhancedEnums:
802804
return enhancedEnums;
803805
case shared.ExperimentalFlag.enhancedParts:
804806
return enhancedParts;
805-
case shared.ExperimentalFlag.enumShorthands:
806-
return enumShorthands;
807807
case shared.ExperimentalFlag.extensionMethods:
808808
return extensionMethods;
809809
case shared.ExperimentalFlag.genericMetadata:
@@ -882,12 +882,12 @@ ExperimentalFlag? parseExperimentalFlag(String flag) {
882882
return ExperimentalFlag.controlFlowCollections;
883883
case "digit-separators":
884884
return ExperimentalFlag.digitSeparators;
885+
case "dot-shorthands":
886+
return ExperimentalFlag.dotShorthands;
885887
case "enhanced-enums":
886888
return ExperimentalFlag.enhancedEnums;
887889
case "enhanced-parts":
888890
return ExperimentalFlag.enhancedParts;
889-
case "enum-shorthands":
890-
return ExperimentalFlag.enumShorthands;
891891
case "extension-methods":
892892
return ExperimentalFlag.extensionMethods;
893893
case "generic-metadata":
@@ -965,12 +965,12 @@ final Map<ExperimentalFlag, bool> defaultExperimentalFlags = {
965965
ExperimentalFlag.controlFlowCollections.isEnabledByDefault,
966966
ExperimentalFlag.digitSeparators:
967967
ExperimentalFlag.digitSeparators.isEnabledByDefault,
968+
ExperimentalFlag.dotShorthands:
969+
ExperimentalFlag.dotShorthands.isEnabledByDefault,
968970
ExperimentalFlag.enhancedEnums:
969971
ExperimentalFlag.enhancedEnums.isEnabledByDefault,
970972
ExperimentalFlag.enhancedParts:
971973
ExperimentalFlag.enhancedParts.isEnabledByDefault,
972-
ExperimentalFlag.enumShorthands:
973-
ExperimentalFlag.enumShorthands.isEnabledByDefault,
974974
ExperimentalFlag.extensionMethods:
975975
ExperimentalFlag.extensionMethods.isEnabledByDefault,
976976
ExperimentalFlag.genericMetadata:
@@ -1039,9 +1039,9 @@ const Map<shared.ExperimentalFlag, ExperimentalFlag> sharedExperimentalFlags = {
10391039
shared.ExperimentalFlag.controlFlowCollections:
10401040
ExperimentalFlag.controlFlowCollections,
10411041
shared.ExperimentalFlag.digitSeparators: ExperimentalFlag.digitSeparators,
1042+
shared.ExperimentalFlag.dotShorthands: ExperimentalFlag.dotShorthands,
10421043
shared.ExperimentalFlag.enhancedEnums: ExperimentalFlag.enhancedEnums,
10431044
shared.ExperimentalFlag.enhancedParts: ExperimentalFlag.enhancedParts,
1044-
shared.ExperimentalFlag.enumShorthands: ExperimentalFlag.enumShorthands,
10451045
shared.ExperimentalFlag.extensionMethods: ExperimentalFlag.extensionMethods,
10461046
shared.ExperimentalFlag.genericMetadata: ExperimentalFlag.genericMetadata,
10471047
shared.ExperimentalFlag.getterSetterError: ExperimentalFlag.getterSetterError,

tests/language/enum_shorthands/constructor/constructor_cascade_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Context type is propagated down in cascades for constructor enum shorthands.
66

7-
// SharedOptions=--enable-experiment=enum-shorthands
7+
// SharedOptions=--enable-experiment=dot-shorthands
88

99
import '../enum_shorthand_helper.dart';
1010

tests/language/enum_shorthands/constructor/constructor_collection_literal_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Context type is propagated down in collection literals.
66
// Testing with constructor shorthands.
77

8-
// SharedOptions=--enable-experiment=enum-shorthands
8+
// SharedOptions=--enable-experiment=dot-shorthands
99

1010
import '../enum_shorthand_helper.dart';
1111

tests/language/enum_shorthands/constructor/constructor_error_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Errors involving enum shorthands of constructors.
66

7-
// SharedOptions=--enable-experiment=enum-shorthands
7+
// SharedOptions=--enable-experiment=dot-shorthands
88

99
import '../enum_shorthand_helper.dart';
1010

tests/language/enum_shorthands/constructor/constructor_future_or_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// `FutureOr<S>` denotes the same namespace as `S` for enum shorthands on
66
// constructors.
77

8-
// SharedOptions=--enable-experiment=enum-shorthands
8+
// SharedOptions=--enable-experiment=dot-shorthands
99

1010
import 'dart:async';
1111

tests/language/enum_shorthands/constructor/constructor_if_null_error_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Errors with `??` and enum shorthands with constructors.
66

7-
// SharedOptions=--enable-experiment=enum-shorthands
7+
// SharedOptions=--enable-experiment=dot-shorthands
88

99
import '../enum_shorthand_helper.dart';
1010

tests/language/enum_shorthands/constructor/constructor_if_null_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Context type is propagated down in an if-null `??` expression.
66

7-
// SharedOptions=--enable-experiment=enum-shorthands
7+
// SharedOptions=--enable-experiment=dot-shorthands
88

99
import 'package:expect/expect.dart';
1010

tests/language/enum_shorthands/constructor/constructor_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Testing shorthands for constructor calls.
66

7-
// SharedOptions=--enable-experiment=enum-shorthands
7+
// SharedOptions=--enable-experiment=dot-shorthands
88

99
import '../enum_shorthand_helper.dart';
1010

0 commit comments

Comments
 (0)