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);