Merge pull request #110 from Workiva/formatter-updates

CP-1167 Dart formatter updates for dart_dev, dart_style 0.2.1.

Author: jayudey-wf

lib/src/platform_util/platform_util.dart

@@ -22,8 +22,9 @@ PlatformUtil platformUtil = new StandardPlatformUtil();
 
 abstract class PlatformUtil {
   static PlatformUtil retrieve() {
-    if (platformUtil == null) throw new StateError(
-        'dart_dev\'s PlatformUtil instance must not be null.');
+    if (platformUtil == null)
+      throw new StateError(
+          'dart_dev\'s PlatformUtil instance must not be null.');
     return platformUtil;
   }
 

lib/src/task_process.dart

@@ -46,8 +46,8 @@ class TaskProcess {
       _outc.future.then((_) => _stdout.close());
       _errc.future.then((_) => _stderr.close());
       process.exitCode.then(_procExitCode.complete);
-      Future.wait([_outc.future, _errc.future, process.exitCode])
-          .then((_) => _donec.complete());
+      Future.wait([_outc.future, _errc.future, process.exitCode]).then(
+          (_) => _donec.complete());
     });
   }
 

lib/src/tasks/copy_license/api.dart

@@ -26,8 +26,8 @@ CopyLicenseTask copyLicense(
   CopyLicenseTask task = new CopyLicenseTask();
 
   File license = new File(licensePath);
-  if (!license.existsSync()) throw new Exception(
-      'License file "$licensePath" does not exist.');
+  if (!license.existsSync())
+    throw new Exception('License file "$licensePath" does not exist.');
 
   String licenseContents = license.readAsStringSync();
   licenseContents = trimLeadingAndTrailingEmptyLines(licenseContents);

lib/src/tasks/copy_license/cli.dart

@@ -32,8 +32,8 @@ class CopyLicenseCli extends TaskCli {
     List<String> directories = config.copyLicense.directories;
     String licensePath = config.copyLicense.licensePath;
 
-    if (!(new File(licensePath)).existsSync()) return new CliResult.fail(
-        'License file "$licensePath" does not exist.');
+    if (!(new File(licensePath)).existsSync())
+      return new CliResult.fail('License file "$licensePath" does not exist.');
 
     CopyLicenseTask task =
         copyLicense(directories: directories, licensePath: licensePath);

lib/src/tasks/coverage/api.dart

@@ -310,8 +310,8 @@ class CoverageTask extends Task {
   }
 
   File _merge(List<File> collections) {
-    if (collections.isEmpty) throw new ArgumentError(
-        'Cannot merge an empty list of coverages.');
+    if (collections.isEmpty)
+      throw new ArgumentError('Cannot merge an empty list of coverages.');
 
     Map mergedJson = JSON.decode(collections.first.readAsStringSync());
     for (int i = 1; i < collections.length; i++) {

lib/src/tasks/coverage/cli.dart

@@ -52,9 +52,9 @@ class CoverageCli extends TaskCli {
   final String command = 'coverage';
 
   Future<CliResult> run(ArgResults parsedArgs) async {
-    if (!platform_util
-        .hasImmediateDependency('coverage')) return new CliResult.fail(
-        'Package "coverage" must be an immediate dependency in order to run its executables.');
+    if (!platform_util.hasImmediateDependency('coverage'))
+      return new CliResult.fail(
+          'Package "coverage" must be an immediate dependency in order to run its executables.');
 
     bool unit = parsedArgs['unit'];
     bool integration = parsedArgs['integration'];

lib/src/tasks/docs/cli.dart

@@ -32,8 +32,9 @@ class DocsCli extends TaskCli {
   final String command = 'docs';
 
   Future<CliResult> run(ArgResults parsedArgs) async {
-    if (!hasImmediateDependency('dartdoc')) return new CliResult.fail(
-        'Package "dartdoc" must be an immediate dependency in order to run its executables.');
+    if (!hasImmediateDependency('dartdoc'))
+      return new CliResult.fail(
+          'Package "dartdoc" must be an immediate dependency in order to run its executables.');
 
     bool open = TaskCli.valueOf('open', parsedArgs, true);
 

lib/src/tasks/examples/api.dart

@@ -29,8 +29,8 @@ bool hasExamples() {
 
 ExamplesTask serveExamples(
     {String hostname: defaultHostname, int port: defaultPort}) {
-  if (!hasExamples()) throw new Exception(
-      'This project does not have any examples.');
+  if (!hasExamples())
+    throw new Exception('This project does not have any examples.');
 
   var dartiumExecutable = 'dartium';
   var dartiumArgs = ['http://$hostname:$port'];

lib/src/tasks/examples/cli.dart

@@ -43,8 +43,8 @@ class ExamplesCli extends TaskCli {
       port = int.parse(port);
     }
 
-    if (!hasExamples()) return new CliResult.fail(
-        'This project does not have any examples.');
+    if (!hasExamples())
+      return new CliResult.fail('This project does not have any examples.');
 
     ExamplesTask task = serveExamples(hostname: hostname, port: port);
     reporter.logGroup(task.pubServeCommand,

lib/src/tasks/format/cli.dart

@@ -40,9 +40,9 @@ class FormatCli extends TaskCli {
 
   Future<CliResult> run(ArgResults parsedArgs) async {
     try {
-      if (!platform_util
-          .hasImmediateDependency('dart_style')) return new CliResult.fail(
-          'Package "dart_style" must be an immediate dependency in order to run its executables.');
+      if (!platform_util.hasImmediateDependency('dart_style'))
+        return new CliResult.fail(
+            'Package "dart_style" must be an immediate dependency in order to run its executables.');
     } catch (e) {
       // It's possible that this check may throw if the pubspec.yaml
       // could not be found or if the yaml could not be parsed.
@@ -77,18 +77,20 @@ class FormatCli extends TaskCli {
     }
 
     if (task.isDryRun) {
-      if (task.successful) return new CliResult.success(
-          excludedFilesWarning + 'Your Dart code is good to go!');
-      if (task.affectedFiles.isEmpty) return new CliResult.fail(
-          excludedFilesWarning + 'The Dart formatter needs to be run.');
+      if (task.successful)
+        return new CliResult.success(
+            excludedFilesWarning + 'Your Dart code is good to go!');
+      if (task.affectedFiles.isEmpty)
+        return new CliResult.fail(
+            excludedFilesWarning + 'The Dart formatter needs to be run.');
       return new CliResult.fail(excludedFilesWarning +
           'The Dart formatter needs to be run. The following files require changes:\n    ' +
           task.affectedFiles.join('\n    '));
     } else {
       if (!task.successful) return new CliResult.fail('Dart formatter failed.');
-      if (task.affectedFiles.isEmpty) return new CliResult.success(
-          excludedFilesWarning +
-              'Success! All files are already formatted correctly.');
+      if (task.affectedFiles.isEmpty)
+        return new CliResult.success(excludedFilesWarning +
+            'Success! All files are already formatted correctly.');
       return new CliResult.success(excludedFilesWarning +
           'Success! The following files were formatted:\n    ' +
           task.affectedFiles.join('\n    '));