disable triple-shift and generic-metadata once more (#2618)
* Fix test problems first
* Something is wrong with tripleshift/generic-metadata post 2.14
diff --git a/lib/src/model/operator.dart b/lib/src/model/operator.dart
index d8e73ab..311a1bb 100644
--- a/lib/src/model/operator.dart
+++ b/lib/src/model/operator.dart
@@ -22,6 +22,7 @@
'<=': 'less_equal',
'<<': 'shift_left',
'>>': 'shift_right',
+ '>>>': 'triple_shift',
'^': 'bitwise_exclusive_or',
'unary-': 'unary_minus',
'|': 'bitwise_or',
diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart
index 8f36898..4f267ec 100644
--- a/test/end2end/model_special_cases_test.dart
+++ b/test/end2end/model_special_cases_test.dart
@@ -27,14 +27,10 @@
final _testPackageGraphExperimentsMemo = AsyncMemoizer<PackageGraph>();
Future<PackageGraph> get _testPackageGraphExperiments =>
_testPackageGraphExperimentsMemo.runOnce(() => utils.bootBasicPackage(
- 'testing/test_package_experiments',
- pubPackageMetaProvider,
- PhysicalPackageConfigProvider(),
- additionalArguments: [
- '--enable-experiment',
- 'non-nullable,nonfunction-type-aliases',
- '--no-link-to-remote'
- ]));
+ 'testing/test_package_experiments',
+ pubPackageMetaProvider,
+ PhysicalPackageConfigProvider(),
+ additionalArguments: ['--no-link-to-remote']));
final _testPackageGraphGinormousMemo = AsyncMemoizer<PackageGraph>();
Future<PackageGraph> get _testPackageGraphGinormous =>
@@ -74,12 +70,16 @@
exit(1);
}
+ // We can not use ExperimentalFeature.releaseVersion or even
+ // ExperimentalFeature.experimentalReleaseVersion as these are set to null
+ // even when partial analyzer implementations are available, and are often
+ // set too high after release.
final _generalizedTypedefsAllowed =
VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
final _genericMetadataAllowed =
- VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
+ VersionRange(min: Version.parse('2.15.0-0'), includeMin: true);
final _tripleShiftAllowed =
- VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
+ VersionRange(min: Version.parse('2.15.0-0'), includeMin: true);
// Experimental features not yet enabled by default. Move tests out of this
// block when the feature is enabled by default.
diff --git a/testing/test_package_experiments/pubspec.yaml b/testing/test_package_experiments/pubspec.yaml
index 32c96d8..d0ee15f 100644
--- a/testing/test_package_experiments/pubspec.yaml
+++ b/testing/test_package_experiments/pubspec.yaml
@@ -1,5 +1,5 @@
name: test_package_experiments
version: 0.0.1
environment:
- sdk: '>=2.13.0-0 <3.0.0'
+ sdk: '>=2.14.0-0 <3.0.0'
description: Experimental flags are tested here.
