Skip to content

Commit

Permalink
disable triple-shift and generic-metadata once more (#2618)
Browse files Browse the repository at this point in the history
* Fix test problems first

* Something is wrong with tripleshift/generic-metadata post 2.14
  • Loading branch information
jcollins-g committed Apr 20, 2021
1 parent 28c1d71 commit 856c613
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions lib/src/model/operator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Operator extends Method {
'<=': 'less_equal',
'<<': 'shift_left',
'>>': 'shift_right',
'>>>': 'triple_shift',
'^': 'bitwise_exclusive_or',
'unary-': 'unary_minus',
'|': 'bitwise_or',
Expand Down
20 changes: 10 additions & 10 deletions test/end2end/model_special_cases_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,10 @@ final Version _platformVersion = Version.parse(_platformVersionString);
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 =>
Expand Down Expand Up @@ -74,12 +70,16 @@ void main() {
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.
Expand Down
2 changes: 1 addition & 1 deletion testing/test_package_experiments/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit 856c613

Please sign in to comment.