Skip to content
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

Jump to bottom

update language version check when using experiments #2840

Merged
merged 4 commits into from
Sep 25, 2020
Merged

update language version check when using experiments #2840

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
267b776
update language version check when using experiments
jakemac53 Sep 25, 2020
1e3984b
unskip tests and instead run on 2.10 dev sdk
jakemac53 Sep 25, 2020
86f3806
add todos
jakemac53 Sep 25, 2020
3c972fe
Merge branch 'master' into skip-resolver-tests
jakemac53 Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion build_resolvers/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## 1.4.1-dev
## 1.4.1

- Update the exception thrown when using experiments without an exactly
matching analyzer version to instead ensure that the sdk version is not
ahead of the analyzer version.

## 1.4.0

Expand Down
11 changes: 4 additions & 7 deletions build_resolvers/lib/src/resolver.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,8 @@ final _dartUiPath =
/// experiments.
FeatureSet _featureSet({List<String> enableExperiments}) {
enableExperiments ??= [];
if (enableExperiments.isEmpty) {
return FeatureSet.fromEnableFlags2(
sdkLanguageVersion: sdkLanguageVersion, flags: []);
} else if (sdkLanguageVersion == ExperimentStatus.currentVersion) {
return FeatureSet.fromEnableFlags2(
sdkLanguageVersion: sdkLanguageVersion, flags: enableExperiments);
} else {
if (enableExperiments.isNotEmpty &&
sdkLanguageVersion > ExperimentStatus.currentVersion) {
throw StateError('''
Attempting to enable experiments `$enableExperiments`, but the current SDK
language version does not match your `analyzer` package language version:
Expand All @@ -456,6 +451,8 @@ package in your `pubspec.yaml`, so you may have to add that. You can see your
current version by running `pub deps`.
''');
}
return FeatureSet.fromEnableFlags2(
sdkLanguageVersion: sdkLanguageVersion, flags: enableExperiments);
}

/// Path to the running dart's SDK root.
Expand Down
2 changes: 1 addition & 1 deletion build_resolvers/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: build_resolvers
version: 1.4.1-dev
version: 1.4.1
description: Resolve Dart code in a Builder
homepage: https://github.com/dart-lang/build/tree/master/build_resolvers

Expand Down
6 changes: 3 additions & 3 deletions build_resolvers/test/resolver_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void main() {
var originalLevel = Logger.root.level;
Logger.root.level = Level.WARNING;
var listener = Logger.root.onRecord.listen((record) {
fail('Got an unexpected warning during analyzsis:\n\n$record');
fail('Got an unexpected warning during analysis:\n\n$record');
});
addTearDown(() {
Logger.root.level = originalLevel;
Expand All @@ -176,7 +176,7 @@ void main() {
}, (resolver) async {
await resolver.libraryFor(entryPoint);
}, resolvers: AnalyzerResolvers());
});
}, skip: 'https://github.com/dart-lang/sdk/issues/43550');
});

group('assets that aren\'t a transitive import of input', () {
Expand Down Expand Up @@ -412,7 +412,7 @@ int? get x => 1;
expect(errors.errors, isEmpty);
}, resolvers: AnalyzerResolvers()),
['non-nullable']);
});
}, skip: 'https://github.com/dart-lang/sdk/issues/43550');

test('can get a new analysis session after resolving additional assets',
() async {
Expand Down