Skip to content

Update to analyzer: ^0.39.12, and use overrideKnownFeaturesAsync() instead of dart:cli. #2250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 6, 2020
Merged

Update to analyzer: ^0.39.12, and use overrideKnownFeaturesAsync() instead of dart:cli. #2250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ environment:
sdk: '>=2.7.0 <3.0.0'

dependencies:
analyzer: ^0.39.11
analyzer: ^0.39.12
args: '>=1.5.0 <2.0.0'
collection: ^1.2.0
cli_util: ^0.1.3+2
Expand Down
38 changes: 15 additions & 23 deletions test/experiment_options_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
/// Unit tests for lib/src/experiment_options.dart.
library dartdoc.experiment_options_test;

import 'dart:cli';
import 'dart:io';

import 'package:analyzer/src/dart/analysis/experiments.dart';
Expand All @@ -19,9 +18,9 @@ void main() {
ExperimentalFeature defaultOnNotExpired, defaultOffNotExpired;
ExperimentalFeature defaultOnExpired, defaultOffExpired;

void withSyntheticExperimentalFeatures(
void Function() operation,
) {
Future<void> withSyntheticExperimentalFeatures(
Future<void> Function() operation,
) async {
defaultOnNotExpired = ExperimentalFeature(
index: 0,
enableString: 'a',
Expand Down Expand Up @@ -55,16 +54,14 @@ void main() {
firstSupportedVersion: null,
);

overrideKnownFeatures(
await overrideKnownFeaturesAsync(
{
'a': defaultOnNotExpired,
'b': defaultOffNotExpired,
'c': defaultOnExpired,
'd': defaultOffExpired,
},
() {
operation();
},
operation,
);
}

Expand All @@ -78,25 +75,20 @@ void main() {
});

group('Experimental options test', () {
void withExperimentOptions(
Future<void> withExperimentOptions(
void Function(DartdocOptionSet) operation,
) {
withSyntheticExperimentalFeatures(() {
// The enclosing function expects only synchronous function argument.
// But `fromOptionGenerators` is asynchronous.
// So, we have to use `waitFor` to adapt it.
var experimentOptions = waitFor(
DartdocOptionSet.fromOptionGenerators(
'dartdoc',
[createExperimentOptions],
),
) async {
await withSyntheticExperimentalFeatures(() async {
var experimentOptions = await DartdocOptionSet.fromOptionGenerators(
'dartdoc',
[createExperimentOptions],
);
operation(experimentOptions);
});
}

test('Defaults work for all options', () {
withExperimentOptions((experimentOptions) {
test('Defaults work for all options', () async {
await withExperimentOptions((experimentOptions) {
experimentOptions.parseArguments([]);
var tester = DartdocOptionContext(experimentOptions, emptyTempDir);
expect(tester.experimentStatus.isEnabled(defaultOnNotExpired), isTrue);
Expand All @@ -107,8 +99,8 @@ void main() {
});
});

test('Overriding defaults works via args', () {
withExperimentOptions((experimentOptions) {
test('Overriding defaults works via args', () async {
await withExperimentOptions((experimentOptions) {
// Set all experiments to non-default values.
experimentOptions.parseArguments([
'--enable-experiment',
Expand Down