languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 12:24:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set CFE weak/strong nnbd flag in the static error updater

Browse source 
Change-Id: Icfe7c5d41e5851fe9aadbf16daca2e753c65e86e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/183361
Commit-Queue: Leaf Petersen <leafp@google.com>
Reviewed-by: Bob Nystrom <rnystrom@google.com>
This commit is contained in:
Leaf Petersen 2021-02-09 02:25:44 +00:00 committed by commit-bot@chromium.org
parent 88332241f0
commit 1a03d262d4
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkg/test_runner/tool/update_static_error_tests.dart
View file

@ -13,6 +13,7 @@ import 'package:glob/list_local_fs.dart';
import 'package:path/path.dart' as p;
import 'package:test_runner/src/command_output.dart';
import 'package:test_runner/src/feature.dart' show Feature;
import 'package:test_runner/src/path.dart';
import 'package:test_runner/src/static_error.dart';
import 'package:test_runner/src/test_file.dart';
@ -61,8 +62,6 @@ Future<void> main(List<String> args) async {
allowed: sources);
parser.addSeparator("Other flags:");
parser.addFlag("null-safety",
help: "Enable the 'non-nullable' experiment.", negatable: false);
var results = parser.parse(args);
@ -76,7 +75,6 @@ Future<void> main(List<String> args) async {
}
var dryRun = results["dry-run"] as bool;
var nullSafety = results["null-safety"] as bool;
var removeSources = <ErrorSource>{};
var insertSources = <ErrorSource>{};
@ -134,10 +132,7 @@ Future<void> main(List<String> args) async {
if (entry is pkg_file.File) {
await _processFile(entry,
dryRun: dryRun,
remove: removeSources,
insert: insertSources,
nullSafety: nullSafety);
dryRun: dryRun, remove: removeSources, insert: insertSources);
}
}
}
@ -151,16 +146,12 @@ void _usageError(ArgParser parser, String message) {
}
Future<void> _processFile(File file,
{bool dryRun,
Set<ErrorSource> remove,
Set<ErrorSource> insert,
bool nullSafety}) async {
{bool dryRun, Set<ErrorSource> remove, Set<ErrorSource> insert}) async {
stdout.write("${file.path}...");
var source = file.readAsStringSync();
var testFile = TestFile.parse(Path("."), file.absolute.path, source);
var experiments = [
if (nullSafety) "non-nullable",
if (testFile.experiments.isNotEmpty) ...testFile.experiments
];
@ -184,10 +175,15 @@ Future<void> _processFile(File file,
// tell which web errors are web-specific.
List<StaticError> cfeErrors;
if (insert.contains(ErrorSource.cfe) || insert.contains(ErrorSource.web)) {
var cfeOptions = [
if (testFile.requirements.contains(Feature.nnbdWeak)) "--nnbd-weak",
if (testFile.requirements.contains(Feature.nnbdStrong)) "--nnbd-strong",
...options
];
// Clear the previous line.
stdout.write("\r${file.path} ");
stdout.write("\r${file.path} (Running CFE...)");
cfeErrors = await runCfe(file.absolute.path, options);
cfeErrors = await runCfe(file.absolute.path, cfeOptions);
if (cfeErrors == null) {
print("Error: failed to update ${file.path}");
} else if (insert.contains(ErrorSource.cfe)) {