Format generated files.

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

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:io';
 
 import 'package:path/path.dart';
 
 /**
  * Type of functions used to compute the contents of a set of generated files.
@@ skipping 66 matching lines @@
     } else {
       print('All generated files up to date.');
     }
   }
 
   /**
    * Regenerate all of the [targets].  [pkgPath] is the path to the current
    * 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);
     }
   }
 }
 
 /**
  * Class representing a single output directory (either generated code or
  * generated HTML). No other content should exist in the directory.
  */
@@ skipping 60 matching lines @@
       // Error caught while trying to delete the directory, this can happen if
       // it didn't yet exist.
     }
     // re-create the empty directory
     outputDirectory.createSync(recursive: true);
 
     // generate all of the files in the directory
     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));
     });
   }
 
   @override
   Directory output(String pkgPath) =>
       new Directory(join(pkgPath, joinAll(posix.split(outputDirPath))));
 }
 
 /**
  * Class representing a single output file (either generated code or generated
  * HTML).
  */
 class GeneratedFile extends GeneratedContent {
   /**
    * The output file to which generated output should be written, relative to
    * the "tool/spec" directory.  This filename uses the posix path separator
    * ('/') regardless of the OS.
    */
   final String outputPath;
 
   /**
    * Callback function which computes the file.
    */
   final FileContentsComputer computeContents;
 
   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
       // comparison doesn't fail on Windows.
       actualContents = actualContents.replaceAll('\r\n', '\n');
       return expectedContents == actualContents;
     } catch (e) {
       // There was a problem reading the file (most likely because it didn't
       // exist).  Treat that the same as if the file doesn't have the expected
       // contents.
       return false;
     }
   }
 
   @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();
+  }
+}