dart_format

Author: sigurdm

lib/src/entrypoint.dart

@@ -251,7 +251,7 @@ class Entrypoint {
               .where((pubspec) => pubspec.dartSdkWasOverridden)
               .map((pubspec) => pubspec.name)
               .toList()
-            ..sort())
+                ..sort())
           .join(', ');
       if (overriddenPackages.isNotEmpty) {
         log.message(log.yellow(

lib/src/executable.dart

@@ -98,7 +98,8 @@ Future<int> runExecutable(
     // automatically.
     entrypoint.assertUpToDate();
 
-    if (!fileExists(snapshotPath) || entrypoint.packageGraph.isPackageMutable(package)) {
+    if (!fileExists(snapshotPath) ||
+        entrypoint.packageGraph.isPackageMutable(package)) {
       await recompile(executable);
     }
     executablePath = snapshotPath;
@@ -327,7 +328,8 @@ Future<String> getExecutableForCommand(
       return p.relative(path, from: root);
     } else {
       final snapshotPath = entrypoint.pathOfExecutable(executable);
-      if (!fileExists(snapshotPath) || entrypoint.packageGraph.isPackageMutable(package)) {
+      if (!fileExists(snapshotPath) ||
+          entrypoint.packageGraph.isPackageMutable(package)) {
         await warningsOnlyUnlessTerminal(
           () => entrypoint.precompileExecutable(executable),
         );

lib/src/utils.dart

@@ -255,10 +255,7 @@ Set<String> createDirectoryFilter(Iterable<String> dirs) {
   return dirs.expand<String>((dir) {
     var result = ['/$dir/'];
     if (Platform.isWindows) {
-      result
-        ..add('/$dir\\')
-        ..add('\\$dir/')
-        ..add('\\$dir\\');
+      result..add('/$dir\\')..add('\\$dir/')..add('\\$dir\\');
     }
     return result;
   }).toSet();

test/cache/clean_test.dart

@@ -19,9 +19,7 @@ void main() {
   });
 
   test('running pub cache clean --force deletes cache', () async {
-    await servePackages((b) => b
-      ..serve('foo', '1.1.2')
-      ..serve('bar', '1.2.3'));
+    await servePackages((b) => b..serve('foo', '1.1.2')..serve('bar', '1.2.3'));
     await d.appDir({'foo': 'any', 'bar': 'any'}).create();
     await pubGet();
     final cache = path.join(d.sandbox, cachePath);
@@ -34,9 +32,7 @@ void main() {
 
   test('running pub cache clean deletes cache only with confirmation',
       () async {
-    await servePackages((b) => b
-      ..serve('foo', '1.1.2')
-      ..serve('bar', '1.2.3'));
+    await servePackages((b) => b..serve('foo', '1.1.2')..serve('bar', '1.2.3'));
     await d.appDir({'foo': 'any', 'bar': 'any'}).create();
     await pubGet();
     final cache = path.join(d.sandbox, cachePath);

test/directory_option_test.dart

@@ -16,10 +16,8 @@ import 'test_pub.dart';
 
 Future<void> main() async {
   test('commands taking a --directory/-C parameter work', () async {
-    await servePackages((b) => b
-      ..serve('foo', '1.0.0')
-      ..serve('foo', '0.1.2')
-      ..serve('bar', '1.2.3'));
+    await servePackages((b) =>
+        b..serve('foo', '1.0.0')..serve('foo', '0.1.2')..serve('bar', '1.2.3'));
     await credentialsFile(globalPackageServer, 'access token').create();
     globalPackageServer
         .extraHandlers[RegExp('/api/packages/test_pkg/uploaders')] = (request) {

test/embedding/get_executable_for_command_test.dart

@@ -148,11 +148,18 @@ Future<void> main() async {
     ]).create();
     final dir = d.path(appPath);
 
-    await testGetExecutable('myapp', dir, result: p.join('.dart_tool', 'pub', 'bin', 'myapp', 'myapp.dart-$_currentVersion.snapshot'));
+    await testGetExecutable('myapp', dir,
+        result: p.join('.dart_tool', 'pub', 'bin', 'myapp',
+            'myapp.dart-$_currentVersion.snapshot'));
     await testGetExecutable('myapp:myapp', dir,
-        result: p.join('.dart_tool', 'pub', 'bin', 'myapp', 'myapp.dart-$_currentVersion.snapshot'));
-    await testGetExecutable(':myapp', dir, result: p.join('.dart_tool', 'pub', 'bin', 'myapp', 'myapp.dart-$_currentVersion.snapshot'));
-    await testGetExecutable(':tool', dir, result: p.join('.dart_tool', 'pub', 'bin', 'myapp', 'tool.dart-$_currentVersion.snapshot'));
+        result: p.join('.dart_tool', 'pub', 'bin', 'myapp',
+            'myapp.dart-$_currentVersion.snapshot'));
+    await testGetExecutable(':myapp', dir,
+        result: p.join('.dart_tool', 'pub', 'bin', 'myapp',
+            'myapp.dart-$_currentVersion.snapshot'));
+    await testGetExecutable(':tool', dir,
+        result: p.join('.dart_tool', 'pub', 'bin', 'myapp',
+            'tool.dart-$_currentVersion.snapshot'));
     await testGetExecutable('foo', dir,
         allowSnapshot: false,
         result: endsWith('foo-1.0.0${separator}bin${separator}foo.dart'));

test/get/hosted/warn_about_discontinued_test.dart

@@ -22,9 +22,8 @@ void main() {
     await d.appDir({'foo': '1.2.3'}).create();
     await pubGet();
 
-    globalPackageServer.add((builder) => builder
-      ..discontinue('foo')
-      ..discontinue('transitive'));
+    globalPackageServer.add(
+        (builder) => builder..discontinue('foo')..discontinue('transitive'));
     // A pub get straight away will not trigger the warning, as we cache
     // responses for a while.
     await pubGet();

test/test_pub.dart

@@ -436,8 +436,9 @@ final String _pubRoot = (() {
 
   var components = p.split(script);
   var testIndex = components.indexOf('test');
-  if (testIndex == -1) throw StateError("Can't find pub's root.");
-  return p.joinAll(components.take(testIndex));
+  return Directory.current.path;
+  // if (testIndex == -1) throw StateError("Can't find pub's root.");
+  // return p.joinAll(components.take(testIndex));
 })();
 
 /// Starts a Pub process and returns a [PubProcess] that supports interaction
@@ -477,12 +478,13 @@ Future<PubProcess> startPub(
     pubPath = p.absolute(p.join(_pubRoot, 'bin/pub.dart'));
   }
 
-  final dotPackagesPath = (await Isolate.packageConfig).toString();
-
-  var dartArgs = ['--packages=$dotPackagesPath', '--enable-asserts'];
-  dartArgs
-    ..addAll([pubPath, if (verbose) '--verbose'])
-    ..addAll(args);
+  var dartArgs = <String>[
+    'run',
+    '--enable-asserts',
+    pubPath,
+    if (verbose) '--verbose',
+    ...args
+  ];
 
   return await PubProcess.start(dartBin, dartArgs,
       environment: getPubTestEnvironment(tokenEndpoint)