commit d1383452cc0cf973819395e8954933f20fda1d19
author Robert Nystrom <rnystrom@google.com> Fri Oct 01 05:56:55 2021 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Fri Oct 01 05:56:55 2021 +0000
tree d21d7b57119d5ab7c4751857643dd0a222ccd9c1
parent 5fbde4d85036320b51130ab3bfee827728c682dd

Change "dartfmt" to "dart format" in FFI tools.

Change-Id: I9fe047c79ec79728f26184ee2cf69c7776099568
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/215185
Auto-Submit: Bob Nystrom <rnystrom@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
Reviewed-by: Daco Harkes <dacoharkes@google.com>

runtime/tools/ffi/sdk_lib_ffi_generator.dart

diff --git a/runtime/tools/ffi/sdk_lib_ffi_generator.dart b/runtime/tools/ffi/sdk_lib_ffi_generator.dart
index 4b926b5..3b68036 100644
--- a/runtime/tools/ffi/sdk_lib_ffi_generator.dart
+++ b/runtime/tools/ffi/sdk_lib_ffi_generator.dart
@@ -51,7 +51,7 @@
 
   final fullPath = path.resolve(fileName).path;
   File(fullPath).writeAsStringSync(buffer.toString());
-  final fmtResult = Process.runSync(dartfmtPath().path, ["-w", fullPath]);
+  final fmtResult = Process.runSync(dartPath().path, ["format", fullPath]);
   if (fmtResult.exitCode != 0) {
     throw Exception(
         "Formatting failed:\n${fmtResult.stdout}\n${fmtResult.stderr}\n");
@@ -326,10 +326,10 @@
   return parser;
 }
 
-Uri dartfmtPath() {
-  // TODO(dacoharkes): Use "../../../tools/sdks/dart-sdk/bin/dartfmt" when the
+Uri dartPath() {
+  // TODO(dacoharkes): Use "../../../tools/sdks/dart-sdk/bin/dart" when the
   // pinned fully supports extension methods.
-  return Uri.parse("dartfmt");
+  return Uri.parse("dart");
 }
 
 class Config {

tests/ffi/generator/structs_by_value_tests_generator.dart

diff --git a/tests/ffi/generator/structs_by_value_tests_generator.dart b/tests/ffi/generator/structs_by_value_tests_generator.dart
index 03df491..f030b93 100644
--- a/tests/ffi/generator/structs_by_value_tests_generator.dart
+++ b/tests/ffi/generator/structs_by_value_tests_generator.dart
@@ -909,7 +909,7 @@
 
     final path = callTestPath(nnbd);
     File(path).writeAsStringSync(buffer.toString());
-    Process.runSync("dartfmt", ["-w", path]);
+    Process.runSync("dart", ["format", path]);
   }
 }
 
@@ -975,7 +975,7 @@
 
     final path = callbackTestPath(nnbd);
     File(path).writeAsStringSync(buffer.toString());
-    Process.runSync("dartfmt", ["-w", path]);
+    Process.runSync("dart", ["format", path]);
   }
 }