From 8554f6f3cad15a5977443e9bddb4322a45cd5311 Mon Sep 17 00:00:00 2001 From: evanweible-wf Date: Tue, 8 Dec 2015 11:07:11 -0600 Subject: [PATCH] Dart formatter updates. --- lib/src/platform_util/platform_util.dart | 5 +++-- lib/src/task_process.dart | 4 ++-- lib/src/tasks/copy_license/api.dart | 4 ++-- lib/src/tasks/copy_license/cli.dart | 4 ++-- lib/src/tasks/coverage/api.dart | 4 ++-- lib/src/tasks/coverage/cli.dart | 6 +++--- lib/src/tasks/docs/cli.dart | 5 +++-- lib/src/tasks/examples/api.dart | 4 ++-- lib/src/tasks/examples/cli.dart | 4 ++-- lib/src/tasks/format/cli.dart | 22 ++++++++++++---------- lib/src/tasks/test/cli.dart | 6 +++--- test/integration/test_test.dart | 9 +++++---- 12 files changed, 41 insertions(+), 36 deletions(-) diff --git a/lib/src/platform_util/platform_util.dart b/lib/src/platform_util/platform_util.dart index 4bb7ad74..60242582 100644 --- a/lib/src/platform_util/platform_util.dart +++ b/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; } diff --git a/lib/src/task_process.dart b/lib/src/task_process.dart index 4adfd0ff..8c32fe79 100644 --- a/lib/src/task_process.dart +++ b/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()); }); } diff --git a/lib/src/tasks/copy_license/api.dart b/lib/src/tasks/copy_license/api.dart index 7d88a306..f63dd5b7 100644 --- a/lib/src/tasks/copy_license/api.dart +++ b/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); diff --git a/lib/src/tasks/copy_license/cli.dart b/lib/src/tasks/copy_license/cli.dart index bec28455..0058555b 100644 --- a/lib/src/tasks/copy_license/cli.dart +++ b/lib/src/tasks/copy_license/cli.dart @@ -32,8 +32,8 @@ class CopyLicenseCli extends TaskCli { List 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); diff --git a/lib/src/tasks/coverage/api.dart b/lib/src/tasks/coverage/api.dart index 57f9b763..1d8d2b8b 100644 --- a/lib/src/tasks/coverage/api.dart +++ b/lib/src/tasks/coverage/api.dart @@ -310,8 +310,8 @@ class CoverageTask extends Task { } File _merge(List 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++) { diff --git a/lib/src/tasks/coverage/cli.dart b/lib/src/tasks/coverage/cli.dart index 92d8d0a7..6bcf0988 100644 --- a/lib/src/tasks/coverage/cli.dart +++ b/lib/src/tasks/coverage/cli.dart @@ -52,9 +52,9 @@ class CoverageCli extends TaskCli { final String command = 'coverage'; Future 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']; diff --git a/lib/src/tasks/docs/cli.dart b/lib/src/tasks/docs/cli.dart index 8cedfd07..f9dce19e 100644 --- a/lib/src/tasks/docs/cli.dart +++ b/lib/src/tasks/docs/cli.dart @@ -32,8 +32,9 @@ class DocsCli extends TaskCli { final String command = 'docs'; Future 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); diff --git a/lib/src/tasks/examples/api.dart b/lib/src/tasks/examples/api.dart index 63a3363b..14c13409 100644 --- a/lib/src/tasks/examples/api.dart +++ b/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']; diff --git a/lib/src/tasks/examples/cli.dart b/lib/src/tasks/examples/cli.dart index 31d0a31c..6d88dc13 100644 --- a/lib/src/tasks/examples/cli.dart +++ b/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, diff --git a/lib/src/tasks/format/cli.dart b/lib/src/tasks/format/cli.dart index 1460eaa8..a7bd2654 100644 --- a/lib/src/tasks/format/cli.dart +++ b/lib/src/tasks/format/cli.dart @@ -40,9 +40,9 @@ class FormatCli extends TaskCli { Future 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 ')); diff --git a/lib/src/tasks/test/cli.dart b/lib/src/tasks/test/cli.dart index 42e43e94..323923c1 100644 --- a/lib/src/tasks/test/cli.dart +++ b/lib/src/tasks/test/cli.dart @@ -77,9 +77,9 @@ class TestCli extends TaskCli { } Future run(ArgResults parsedArgs) async { - if (!platform_util - .hasImmediateDependency('test')) return new CliResult.fail( - 'Package "test" must be an immediate dependency in order to run its executables.'); + if (!platform_util.hasImmediateDependency('test')) + return new CliResult.fail( + 'Package "test" must be an immediate dependency in order to run its executables.'); List additionalArgs = []; diff --git a/test/integration/test_test.dart b/test/integration/test_test.dart index 418f938b..dbd6fc35 100644 --- a/test/integration/test_test.dart +++ b/test/integration/test_test.dart @@ -32,8 +32,8 @@ Future runTests(String projectPath, List args = ['run', 'dart_dev', 'test']; if (unit != null) args.add(unit ? '--unit' : '--no-unit'); - if (integration != null) args - .add(integration ? '--integration' : '--no-integration'); + if (integration != null) + args.add(integration ? '--integration' : '--no-integration'); int i; if (files != null) { @@ -70,8 +70,9 @@ void main() { test('should run individual unit test', () async { expect( - await runTests(projectWithPassingTests, files: - ['test/fixtures/test/passing/test/passing_unit_test.dart']), + await runTests(projectWithPassingTests, files: [ + 'test/fixtures/test/passing/test/passing_unit_test.dart' + ]), isTrue); });