From 3ac34f791d8b44a68cfee5134c3d0d4d7bc6729d Mon Sep 17 00:00:00 2001 From: Robert Nystrom Date: Fri, 1 Oct 2021 18:16:27 +0000 Subject: [PATCH] Change references to "dartfmt" in runtime and tools to "dart format". In Dart 2.15, we're removing "dartfmt" in favor of "dart format", so I'm going through and fixing all the dangling references to the old name. TEST=Only changing tools Change-Id: I83a5c00be925fdb536014a47dff2b488ed9f478b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/215186 Auto-Submit: Bob Nystrom Commit-Queue: Bob Nystrom Reviewed-by: Ben Konyi --- .../transformer/protobuf_handler/compile_protos.sh | 2 +- pkg/vm_service/tool/generate.dart | 8 ++++---- runtime/observatory/tool/ensure_dartfmt.sh | 8 ++++---- runtime/observatory_2/tool/ensure_dartfmt.sh | 8 ++++---- runtime/tests/concurrency/generate_stress_test.dart | 9 +++++---- runtime/tools/dartfuzz/gen_type_table.dart | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/compile_protos.sh b/pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/compile_protos.sh index 8031891c8b7..d4f63559974 100755 --- a/pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/compile_protos.sh +++ b/pkg/vm/testcases/transformations/type_flow/transformer/protobuf_handler/compile_protos.sh @@ -16,4 +16,4 @@ GENERATED_DIR=$DIR/lib/generated protoc --dart_out=$GENERATED_DIR -I$DIR/protos $DIR/protos/*.proto rm $GENERATED_DIR/*.pbenum.dart $GENERATED_DIR/*.pbjson.dart $GENERATED_DIR/*.pbserver.dart -dartfmt -w $DIR/lib/generated +dart format $DIR/lib/generated diff --git a/pkg/vm_service/tool/generate.dart b/pkg/vm_service/tool/generate.dart index b9ef51f7534..79d74eb5c2c 100644 --- a/pkg/vm_service/tool/generate.dart +++ b/pkg/vm_service/tool/generate.dart @@ -46,9 +46,9 @@ Future _generateDart(String appDirPath, List nodes) async { dart.api.parse(nodes); dart.api.generate(generator); outputFile.writeAsStringSync(generator.toString()); - ProcessResult result = Process.runSync('dartfmt', ['-w', outDirPath]); + ProcessResult result = Process.runSync('dart', ['format', outDirPath]); if (result.exitCode != 0) { - print('dartfmt: ${result.stdout}\n${result.stderr}'); + print('dart format: ${result.stdout}\n${result.stderr}'); throw result.exitCode; } @@ -103,9 +103,9 @@ Future _generateAsserts(String appDirPath, List nodes) async { dart.api.parse(nodes); dart.api.generateAsserts(generator); outputFile.writeAsStringSync(generator.toString()); - ProcessResult result = Process.runSync('dartfmt', ['-w', outDirPath]); + ProcessResult result = Process.runSync('dart', ['format', outDirPath]); if (result.exitCode != 0) { - print('dartfmt: ${result.stdout}\n${result.stderr}'); + print('dart format: ${result.stdout}\n${result.stderr}'); throw result.exitCode; } diff --git a/runtime/observatory/tool/ensure_dartfmt.sh b/runtime/observatory/tool/ensure_dartfmt.sh index 6aa50e98d57..0579debc1c8 100755 --- a/runtime/observatory/tool/ensure_dartfmt.sh +++ b/runtime/observatory/tool/ensure_dartfmt.sh @@ -3,13 +3,13 @@ dart_files=$(find lib web -name "*.dart") [ -z "$dart_files" ] && exit 0 -unformatted=$(dartfmt -n $dart_files) +unformatted=$(dart format -o none $dart_files) [ -z "$unformatted" ] && exit 0 -# Some files are not dartfmt'd. Print message and fail. -echo >&2 "dart files must be formatted with dartfmt. Please run:" +# Some files are not dart formatted. Print message and fail. +echo >&2 "dart files must be formatted with dart format. Please run:" for fn in $unformatted; do - echo >&2 " dartfmt -w $PWD/$fn" + echo >&2 " dart format $PWD/$fn" done exit 1 diff --git a/runtime/observatory_2/tool/ensure_dartfmt.sh b/runtime/observatory_2/tool/ensure_dartfmt.sh index 6aa50e98d57..0579debc1c8 100755 --- a/runtime/observatory_2/tool/ensure_dartfmt.sh +++ b/runtime/observatory_2/tool/ensure_dartfmt.sh @@ -3,13 +3,13 @@ dart_files=$(find lib web -name "*.dart") [ -z "$dart_files" ] && exit 0 -unformatted=$(dartfmt -n $dart_files) +unformatted=$(dart format -o none $dart_files) [ -z "$unformatted" ] && exit 0 -# Some files are not dartfmt'd. Print message and fail. -echo >&2 "dart files must be formatted with dartfmt. Please run:" +# Some files are not dart formatted. Print message and fail. +echo >&2 "dart files must be formatted with dart format. Please run:" for fn in $unformatted; do - echo >&2 " dartfmt -w $PWD/$fn" + echo >&2 " dart format $PWD/$fn" done exit 1 diff --git a/runtime/tests/concurrency/generate_stress_test.dart b/runtime/tests/concurrency/generate_stress_test.dart index 3870ef2f989..a22bc342953 100644 --- a/runtime/tests/concurrency/generate_stress_test.dart +++ b/runtime/tests/concurrency/generate_stress_test.dart @@ -17,7 +17,7 @@ final generatedNnbdTest = final Map testMap = json.decode(File(stressTestListJson).readAsStringSync()); final testFiles = testMap['non-nnbd'].cast(); final testFilesNnbd = testMap['nnbd'].cast(); -final dartfmt = 'tools/sdks/dart-sdk/bin/dartfmt'; +final dart = 'tools/sdks/dart-sdk/bin/dart'; main(List args) async { File(generatedNnbdTest) @@ -188,7 +188,7 @@ main() async { Future format(String generatedSource) async { try { - final result = await Process.start(dartfmt, []); + final result = await Process.start(dart, ['format']); result.stdin.writeln(generatedSource); final results = await Future.wait([ @@ -200,13 +200,14 @@ Future format(String generatedSource) async { final exitCode = results[3] as int; if (exitCode != 0) { - print('Note: Failed to format source code. Dartfmt exited non-0.'); + print('Note: Failed to format source code. Dart format exited non-0.'); return generatedSource; } final stdout = results[1] as String; final stderr = results[2] as String; if (stderr.trim().length != 0) { - print('Note: Failed to format source code. Dartfmt had stderr: $stderr'); + print('Note: Failed to format source code. Dart format had stderr: ' + '$stderr'); return generatedSource; } return stdout; diff --git a/runtime/tools/dartfuzz/gen_type_table.dart b/runtime/tools/dartfuzz/gen_type_table.dart index 0f2599a4662..6bd642e7dfb 100644 --- a/runtime/tools/dartfuzz/gen_type_table.dart +++ b/runtime/tools/dartfuzz/gen_type_table.dart @@ -8,7 +8,7 @@ // dart gen_type_table.dart > dartfuzz_type_table.dart // // Reformat: -// tools/sdks/dart-sdk/bin/dartfmt -w \ +// tools/sdks/dart-sdk/bin/dart format \ // runtime/tools/dartfuzz/dartfuzz_type_table.dart // // Then send out modified dartfuzz_type_table.dart for review together