Skip to content

Commit 856c613

Browse files
authored
disable triple-shift and generic-metadata once more (#2618)
* Fix test problems first * Something is wrong with tripleshift/generic-metadata post 2.14
1 parent 28c1d71 commit 856c613

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

lib/src/model/operator.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class Operator extends Method {
2222
'<=': 'less_equal',
2323
'<<': 'shift_left',
2424
'>>': 'shift_right',
25+
'>>>': 'triple_shift',
2526
'^': 'bitwise_exclusive_or',
2627
'unary-': 'unary_minus',
2728
'|': 'bitwise_or',

test/end2end/model_special_cases_test.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,10 @@ final Version _platformVersion = Version.parse(_platformVersionString);
2727
final _testPackageGraphExperimentsMemo = AsyncMemoizer<PackageGraph>();
2828
Future<PackageGraph> get _testPackageGraphExperiments =>
2929
_testPackageGraphExperimentsMemo.runOnce(() => utils.bootBasicPackage(
30-
'testing/test_package_experiments',
31-
pubPackageMetaProvider,
32-
PhysicalPackageConfigProvider(),
33-
additionalArguments: [
34-
'--enable-experiment',
35-
'non-nullable,nonfunction-type-aliases',
36-
'--no-link-to-remote'
37-
]));
30+
'testing/test_package_experiments',
31+
pubPackageMetaProvider,
32+
PhysicalPackageConfigProvider(),
33+
additionalArguments: ['--no-link-to-remote']));
3834

3935
final _testPackageGraphGinormousMemo = AsyncMemoizer<PackageGraph>();
4036
Future<PackageGraph> get _testPackageGraphGinormous =>
@@ -74,12 +70,16 @@ void main() {
7470
exit(1);
7571
}
7672

73+
// We can not use ExperimentalFeature.releaseVersion or even
74+
// ExperimentalFeature.experimentalReleaseVersion as these are set to null
75+
// even when partial analyzer implementations are available, and are often
76+
// set too high after release.
7777
final _generalizedTypedefsAllowed =
7878
VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
7979
final _genericMetadataAllowed =
80-
VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
80+
VersionRange(min: Version.parse('2.15.0-0'), includeMin: true);
8181
final _tripleShiftAllowed =
82-
VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
82+
VersionRange(min: Version.parse('2.15.0-0'), includeMin: true);
8383

8484
// Experimental features not yet enabled by default. Move tests out of this
8585
// block when the feature is enabled by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: test_package_experiments
22
version: 0.0.1
33
environment:
4-
sdk: '>=2.13.0-0 <3.0.0'
4+
sdk: '>=2.14.0-0 <3.0.0'
55
description: Experimental flags are tested here.

0 commit comments

Comments
 (0)