fix some bad indentations (#41172)

diff --git a/packages/flutter_tools/lib/src/android/android_builder.dart b/packages/flutter_tools/lib/src/android/android_builder.dart
index fdff980..fb99b67 100644
--- a/packages/flutter_tools/lib/src/android/android_builder.dart
+++ b/packages/flutter_tools/lib/src/android/android_builder.dart
@@ -86,7 +86,7 @@
     @required AndroidBuildInfo androidBuildInfo,
     @required String target,
   }) async {
-     if (!project.android.isUsingGradle) {
+    if (!project.android.isUsingGradle) {
       throwToolExit(
           'The build process for Android has changed, and the current project configuration '
               'is no longer valid. Please consult\n\n'
diff --git a/packages/flutter_tools/lib/src/build_runner/build_script.dart b/packages/flutter_tools/lib/src/build_runner/build_script.dart
index 703e670..6adb7a0 100644
--- a/packages/flutter_tools/lib/src/build_runner/build_script.dart
+++ b/packages/flutter_tools/lib/src/build_runner/build_script.dart
@@ -275,7 +275,7 @@
         assetPath, contents, Runtime.builtIn.map((Runtime runtime) => runtime.name).toSet());
 
     if (metadata.testOn.evaluate(SuitePlatform(Runtime.chrome))) {
-    await buildStep.writeAsString(id.addExtension('.browser_test.dart'), '''
+      await buildStep.writeAsString(id.addExtension('.browser_test.dart'), '''
 import 'dart:ui' as ui;
 import 'dart:html';
 import 'dart:js';
diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart
index 5badddd..fd93aef 100644
--- a/packages/flutter_tools/lib/src/dart/pub.dart
+++ b/packages/flutter_tools/lib/src/dart/pub.dart
@@ -284,7 +284,8 @@
   //   ! front_end 0.1.0-alpha.0 from path ../../bin/cache/dart-sdk/lib/front_end
   if (message == 'Warning: You are using these overridden dependencies:') {
     return null;
-  } if (message.contains(_analyzerWarning)) {
+  }
+  if (message.contains(_analyzerWarning)) {
     return null;
   }
   return message;
diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart
index 35e7d54..4aec079 100644
--- a/packages/flutter_tools/lib/src/doctor.dart
+++ b/packages/flutter_tools/lib/src/doctor.dart
@@ -505,7 +505,7 @@
         return terminal.color(leadingBox, TerminalColor.green);
       case ValidationType.notAvailable:
       case ValidationType.partial:
-       return terminal.color(leadingBox, TerminalColor.yellow);
+        return terminal.color(leadingBox, TerminalColor.yellow);
     }
     return null;
   }
diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart
index 7bf1091..11cda6c 100644
--- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart
+++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart
@@ -61,8 +61,7 @@
   Stream<String> syslogs(String id) {
     Process process;
     try {
-      final StreamController<String> controller =
-          StreamController<String>(onCancel: () {
+      final StreamController<String> controller = StreamController<String>(onCancel: () {
         process.kill();
       });
       if (fuchsiaArtifacts.sshConfig == null ||
diff --git a/packages/flutter_tools/lib/src/macos/build_macos.dart b/packages/flutter_tools/lib/src/macos/build_macos.dart
index 678c14c..cd891a6 100644
--- a/packages/flutter_tools/lib/src/macos/build_macos.dart
+++ b/packages/flutter_tools/lib/src/macos/build_macos.dart
@@ -38,7 +38,7 @@
   await processPodsIfNeeded(flutterProject.macos, getMacOSBuildDirectory(), buildInfo.mode);
   // If the xcfilelists do not exist, create empty version.
   if (!flutterProject.macos.inputFileList.existsSync()) {
-     flutterProject.macos.inputFileList.createSync(recursive: true);
+    flutterProject.macos.inputFileList.createSync(recursive: true);
   }
   if (!flutterProject.macos.outputFileList.existsSync()) {
     flutterProject.macos.outputFileList.createSync(recursive: true);
diff --git a/packages/flutter_tools/lib/src/mdns_discovery.dart b/packages/flutter_tools/lib/src/mdns_discovery.dart
index 72aa60a..23c15fe 100644
--- a/packages/flutter_tools/lib/src/mdns_discovery.dart
+++ b/packages/flutter_tools/lib/src/mdns_discovery.dart
@@ -85,7 +85,7 @@
         buffer.writeln('There are multiple observatory ports available.');
         buffer.writeln('Rerun this command with one of the following passed in as the appId:');
         buffer.writeln('');
-         for (final String uniqueDomainName in uniqueDomainNames) {
+        for (final String uniqueDomainName in uniqueDomainNames) {
           buffer.writeln('  flutter attach --app-id ${uniqueDomainName.replaceAll('.$dartObservatoryName', '')}');
         }
         throwToolExit(buffer.toString());
diff --git a/packages/flutter_tools/lib/src/plugins.dart b/packages/flutter_tools/lib/src/plugins.dart
index 38af093..03f7f20 100644
--- a/packages/flutter_tools/lib/src/plugins.dart
+++ b/packages/flutter_tools/lib/src/plugins.dart
@@ -534,17 +534,17 @@
     await _writeMacOSPluginRegistrant(project, plugins);
   }
   for (final XcodeBasedProject subproject in <XcodeBasedProject>[project.ios, project.macos]) {
-  if (!project.isModule && (!checkProjects || subproject.existsSync())) {
-    final CocoaPods cocoaPods = CocoaPods();
-    if (plugins.isNotEmpty) {
-      await cocoaPods.setupPodfile(subproject);
+    if (!project.isModule && (!checkProjects || subproject.existsSync())) {
+      final CocoaPods cocoaPods = CocoaPods();
+      if (plugins.isNotEmpty) {
+        await cocoaPods.setupPodfile(subproject);
+      }
+      /// The user may have a custom maintained Podfile that they're running `pod install`
+      /// on themselves.
+      else if (subproject.podfile.existsSync() && subproject.podfileLock.existsSync()) {
+        cocoaPods.addPodsDependencyToFlutterXcconfig(subproject);
+      }
     }
-    /// The user may have a custom maintained Podfile that they're running `pod install`
-    /// on themselves.
-    else if (subproject.podfile.existsSync() && subproject.podfileLock.existsSync()) {
-      cocoaPods.addPodsDependencyToFlutterXcconfig(subproject);
-    }
-  }
   }
   if (featureFlags.isWebEnabled && project.web.existsSync()) {
     await _writeWebPluginRegistrant(project, plugins);
diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart
index 840d3d7..c43b0e3 100644
--- a/packages/flutter_tools/lib/src/test/flutter_platform.dart
+++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart
@@ -102,7 +102,7 @@
   platformPluginRegistration ??= (FlutterPlatform platform) {
     hack.registerPlatformPlugin(
       <Runtime>[Runtime.vm],
-        () {
+      () {
         return platform;
       },
     );
@@ -417,7 +417,8 @@
         await server.close(force: true);
       });
       final Completer<WebSocket> webSocket = Completer<WebSocket>();
-      server.listen((HttpRequest request) {
+      server.listen(
+        (HttpRequest request) {
           if (!webSocket.isCompleted) {
             webSocket.complete(WebSocketTransformer.upgrade(request));
           }
diff --git a/packages/flutter_tools/lib/src/test/flutter_web_platform.dart b/packages/flutter_tools/lib/src/test/flutter_web_platform.dart
index df3b927..416b7d0 100644
--- a/packages/flutter_tools/lib/src/test/flutter_web_platform.dart
+++ b/packages/flutter_tools/lib/src/test/flutter_web_platform.dart
@@ -282,17 +282,18 @@
 
   @override
   Future<void> close() => _closeMemo.runOnce(() async {
-        final List<Future<dynamic>> futures = _browserManagers.values
-            .map<Future<dynamic>>((Future<BrowserManager> future) async {
-          final BrowserManager result = await future;
-          if (result == null) {
-            return;
-          }
-          await result.close();
-        }).toList();
-        futures.add(_server.close());
-        await Future.wait<void>(futures);
-      });
+    final List<Future<dynamic>> futures = _browserManagers.values
+      .map<Future<dynamic>>((Future<BrowserManager> future) async {
+        final BrowserManager result = await future;
+        if (result == null) {
+          return;
+        }
+        await result.close();
+      })
+      .toList();
+    futures.add(_server.close());
+    await Future.wait<void>(futures);
+  });
 }
 
 class OneOffHandler {
@@ -414,18 +415,19 @@
     // Whenever we get a message, no matter which child channel it's for, we the
     // know browser is still running code which means the user isn't debugging.
     _channel = MultiChannel<dynamic>(
-        webSocket.cast<String>().transform(jsonDocument).changeStream((Stream<Object> stream) {
-      return stream.map((Object message) {
-        if (!_closed) {
-          _timer.reset();
-        }
-        for (RunnerSuiteController controller in _controllers) {
-          controller.setDebugging(false);
-        }
+      webSocket.cast<String>().transform(jsonDocument).changeStream((Stream<Object> stream) {
+        return stream.map((Object message) {
+          if (!_closed) {
+            _timer.reset();
+          }
+          for (RunnerSuiteController controller in _controllers) {
+            controller.setDebugging(false);
+          }
 
-        return message;
-      });
-    }));
+          return message;
+        });
+      }),
+    );
 
     _environment = _loadBrowserEnvironment();
     _channel.stream.listen(_onMessage, onDone: close);
@@ -579,10 +581,11 @@
     final VirtualChannel<dynamic> virtualChannel = _channel.virtualChannel();
     final int suiteChannelID = virtualChannel.id;
     final StreamChannel<dynamic> suiteChannel = virtualChannel.transformStream(
-        StreamTransformer<dynamic, dynamic>.fromHandlers(handleDone: (EventSink<dynamic> sink) {
-      closeIframe();
-      sink.close();
-    }));
+      StreamTransformer<dynamic, dynamic>.fromHandlers(handleDone: (EventSink<dynamic> sink) {
+        closeIframe();
+        sink.close();
+      }),
+    );
 
     return await _pool.withResource<RunnerSuite>(() async {
       _channel.sink.add(<String, Object>{
diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
index 7a73194..210f96e 100644
--- a/packages/flutter_tools/lib/src/version.dart
+++ b/packages/flutter_tools/lib/src/version.dart
@@ -66,7 +66,7 @@
         final String remote = channel.substring(0, slash);
         _repositoryUrl = _runGit('git ls-remote --get-url $remote');
         _channel = channel.substring(slash + 1);
-       } else if (channel.isEmpty) {
+      } else if (channel.isEmpty) {
         _channel = 'unknown';
       } else {
         _channel = channel;
diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart
index a5af8de..e43d532 100644
--- a/packages/flutter_tools/lib/src/vmservice.dart
+++ b/packages/flutter_tools/lib/src/vmservice.dart
@@ -467,13 +467,13 @@
     switch (type) {
       case 'Event':
         serviceObject = ServiceEvent._empty(owner);
-      break;
+        break;
       case 'FlutterView':
         serviceObject = FlutterView._empty(owner.vm);
-      break;
+        break;
       case 'Isolate':
         serviceObject = Isolate._empty(owner.vm);
-      break;
+        break;
     }
     // If we don't have a model object for this service object type, as a
     // fallback return a ServiceMap object.
@@ -811,7 +811,7 @@
     final String mapId = map['id'];
 
     switch (type) {
-      case 'Isolate': {
+      case 'Isolate':
         // Check cache.
         Isolate isolate = _isolateCache[mapId];
         if (isolate == null) {
@@ -829,9 +829,7 @@
           isolate.updateFromMap(map);
         }
         return isolate;
-      }
-      break;
-      case 'FlutterView': {
+      case 'FlutterView':
         FlutterView view = _viewCache[mapId];
         if (view == null) {
           // Add new view to the cache.
@@ -841,8 +839,6 @@
           view.updateFromMap(map);
         }
         return view;
-      }
-      break;
       default:
         throw VMServiceObjectLoadError(
             'VM.getFromMap called for something other than an isolate', map);
diff --git a/packages/flutter_tools/test/general.shard/android/android_device_test.dart b/packages/flutter_tools/test/general.shard/android/android_device_test.dart
index afe5533..73e64bb 100644
--- a/packages/flutter_tools/test/general.shard/android/android_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/android/android_device_test.dart
@@ -138,9 +138,11 @@
       hardware = 'goldfish';
       buildCharacteristics = 'unused';
       exitCode = -1;
-      when(mockProcessManager.run(argThat(contains('getprop')),
-          stderrEncoding: anyNamed('stderrEncoding'),
-          stdoutEncoding: anyNamed('stdoutEncoding'))).thenAnswer((_) {
+      when(mockProcessManager.run(
+        argThat(contains('getprop')),
+        stderrEncoding: anyNamed('stderrEncoding'),
+        stdoutEncoding: anyNamed('stdoutEncoding'),
+      )).thenAnswer((_) {
         final StringBuffer buf = StringBuffer()
           ..writeln('[ro.hardware]: [$hardware]')..writeln(
               '[ro.build.characteristics]: [$buildCharacteristics]');
@@ -215,9 +217,11 @@
     setUp(() {
       hardware = 'unknown';
       buildCharacteristics = 'unused';
-      when(mockProcessManager.run(argThat(contains('getprop')),
-          stderrEncoding: anyNamed('stderrEncoding'),
-          stdoutEncoding: anyNamed('stdoutEncoding'))).thenAnswer((_) {
+      when(mockProcessManager.run(
+        argThat(contains('getprop')),
+        stderrEncoding: anyNamed('stderrEncoding'),
+        stdoutEncoding: anyNamed('stdoutEncoding'),
+      )).thenAnswer((_) {
         final StringBuffer buf = StringBuffer()
           ..writeln('[ro.hardware]: [$hardware]')
           ..writeln('[ro.build.characteristics]: [$buildCharacteristics]');
@@ -312,9 +316,11 @@
     setUp(() {
       hardware = 'goldfish'; // Known emulator
       socketWasCreated = false;
-      when(mockProcessManager.run(argThat(contains('getprop')),
-          stderrEncoding: anyNamed('stderrEncoding'),
-          stdoutEncoding: anyNamed('stdoutEncoding'))).thenAnswer((_) {
+      when(mockProcessManager.run(
+        argThat(contains('getprop')),
+        stderrEncoding: anyNamed('stderrEncoding'),
+        stdoutEncoding: anyNamed('stdoutEncoding'),
+      )).thenAnswer((_) {
         final StringBuffer buf = StringBuffer()
           ..writeln('[ro.hardware]: [$hardware]');
         final ProcessResult result = ProcessResult(1, 0, buf.toString(), '');
diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
index 4c48cda..f6adfe7 100644
--- a/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
+++ b/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
@@ -483,8 +483,7 @@
   });
 
   group('AssetBundle assets from scanned paths', () {
-    testUsingContext(
-        'Two assets are bundled when scanning their directory', () async {
+    testUsingContext('Two assets are bundled when scanning their directory', () async {
       establishFlutterRoot();
       writeEmptySchemaFile(fs);
 
@@ -514,8 +513,7 @@
       FileSystem: () => testFileSystem,
     });
 
-    testUsingContext(
-        'Two assets are bundled when listing one and scanning second directory', () async {
+    testUsingContext('Two assets are bundled when listing one and scanning second directory', () async {
       establishFlutterRoot();
       writeEmptySchemaFile(fs);
 
@@ -545,8 +543,7 @@
       FileSystem: () => testFileSystem,
     });
 
-    testUsingContext(
-        'One asset is bundled with variant, scanning wrong directory', () async {
+    testUsingContext('One asset is bundled with variant, scanning wrong directory', () async {
       establishFlutterRoot();
       writeEmptySchemaFile(fs);
 
@@ -573,8 +570,7 @@
   });
 
   group('AssetBundle assets from scanned paths with MemoryFileSystem', () {
-    testUsingContext(
-        'One asset is bundled with variant, scanning directory', () async {
+    testUsingContext('One asset is bundled with variant, scanning directory', () async {
       establishFlutterRoot();
       writeEmptySchemaFile(fs);
 
@@ -603,8 +599,7 @@
       FileSystem: () => testFileSystem,
     });
 
-    testUsingContext(
-        'No asset is bundled with variant, no assets or directories are listed', () async {
+    testUsingContext('No asset is bundled with variant, no assets or directories are listed', () async {
       establishFlutterRoot();
       writeEmptySchemaFile(fs);
 
@@ -632,8 +627,7 @@
       FileSystem: () => testFileSystem,
     });
 
-    testUsingContext(
-        'Expect error generating manifest, wrong non-existing directory is listed', () async {
+    testUsingContext('Expect error generating manifest, wrong non-existing directory is listed', () async {
       establishFlutterRoot();
       writeEmptySchemaFile(fs);
 
diff --git a/packages/flutter_tools/test/general.shard/base/async_guard_test.dart b/packages/flutter_tools/test/general.shard/base/async_guard_test.dart
index 4c6d36a..b21e307 100644
--- a/packages/flutter_tools/test/general.shard/base/async_guard_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/async_guard_test.dart
@@ -29,10 +29,10 @@
 
 Future<void> delayedThrow(FakeAsync time) {
   final Future<void> result =
-      Future<void>.delayed(const Duration(milliseconds: 10))
+    Future<void>.delayed(const Duration(milliseconds: 10))
       .then((_) {
-    throw 'Delayed Doom';
-  });
+        throw 'Delayed Doom';
+      });
   time.elapse(const Duration(seconds: 1));
   time.flushMicrotasks();
   return result;
@@ -154,9 +154,9 @@
     await FakeAsync().run((FakeAsync time) {
       unawaited(runZoned(() async {
         final Future<void> f = asyncGuard<void>(() => delayedThrow(time))
-            .catchError((Object e, StackTrace s) {
-          caughtByCatchError = true;
-        });
+          .catchError((Object e, StackTrace s) {
+            caughtByCatchError = true;
+          });
         try {
           await f;
         } on String {
@@ -189,10 +189,12 @@
     final Completer<void> completer = Completer<void>();
     await FakeAsync().run((FakeAsync time) {
       unawaited(runZoned(() async {
-        final Future<void> f = asyncGuard<void>(() => delayedThrow(time),
-            onError: (Object e, StackTrace s) {
-          caughtByOnError = true;
-        });
+        final Future<void> f = asyncGuard<void>(
+          () => delayedThrow(time),
+          onError: (Object e, StackTrace s) {
+            caughtByOnError = true;
+          },
+        );
         try {
           await f;
         } catch (e) {
diff --git a/packages/flutter_tools/test/general.shard/base/terminal_test.dart b/packages/flutter_tools/test/general.shard/base/terminal_test.dart
index e5c3878..6a5c135 100644
--- a/packages/flutter_tools/test/general.shard/base/terminal_test.dart
+++ b/packages/flutter_tools/test/general.shard/base/terminal_test.dart
@@ -151,7 +151,7 @@
     });
 
     testUsingContext('default character choice without displayAcceptedCharacters', () async {
-       terminalUnderTest.usesTerminalUi = true;
+      terminalUnderTest.usesTerminalUi = true;
       mockStdInStream = Stream<String>.fromFutures(<Future<String>>[
         Future<String>.value('\n'), // Not in accepted list
       ]).asBroadcastStream();
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
index 2bb80f21..8f39b9a 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
@@ -60,13 +60,13 @@
       } else if (platform.isLinux) {
         hostPlatform = HostPlatform.linux_x64;
       } else if (platform.isMacOS) {
-          hostPlatform = HostPlatform.darwin_x64;
+        hostPlatform = HostPlatform.darwin_x64;
       } else {
         assert(false);
       }
-        final String skyEngineLine = platform.isWindows
-          ? r'sky_engine:file:///C:/bin/cache/pkg/sky_engine/lib/'
-          : 'sky_engine:file:///bin/cache/pkg/sky_engine/lib/';
+      final String skyEngineLine = platform.isWindows
+        ? r'sky_engine:file:///C:/bin/cache/pkg/sky_engine/lib/'
+        : 'sky_engine:file:///bin/cache/pkg/sky_engine/lib/';
       fs.file('.packages')
         ..createSync()
         ..writeAsStringSync('''
@@ -368,9 +368,10 @@
     String fileSystemScheme,
     bool targetProductVm = false,
     String platformDill,
-    String initializeFromDill}) async {
-      fs.file(outputFilePath).createSync(recursive: true);
-      return CompilerOutput(outputFilePath, 0, null);
+    String initializeFromDill,
+  }) async {
+    fs.file(outputFilePath).createSync(recursive: true);
+    return CompilerOutput(outputFilePath, 0, null);
   }
 }
 
diff --git a/packages/flutter_tools/test/general.shard/commands/assemble_test.dart b/packages/flutter_tools/test/general.shard/commands/assemble_test.dart
index dc247d3..0e013aa 100644
--- a/packages/flutter_tools/test/general.shard/commands/assemble_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/assemble_test.dart
@@ -32,9 +32,9 @@
 
   test('Can run a build', () => testbed.run(() async {
     when(mockBuildSystem.build(any, any, buildSystemConfig: anyNamed('buildSystemConfig')))
-        .thenAnswer((Invocation invocation) async {
-      return BuildResult(success: true);
-    });
+      .thenAnswer((Invocation invocation) async {
+        return BuildResult(success: true);
+      });
     final CommandRunner<void> commandRunner = createTestCommandRunner(AssembleCommand());
     await commandRunner.run(<String>['assemble', '-o Output', 'debug_macos_bundle_flutter_assets']);
     final BufferLogger bufferLogger = logger;
@@ -44,9 +44,9 @@
 
   test('Throws ToolExit if not provided with output', () => testbed.run(() async {
     when(mockBuildSystem.build(any, any, buildSystemConfig: anyNamed('buildSystemConfig')))
-        .thenAnswer((Invocation invocation) async {
-      return BuildResult(success: true);
-    });
+      .thenAnswer((Invocation invocation) async {
+        return BuildResult(success: true);
+      });
     final CommandRunner<void> commandRunner = createTestCommandRunner(AssembleCommand());
 
     expect(commandRunner.run(<String>['assemble', 'debug_macos_bundle_flutter_assets']), throwsA(isInstanceOf<ToolExit>()));
@@ -54,9 +54,9 @@
 
   test('Throws ToolExit if called with non-existent rule', () => testbed.run(() async {
     when(mockBuildSystem.build(any, any, buildSystemConfig: anyNamed('buildSystemConfig')))
-        .thenAnswer((Invocation invocation) async {
-      return BuildResult(success: true);
-    });
+      .thenAnswer((Invocation invocation) async {
+        return BuildResult(success: true);
+      });
     final CommandRunner<void> commandRunner = createTestCommandRunner(AssembleCommand());
 
     expect(commandRunner.run(<String>['assemble', '-o Output', 'undefined']), throwsA(isInstanceOf<ToolExit>()));
@@ -64,13 +64,13 @@
 
   test('Only writes input and output files when the values change', () => testbed.run(() async {
     when(mockBuildSystem.build(any, any, buildSystemConfig: anyNamed('buildSystemConfig')))
-        .thenAnswer((Invocation invocation) async {
-      return BuildResult(
-        success: true,
-        inputFiles: <File>[fs.file('foo')..createSync()],
-        outputFiles: <File>[fs.file('bar')..createSync()],
-      );
-    });
+      .thenAnswer((Invocation invocation) async {
+        return BuildResult(
+          success: true,
+          inputFiles: <File>[fs.file('foo')..createSync()],
+          outputFiles: <File>[fs.file('bar')..createSync()],
+        );
+      });
 
     final CommandRunner<void> commandRunner = createTestCommandRunner(AssembleCommand());
     await commandRunner.run(<String>['assemble', '-o Output', '--build-outputs=outputs', '--build-inputs=inputs', 'debug_macos_bundle_flutter_assets']);
@@ -90,12 +90,12 @@
 
 
     when(mockBuildSystem.build(any, any, buildSystemConfig: anyNamed('buildSystemConfig')))
-        .thenAnswer((Invocation invocation) async {
-      return BuildResult(
-        success: true,
-        inputFiles: <File>[fs.file('foo'), fs.file('fizz')..createSync()],
-        outputFiles: <File>[fs.file('bar'), fs.file(fs.path.join('.dart_tool', 'fizz2'))..createSync(recursive: true)]);
-    });
+      .thenAnswer((Invocation invocation) async {
+        return BuildResult(
+          success: true,
+          inputFiles: <File>[fs.file('foo'), fs.file('fizz')..createSync()],
+          outputFiles: <File>[fs.file('bar'), fs.file(fs.path.join('.dart_tool', 'fizz2'))..createSync(recursive: true)]);
+      });
     await commandRunner.run(<String>['assemble', '-o Output', '--build-outputs=outputs', '--build-inputs=inputs', 'debug_macos_bundle_flutter_assets']);
 
     expect(inputs.readAsStringSync(), contains('foo'));
diff --git a/packages/flutter_tools/test/general.shard/commands/build_fuchsia_test.dart b/packages/flutter_tools/test/general.shard/commands/build_fuchsia_test.dart
index 3734d04..2e8a8c0 100644
--- a/packages/flutter_tools/test/general.shard/commands/build_fuchsia_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_fuchsia_test.dart
@@ -47,8 +47,7 @@
   });
 
   group('Fuchsia build fails gracefully when', () {
-    testUsingContext('there is no Fuchsia project',
-        () async {
+    testUsingContext('there is no Fuchsia project', () async {
       final BuildCommand command = BuildCommand();
       applyMocksToCommand(command);
       expect(
diff --git a/packages/flutter_tools/test/general.shard/commands/build_macos_test.dart b/packages/flutter_tools/test/general.shard/commands/build_macos_test.dart
index 00535ff..7865826 100644
--- a/packages/flutter_tools/test/general.shard/commands/build_macos_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/build_macos_test.dart
@@ -52,7 +52,7 @@
     macosPlatform = MockPlatform();
     notMacosPlatform = MockPlatform();
     when(mockProcess.exitCode).thenAnswer((Invocation invocation) async {
-    return 0;
+      return 0;
     });
     when(mockProcess.stderr).thenAnswer((Invocation invocation) {
       return const Stream<List<int>>.empty();
diff --git a/packages/flutter_tools/test/general.shard/commands/doctor_test.dart b/packages/flutter_tools/test/general.shard/commands/doctor_test.dart
index 12db20e..03014da 100644
--- a/packages/flutter_tools/test/general.shard/commands/doctor_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/doctor_test.dart
@@ -733,10 +733,10 @@
   @override
   Future<ValidationResult> validate() {
     const Duration delay = Duration(seconds: 1);
-    final Future<ValidationResult> result = Future<ValidationResult>
-        .delayed(delay).then((_) {
-      throw 'fatal error';
-    });
+    final Future<ValidationResult> result = Future<ValidationResult>.delayed(delay)
+      .then((_) {
+        throw 'fatal error';
+      });
     _time.elapse(const Duration(seconds: 1));
     _time.flushMicrotasks();
     return result;
diff --git a/packages/flutter_tools/test/general.shard/commands/test_test.dart b/packages/flutter_tools/test/general.shard/commands/test_test.dart
index e62dd83..4e96989 100644
--- a/packages/flutter_tools/test/general.shard/commands/test_test.dart
+++ b/packages/flutter_tools/test/general.shard/commands/test_test.dart
@@ -230,7 +230,7 @@
     }
   } else {
     // Test just a specific test file.
-     testPath = fs.path.join(testDirectory, '${testName}_test.dart');
+    testPath = fs.path.join(testDirectory, '${testName}_test.dart');
     final File testFile = fs.file(testPath);
     if (!testFile.existsSync()) {
       fail('missing test file: $testFile');
diff --git a/packages/flutter_tools/test/general.shard/crash_reporting_test.dart b/packages/flutter_tools/test/general.shard/crash_reporting_test.dart
index 75f014e..70301da 100644
--- a/packages/flutter_tools/test/general.shard/crash_reporting_test.dart
+++ b/packages/flutter_tools/test/general.shard/crash_reporting_test.dart
@@ -274,17 +274,17 @@
 
 class MockCrashReportSender extends MockClient {
   MockCrashReportSender(RequestInfo crashInfo) : super((Request request) async {
-      MockCrashReportSender.sendCalls++;
-      crashInfo.method = request.method;
-      crashInfo.uri = request.url;
+    MockCrashReportSender.sendCalls++;
+    crashInfo.method = request.method;
+    crashInfo.uri = request.url;
 
-      // A very ad-hoc multipart request parser. Good enough for this test.
-      String boundary = request.headers['Content-Type'];
-      boundary = boundary.substring(boundary.indexOf('boundary=') + 9);
-      crashInfo.fields = Map<String, String>.fromIterable(
-        utf8.decode(request.bodyBytes)
-            .split('--$boundary')
-            .map<List<String>>((String part) {
+    // A very ad-hoc multipart request parser. Good enough for this test.
+    String boundary = request.headers['Content-Type'];
+    boundary = boundary.substring(boundary.indexOf('boundary=') + 9);
+    crashInfo.fields = Map<String, String>.fromIterable(
+      utf8.decode(request.bodyBytes)
+        .split('--$boundary')
+        .map<List<String>>((String part) {
           final Match nameMatch = RegExp(r'name="(.*)"').firstMatch(part);
           if (nameMatch == null) {
             return null;
@@ -293,29 +293,28 @@
           final String value = part.split('\n').skip(2).join('\n').trim();
           return <String>[name, value];
         })
-            .where((List<String> pair) => pair != null),
-        key: (dynamic key) {
-          final List<String> pair = key;
-          return pair[0];
-        },
-        value: (dynamic value) {
-          final List<String> pair = value;
-          return pair[1];
-        },
-      );
+        .where((List<String> pair) => pair != null),
+      key: (dynamic key) {
+        final List<String> pair = key;
+        return pair[0];
+      },
+      value: (dynamic value) {
+        final List<String> pair = value;
+        return pair[1];
+      },
+    );
 
-      return Response(
-        'test-report-id',
-        200,
-      );
-    });
+    return Response(
+      'test-report-id',
+      200,
+    );
+  });
 
   static int sendCalls = 0;
 }
 
 class CrashingCrashReportSender extends MockClient {
-  CrashingCrashReportSender(Object exception)
-      : super((Request request) async {
+  CrashingCrashReportSender(Object exception) : super((Request request) async {
     throw exception;
   });
 }
diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
index a3a0369..6ed5d09 100644
--- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
+++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
@@ -368,8 +368,7 @@
       return discoveryProtocol.uri;
     }
 
-    testUsingContext('can find flutter view with matching isolate name',
-        () async {
+    testUsingContext('can find flutter view with matching isolate name', () async {
       const String expectedIsolateName = 'foobar';
       final Uri uri = await findUri(<MockFlutterView>[
         MockFlutterView(null), // no ui isolate.
@@ -380,8 +379,7 @@
           uri.toString(), 'http://${InternetAddress.loopbackIPv4.address}:0/');
     });
 
-    testUsingContext('can handle flutter view without matching isolate name',
-        () async {
+    testUsingContext('can handle flutter view without matching isolate name', () async {
       const String expectedIsolateName = 'foobar';
       final Future<Uri> uri = findUri(<MockFlutterView>[
         MockFlutterView(null), // no ui isolate.
diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart
index caf1dc7..777c49b 100644
--- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart
+++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_workflow_test.dart
@@ -19,31 +19,23 @@
     when(devFinder.absolute).thenReturn(devFinder);
     when(sshConfig.absolute).thenReturn(sshConfig);
 
-    testUsingContext(
-        'can not list and launch devices if there is not ssh config and dev finder',
-        () {
+    testUsingContext('can not list and launch devices if there is not ssh config and dev finder', () {
       expect(fuchsiaWorkflow.canLaunchDevices, false);
       expect(fuchsiaWorkflow.canListDevices, false);
       expect(fuchsiaWorkflow.canListEmulators, false);
     }, overrides: <Type, Generator>{
-      FuchsiaArtifacts: () =>
-          FuchsiaArtifacts(devFinder: null, sshConfig: null),
+      FuchsiaArtifacts: () => FuchsiaArtifacts(devFinder: null, sshConfig: null),
     });
 
-    testUsingContext(
-        'can not list and launch devices if there is not ssh config and dev finder',
-        () {
+    testUsingContext('can not list and launch devices if there is not ssh config and dev finder', () {
       expect(fuchsiaWorkflow.canLaunchDevices, false);
       expect(fuchsiaWorkflow.canListDevices, true);
       expect(fuchsiaWorkflow.canListEmulators, false);
     }, overrides: <Type, Generator>{
-      FuchsiaArtifacts: () =>
-          FuchsiaArtifacts(devFinder: devFinder, sshConfig: null),
+      FuchsiaArtifacts: () => FuchsiaArtifacts(devFinder: devFinder, sshConfig: null),
     });
 
-    testUsingContext(
-        'can list and launch devices supported with sufficient SDK artifacts',
-        () {
+    testUsingContext('can list and launch devices supported with sufficient SDK artifacts', () {
       expect(fuchsiaWorkflow.canLaunchDevices, true);
       expect(fuchsiaWorkflow.canListDevices, true);
       expect(fuchsiaWorkflow.canListEmulators, false);
diff --git a/packages/flutter_tools/test/general.shard/ios/simulators_test.dart b/packages/flutter_tools/test/general.shard/ios/simulators_test.dart
index dd3f9c8..9093645 100644
--- a/packages/flutter_tools/test/general.shard/ios/simulators_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/simulators_test.dart
@@ -454,23 +454,21 @@
     });
 
     testUsingContext("startApp uses compiled app's Info.plist to find CFBundleIdentifier", () async {
-        final IOSSimulator device = IOSSimulator('x', name: 'iPhone SE', simulatorCategory: 'iOS 11.2');
-        when(PlistParser.instance.getValueFromFile(any, any)).thenReturn('correct');
+      final IOSSimulator device = IOSSimulator('x', name: 'iPhone SE', simulatorCategory: 'iOS 11.2');
+      when(PlistParser.instance.getValueFromFile(any, any)).thenReturn('correct');
 
-        final Directory mockDir = fs.currentDirectory;
-        final IOSApp package = PrebuiltIOSApp(projectBundleId: 'incorrect', bundleName: 'name', bundleDir: mockDir);
+      final Directory mockDir = fs.currentDirectory;
+      final IOSApp package = PrebuiltIOSApp(projectBundleId: 'incorrect', bundleName: 'name', bundleDir: mockDir);
 
-        const BuildInfo mockInfo = BuildInfo(BuildMode.debug, 'flavor');
-        final DebuggingOptions mockOptions = DebuggingOptions.disabled(mockInfo);
-        await device.startApp(package, prebuiltApplication: true, debuggingOptions: mockOptions);
+      const BuildInfo mockInfo = BuildInfo(BuildMode.debug, 'flavor');
+      final DebuggingOptions mockOptions = DebuggingOptions.disabled(mockInfo);
+      await device.startApp(package, prebuiltApplication: true, debuggingOptions: mockOptions);
 
-        verify(simControl.launch(any, 'correct', any));
-      },
-      overrides: <Type, Generator>{
-        SimControl: () => simControl,
-        PlistParser: () => MockPlistUtils(),
-      },
-    );
+      verify(simControl.launch(any, 'correct', any));
+    }, overrides: <Type, Generator>{
+      SimControl: () => simControl,
+      PlistParser: () => MockPlistUtils(),
+    });
   });
 
   testUsingContext('IOSDevice.isSupportedForProject is true on module project', () async {
diff --git a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
index 0f739e5..c238ab0 100644
--- a/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
+++ b/packages/flutter_tools/test/general.shard/ios/xcodeproj_test.dart
@@ -196,9 +196,11 @@
 
     testUsingOsxContext('getInfo returns something when xcodebuild -list succeeds', () async {
       const String workingDirectory = '/';
-      when(mockProcessManager.run(<String>[xcodebuild, '-list'],
-          environment: anyNamed('environment'),
-          workingDirectory: workingDirectory)).thenAnswer((_) {
+      when(mockProcessManager.run(
+        <String>[xcodebuild, '-list'],
+        environment: anyNamed('environment'),
+        workingDirectory: workingDirectory),
+      ).thenAnswer((_) {
         return Future<ProcessResult>.value(ProcessResult(1, 0, '', ''));
       });
       final XcodeProjectInterpreter xcodeProjectInterpreter = XcodeProjectInterpreter();
@@ -208,9 +210,11 @@
     testUsingOsxContext('getInfo throws a tool exit when it is unable to find a project', () async {
       const String workingDirectory = '/';
       const String stderr = 'Useful Xcode failure message about missing project.';
-      when(mockProcessManager.run(<String>[xcodebuild, '-list'],
-          environment: anyNamed('environment'),
-          workingDirectory: workingDirectory)).thenAnswer((_) {
+      when(mockProcessManager.run(
+        <String>[xcodebuild, '-list'],
+        environment: anyNamed('environment'),
+        workingDirectory: workingDirectory),
+      ).thenAnswer((_) {
         return Future<ProcessResult>.value(ProcessResult(1, 66, '', stderr));
       });
       final XcodeProjectInterpreter xcodeProjectInterpreter = XcodeProjectInterpreter();
diff --git a/packages/flutter_tools/test/general.shard/project_test.dart b/packages/flutter_tools/test/general.shard/project_test.dart
index c14e9f5..82d3212 100644
--- a/packages/flutter_tools/test/general.shard/project_test.dart
+++ b/packages/flutter_tools/test/general.shard/project_test.dart
@@ -272,7 +272,7 @@
         });
         addAndroidGradleFile(project.directory,
           gradleFileContent: () {
-      return '''
+            return '''
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 ''';
diff --git a/packages/flutter_tools/test/general.shard/resident_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_runner_test.dart
index 06af27f..65aafe1 100644
--- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart
+++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart
@@ -348,10 +348,10 @@
   test('ResidentRunner can take screenshot on debug device', () => testbed.run(() async {
     when(mockDevice.supportsScreenshot).thenReturn(true);
     when(mockDevice.takeScreenshot(any))
-        .thenAnswer((Invocation invocation) async {
-      final File file = invocation.positionalArguments.first;
-      file.writeAsBytesSync(List<int>.generate(1024, (int i) => i));
-    });
+      .thenAnswer((Invocation invocation) async {
+        final File file = invocation.positionalArguments.first;
+        file.writeAsBytesSync(List<int>.generate(1024, (int i) => i));
+      });
     final BufferLogger bufferLogger = context.get<Logger>();
 
     await residentRunner.screenshot(mockFlutterDevice);
@@ -410,10 +410,10 @@
     );
     when(mockDevice.supportsScreenshot).thenReturn(true);
     when(mockDevice.takeScreenshot(any))
-        .thenAnswer((Invocation invocation) async {
-      final File file = invocation.positionalArguments.first;
-      file.writeAsBytesSync(List<int>.generate(1024, (int i) => i));
-    });
+      .thenAnswer((Invocation invocation) async {
+        final File file = invocation.positionalArguments.first;
+        file.writeAsBytesSync(List<int>.generate(1024, (int i) => i));
+      });
     final BufferLogger bufferLogger = context.get<Logger>();
 
     await residentRunner.screenshot(mockFlutterDevice);
diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart
index 561d755..e6291de 100644
--- a/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart
+++ b/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart
@@ -52,7 +52,7 @@
     });
   });
 
-   void _setupMocks() {
+  void _setupMocks() {
     fs.file('pubspec.yaml').createSync();
     fs.file(fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     fs.file(fs.path.join('web', 'index.html')).createSync(recursive: true);
@@ -73,7 +73,7 @@
   test('Can full restart after attaching', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -88,7 +88,7 @@
   test('Fails on compilation errors in hot restart', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
index a095ec9..c70f48a 100644
--- a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
+++ b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
@@ -61,7 +61,7 @@
     });
   });
 
-   void _setupMocks() {
+  void _setupMocks() {
     fs.file('pubspec.yaml').createSync();
     fs.file(fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     fs.file(fs.path.join('web', 'index.html')).createSync(recursive: true);
@@ -138,9 +138,9 @@
   }));
 
   test('Can hot reload after attaching', () => testbed.run(() async {
-  _setupMocks();
+    _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -167,7 +167,7 @@
   test('Can hot restart after attaching', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -194,7 +194,7 @@
   test('Fails on compilation errors in hot restart', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -210,7 +210,7 @@
   test('Fails on vmservice response error', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -253,7 +253,7 @@
   test('debugDumpApp', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -265,7 +265,7 @@
   test('debugDumpLayerTree', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -277,7 +277,7 @@
   test('debugDumpRenderTree', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -289,7 +289,7 @@
   test('debugDumpSemanticsTreeInTraversalOrder', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -301,7 +301,7 @@
   test('debugDumpSemanticsTreeInInverseHitTestOrder', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -313,7 +313,7 @@
   test('debugToggleDebugPaintSizeEnabled', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -331,7 +331,7 @@
   test('debugTogglePerformanceOverlayOverride', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -349,7 +349,7 @@
   test('debugToggleWidgetInspector', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -367,7 +367,7 @@
   test('debugToggleProfileWidgetBuilds', () => testbed.run(() async {
     _setupMocks();
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -392,7 +392,7 @@
       debugClosed = true;
     });
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
@@ -405,7 +405,7 @@
     _setupMocks();
     when(mockWebDevice.name).thenReturn('Chromez');
     final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
-     unawaited(residentWebRunner.run(
+    unawaited(residentWebRunner.run(
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
diff --git a/packages/flutter_tools/test/general.shard/runner/runner_test.dart b/packages/flutter_tools/test/general.shard/runner/runner_test.dart
index 1a9bd01..c903d57 100644
--- a/packages/flutter_tools/test/general.shard/runner/runner_test.dart
+++ b/packages/flutter_tools/test/general.shard/runner/runner_test.dart
@@ -37,7 +37,8 @@
       final Completer<void> completer = Completer<void>();
       // runner.run() asynchronously calls the exit function set above, so we
       // catch it in a zone.
-      unawaited(runZoned<Future<void>>(() {
+      unawaited(runZoned<Future<void>>(
+        () {
           unawaited(runner.run(
             <String>['test'],
             <FlutterCommand>[
@@ -52,7 +53,8 @@
         onError: (Object error) {
           expect(error, 'test exit');
           completer.complete();
-        }));
+        },
+      ));
       await completer.future;
 
       // This is the main check of this test.
diff --git a/packages/flutter_tools/test/general.shard/terminal_handler_test.dart b/packages/flutter_tools/test/general.shard/terminal_handler_test.dart
index 1ad44d6..8a034ff 100644
--- a/packages/flutter_tools/test/general.shard/terminal_handler_test.dart
+++ b/packages/flutter_tools/test/general.shard/terminal_handler_test.dart
@@ -71,7 +71,7 @@
     });
 
     testUsingContext('a - debugToggleProfileWidgetBuilds without service protocol', () async {
-       when(mockResidentRunner.supportsServiceProtocol).thenReturn(false);
+      when(mockResidentRunner.supportsServiceProtocol).thenReturn(false);
       await terminalHandler.processTerminalInput('a');
 
       verifyNever(mockResidentRunner.debugToggleProfileWidgetBuilds());
diff --git a/packages/flutter_tools/test/general.shard/web/web_fs_test.dart b/packages/flutter_tools/test/general.shard/web/web_fs_test.dart
index 45a942d..339b0de 100644
--- a/packages/flutter_tools/test/general.shard/web/web_fs_test.dart
+++ b/packages/flutter_tools/test/general.shard/web/web_fs_test.dart
@@ -78,8 +78,9 @@
           bool serveDevTools,
           LogWriter logWriter,
           bool verbose,
-          bool enableDebugExtension}) async {
-            return mockDwds;
+          bool enableDebugExtension,
+        }) async {
+          return mockDwds;
         },
       },
     );
diff --git a/packages/flutter_tools/tool/tool_coverage.dart b/packages/flutter_tools/tool/tool_coverage.dart
index 60c2caf..3504e36 100644
--- a/packages/flutter_tools/tool/tool_coverage.dart
+++ b/packages/flutter_tools/tool/tool_coverage.dart
@@ -75,22 +75,25 @@
     }));
     final ServiceProtocolInfo info = await Service.controlWebServer(enable: true);
     final dynamic channel = IsolateChannel<Object>.connectReceive(receivePort)
-        .transformStream(StreamTransformer<Object, Object>.fromHandlers(handleDone: (EventSink<Object> sink) async {
-      try {
-        // this will throw if collection fails.
-        await coverageCollector.collectCoverageIsolate(info.serverUri);
-      } finally {
-        isolate.kill(priority: Isolate.immediate);
-        isolate = null;
-        sink.close();
-        completer.complete();
-      }
-    }, handleError: (dynamic error, StackTrace stackTrace, EventSink<Object> sink) {
-      isolate.kill(priority: Isolate.immediate);
-      isolate = null;
-      sink.close();
-      completer.complete();
-    }));
+      .transformStream(StreamTransformer<Object, Object>.fromHandlers(
+        handleDone: (EventSink<Object> sink) async {
+          try {
+            // this will throw if collection fails.
+            await coverageCollector.collectCoverageIsolate(info.serverUri);
+          } finally {
+            isolate.kill(priority: Isolate.immediate);
+            isolate = null;
+            sink.close();
+            completer.complete();
+          }
+        },
+        handleError: (dynamic error, StackTrace stackTrace, EventSink<Object> sink) {
+          isolate.kill(priority: Isolate.immediate);
+          isolate = null;
+          sink.close();
+          completer.complete();
+        },
+      ));
 
     VMEnvironment environment;
     final RunnerSuiteController controller = deserializeSuite(