Format generated files.

pkg/front_end/lib/src/codegen/tools.dart

Index: pkg/front_end/lib/src/codegen/tools.dart
diff --git a/pkg/front_end/lib/src/codegen/tools.dart b/pkg/front_end/lib/src/codegen/tools.dart
index 45d5a23971cdac1597b5b9c3577e21b7de1ce58b..fbc2d45075b079bc3b1e5d12ae87e2952db51f81 100644
--- a/pkg/front_end/lib/src/codegen/tools.dart
+++ b/pkg/front_end/lib/src/codegen/tools.dart
@@ -84,6 +84,7 @@ abstract class GeneratedContent {
    * package.
    */
   static void generateAll(String pkgPath, Iterable<GeneratedContent> targets) {
+    print("Generating...");

[Jacob, 2017/03/21 19:41:07]

did you mean to leave this print in?

[devoncarew, 2017/03/21 22:50:58]

Yup, this (and the other one) are here to let the user know about the generation
progress and output files.

     for (GeneratedContent target in targets) {
       target.generate(pkgPath);
     }
@@ -164,6 +165,7 @@ class GeneratedDirectory extends GeneratedContent {
     Map<String, FileContentsComputer> map = directoryContentsComputer(pkgPath);
     map.forEach((String file, FileContentsComputer fileContentsComputer) {
       File outputFile = new File(posix.join(outputDirectory.path, file));
+      print('  ${outputFile.path}');
       outputFile.writeAsStringSync(fileContentsComputer(pkgPath));
     });
   }
@@ -192,10 +194,15 @@ class GeneratedFile extends GeneratedContent {
 
   GeneratedFile(this.outputPath, this.computeContents);
 
+  bool get isDartFile => outputPath.endsWith('.dart');
+
   @override
   bool check(String pkgPath) {
     File outputFile = output(pkgPath);
     String expectedContents = computeContents(pkgPath);
+    if (isDartFile) {
+      expectedContents = DartFormat.formatText(expectedContents);
+    }
     try {
       String actualContents = outputFile.readAsStringSync();
       // Normalize Windows line endings to Unix line endings so that the
@@ -212,10 +219,38 @@ class GeneratedFile extends GeneratedContent {
 
   @override
   void generate(String pkgPath) {
-    output(pkgPath).writeAsStringSync(computeContents(pkgPath));
+    File outputFile = output(pkgPath);
+    print('  ${outputFile.path}');
+    outputFile.writeAsStringSync(computeContents(pkgPath));
+    if (isDartFile) {
+      DartFormat.formatFile(outputFile);
+    }
   }
 
   @override
   File output(String pkgPath) =>
       new File(join(pkgPath, joinAll(posix.split(outputPath))));
 }
+
+/**
+ * A utility class for invoking dartfmt.
+ */
+class DartFormat {
+  static String get _dartfmtPath {
+    String binName = Platform.isWindows ? 'dartfmt.bat' : 'dartfmt';
+    return join(dirname(Platform.resolvedExecutable), binName);
+  }
+
+  static void formatFile(File file) {
+    ProcessResult result = Process.runSync(_dartfmtPath, ['-w', file.path]);
+    if (result.exitCode != 0) throw result.stderr;
+  }
+
+  static String formatText(String text) {
+    File file = new File(join(Directory.systemTemp.path, 'gen.dart'));
+    file.writeAsStringSync(text);
+    ProcessResult result = Process.runSync(_dartfmtPath, ['-w', file.path]);
+    if (result.exitCode != 0) throw result.stderr;
+    return file.readAsStringSync();
+  }
+}