Skip to content

Commit 39e4dfe

Browse files
scheglovcommit-bot@chromium.org
authored andcommitted
Update experimental_features.yaml, set experimentalReleaseVersion for non-nullable.
Bug: #43032 Change-Id: I28b27b3416826abd807a185b2d4214782571fb98 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159383 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Paul Berry <[email protected]> Reviewed-by: Jake Macdonald <[email protected]>
1 parent 2337219 commit 39e4dfe

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class ExperimentalFeatures {
9797
isEnabledByDefault: IsEnabledByDefault.non_nullable,
9898
isExpired: IsExpired.non_nullable,
9999
documentation: 'Non Nullable by default',
100-
experimentalReleaseVersion: null,
100+
experimentalReleaseVersion: Version.parse('2.10.0'),
101101
releaseVersion: null,
102102
);
103103

pkg/analyzer/tool/experiments/generate.dart

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ class ExperimentalFeatures {
144144
for (var key in keysSorted) {
145145
var id = keyToIdentifier(key);
146146
var help = (features[key] as YamlMap)['help'] ?? '';
147+
var experimentalReleaseVersion =
148+
(features[key] as YamlMap)['experimentalReleaseVersion'];
147149
var enabledIn = (features[key] as YamlMap)['enabledIn'];
148150
out.write('''
149151
@@ -154,7 +156,16 @@ class ExperimentalFeatures {
154156
isExpired: IsExpired.$id,
155157
documentation: '$help',
156158
''');
157-
out.write("experimentalReleaseVersion: null,");
159+
160+
if (experimentalReleaseVersion != null) {
161+
experimentalReleaseVersion =
162+
_versionNumberAsString(experimentalReleaseVersion);
163+
out.write("experimentalReleaseVersion: ");
164+
out.write("Version.parse('$experimentalReleaseVersion'),");
165+
} else {
166+
out.write("experimentalReleaseVersion: null,");
167+
}
168+
158169
if (enabledIn != null) {
159170
enabledIn = _versionNumberAsString(enabledIn);
160171
out.write("releaseVersion: Version.parse('$enabledIn'),");

pkg/dev_compiler/tool/patch_sdk.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ class _StringEdit implements Comparable<_StringEdit> {
475475

476476
ParseStringResult _parseString(String source, {bool useNnbd}) {
477477
var features = FeatureSet.fromEnableFlags2(
478-
sdkLanguageVersion: Version.parse('2.9.0'),
478+
sdkLanguageVersion: Version.parse('2.10.0'),
479479
flags: [if (useNnbd) 'non-nullable'],
480480
);
481481
return parseString(content: source, featureSet: features);

tools/experimental_features.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ current-version: '2.10.0'
9090
features:
9191
non-nullable:
9292
help: "Non Nullable by default"
93+
experimentalReleaseVersion: '2.10.0'
9394

9495
triple-shift:
9596
help: "Triple-shift operator"

0 commit comments

Comments
 (0)