From 66f424f0f8640234d93ab29e956b9e4491390c28 Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Wed, 23 Jan 2019 15:43:27 +0100 Subject: [PATCH] fix some bad indentations (#26921) * fix some bad indentations * remove suspicious line --- packages/flutter/lib/src/cupertino/localizations.dart | 2 +- packages/flutter/lib/src/cupertino/picker.dart | 2 +- packages/flutter/lib/src/foundation/key.dart | 4 +++- packages/flutter/lib/src/foundation/licenses.dart | 3 ++- packages/flutter/lib/src/gestures/scale.dart | 2 +- packages/flutter/lib/src/material/input_decorator.dart | 4 ++-- packages/flutter/lib/src/material/raised_button.dart | 2 +- packages/flutter/lib/src/material/tabs.dart | 4 ++-- packages/flutter/lib/src/rendering/box.dart | 4 ++-- packages/flutter/lib/src/rendering/flex.dart | 4 ++-- packages/flutter/lib/src/rendering/list_body.dart | 2 +- packages/flutter/lib/src/rendering/proxy_box.dart | 2 +- packages/flutter/lib/src/semantics/binding.dart | 2 +- packages/flutter/lib/src/widgets/app.dart | 2 +- packages/flutter/lib/src/widgets/scroll_controller.dart | 2 +- packages/flutter/test/foundation/bit_field_test.dart | 4 +--- packages/flutter/test/rendering/mock_canvas.dart | 4 ++-- packages/flutter/test/widgets/animated_size_test.dart | 6 +++--- packages/flutter/test/widgets/stack_test.dart | 6 +++--- packages/flutter_tools/lib/src/android/android_device.dart | 4 ++-- packages/flutter_tools/lib/src/android/gradle.dart | 5 +++-- packages/flutter_tools/lib/src/base/process.dart | 4 ++-- packages/flutter_tools/lib/src/commands/daemon.dart | 2 +- .../flutter_tools/lib/src/commands/update_packages.dart | 1 - packages/flutter_tools/lib/src/compile.dart | 2 +- packages/flutter_tools/lib/src/doctor.dart | 2 +- packages/flutter_tools/lib/src/vmservice.dart | 2 +- .../flutter_tools/test/integration/flutter_run_test.dart | 6 +++--- .../flutter_tools/test/integration/hot_reload_test.dart | 4 ++-- packages/flutter_tools/test/integration/test_driver.dart | 6 +++--- 30 files changed, 50 insertions(+), 49 deletions(-) diff --git a/packages/flutter/lib/src/cupertino/localizations.dart b/packages/flutter/lib/src/cupertino/localizations.dart index c4ff420eef1..8ac0484bd20 100644 --- a/packages/flutter/lib/src/cupertino/localizations.dart +++ b/packages/flutter/lib/src/cupertino/localizations.dart @@ -292,7 +292,7 @@ class DefaultCupertinoLocalizations implements CupertinoLocalizations { @override String datePickerMinuteSemanticsLabel(int minute) { if (minute == 1) - return '1 minute'; + return '1 minute'; return minute.toString() + ' minutes'; } diff --git a/packages/flutter/lib/src/cupertino/picker.dart b/packages/flutter/lib/src/cupertino/picker.dart index 0975de9a014..bcf0947475d 100644 --- a/packages/flutter/lib/src/cupertino/picker.dart +++ b/packages/flutter/lib/src/cupertino/picker.dart @@ -419,7 +419,7 @@ class _RenderCupertinoPickerSemantics extends RenderProxyBox { _currentIndex = controller.selectedItem; markNeedsSemanticsUpdate(); } - @override + @override void describeSemanticsConfiguration(SemanticsConfiguration config) { super.describeSemanticsConfiguration(config); config.isSemanticBoundary = true; diff --git a/packages/flutter/lib/src/foundation/key.dart b/packages/flutter/lib/src/foundation/key.dart index 886e478ccfb..27fbb32fb7e 100644 --- a/packages/flutter/lib/src/foundation/key.dart +++ b/packages/flutter/lib/src/foundation/key.dart @@ -83,4 +83,6 @@ class ValueKey extends LocalKey { } } -class _TypeLiteral { Type get type => T; } +class _TypeLiteral { + Type get type => T; +} diff --git a/packages/flutter/lib/src/foundation/licenses.dart b/packages/flutter/lib/src/foundation/licenses.dart index 083e8c0887e..cf44f8bb814 100644 --- a/packages/flutter/lib/src/foundation/licenses.dart +++ b/packages/flutter/lib/src/foundation/licenses.dart @@ -54,7 +54,8 @@ abstract class LicenseEntry { } enum _LicenseEntryWithLineBreaksParserState { - beforeParagraph, inParagraph, + beforeParagraph, + inParagraph, } /// Variant of [LicenseEntry] for licenses that separate paragraphs with blank diff --git a/packages/flutter/lib/src/gestures/scale.dart b/packages/flutter/lib/src/gestures/scale.dart index 441260f5e02..90c0e1c40cd 100644 --- a/packages/flutter/lib/src/gestures/scale.dart +++ b/packages/flutter/lib/src/gestures/scale.dart @@ -168,7 +168,7 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer { _LineBetweenPointers _initialLine; _LineBetweenPointers _currentLine; Map _pointerLocations; - List _pointerQueue; /// A queue to sort pointers in order of entrance + List _pointerQueue; // A queue to sort pointers in order of entrance final Map _velocityTrackers = {}; double get _scaleFactor => _initialSpan > 0.0 ? _currentSpan / _initialSpan : 1.0; diff --git a/packages/flutter/lib/src/material/input_decorator.dart b/packages/flutter/lib/src/material/input_decorator.dart index 38a8ee7ded6..772f15c265e 100644 --- a/packages/flutter/lib/src/material/input_decorator.dart +++ b/packages/flutter/lib/src/material/input_decorator.dart @@ -3043,7 +3043,7 @@ class InputDecorationTheme extends Diagnosticable { /// * [InputDecorator.isFocused], which is true if the [InputDecorator]'s child /// has the focus. /// * [InputDecoration.errorText], the error shown by the [InputDecorator], if non-null. - /// * [border], for a description of where the [InputDecorator] border appears. + /// * [border], for a description of where the [InputDecorator] border appears. /// * [UnderlineInputBorder], an [InputDecorator] border which draws a horizontal /// line at the bottom of the input decorator's container. /// * [OutlineInputBorder], an [InputDecorator] border which draws a @@ -3059,7 +3059,7 @@ class InputDecorationTheme extends Diagnosticable { /// and [InputDecoration.errorText] is null. final InputBorder focusedErrorBorder; - /// The border to display when the [InputDecorator] is disabled and is not + /// The border to display when the [InputDecorator] is disabled and is not /// showing an error. /// /// See also: diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart index 75243c80e0b..03157713dae 100644 --- a/packages/flutter/lib/src/material/raised_button.dart +++ b/packages/flutter/lib/src/material/raised_button.dart @@ -124,7 +124,7 @@ class RaisedButton extends MaterialButton { @required Widget label, }) = _RaisedButtonWithIcon; - @override + @override Widget build(BuildContext context) { final ThemeData theme = Theme.of(context); final ButtonThemeData buttonTheme = ButtonTheme.of(context); diff --git a/packages/flutter/lib/src/material/tabs.dart b/packages/flutter/lib/src/material/tabs.dart index 73462bfc6dc..7c71b7812a8 100644 --- a/packages/flutter/lib/src/material/tabs.dart +++ b/packages/flutter/lib/src/material/tabs.dart @@ -393,7 +393,7 @@ class _IndicatorPainter extends CustomPainter { else if (value == index + 1.0) _currentRect = next ?? middle; else if (value == index) - _currentRect = middle; + _currentRect = middle; else if (value < index) _currentRect = previous == null ? middle : Rect.lerp(middle, previous, index - value); else @@ -864,7 +864,7 @@ class _TabBarState extends State { else if (value == index + 1.0) offset = trailingPosition ?? middlePosition; else if (value == index) - offset = middlePosition; + offset = middlePosition; else if (value < index) offset = leadingPosition == null ? middlePosition : lerpDouble(middlePosition, leadingPosition, index - value); else diff --git a/packages/flutter/lib/src/rendering/box.dart b/packages/flutter/lib/src/rendering/box.dart index 7b9cbbc68ff..89f1b5c826b 100644 --- a/packages/flutter/lib/src/rendering/box.dart +++ b/packages/flutter/lib/src/rendering/box.dart @@ -1736,7 +1736,7 @@ abstract class RenderBox extends RenderObject { information.writeln('The nearest ancestor providing an unbounded width constraint is:'); information.write(' '); information.writeln(node.toStringShallow(joiner: '\n ')); - } + } if (!constraints.hasBoundedHeight) { RenderBox node = this; while (!node.constraints.hasBoundedHeight && node.parent is RenderBox) @@ -1834,7 +1834,7 @@ abstract class RenderBox extends RenderObject { // notify them again. _cachedBaselines?.clear(); _cachedIntrinsicDimensions?.clear(); - if (parent is RenderObject) { + if (parent is RenderObject) { markParentNeedsLayout(); return; } diff --git a/packages/flutter/lib/src/rendering/flex.dart b/packages/flutter/lib/src/rendering/flex.dart index cc1914e0614..71b2af6c8f8 100644 --- a/packages/flutter/lib/src/rendering/flex.dart +++ b/packages/flutter/lib/src/rendering/flex.dart @@ -453,8 +453,8 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin _onTap; GestureTapCallback _onTap; set onTap(GestureTapCallback value) { diff --git a/packages/flutter/lib/src/semantics/binding.dart b/packages/flutter/lib/src/semantics/binding.dart index 351465ca14b..34e72c48c5d 100644 --- a/packages/flutter/lib/src/semantics/binding.dart +++ b/packages/flutter/lib/src/semantics/binding.dart @@ -50,7 +50,7 @@ mixin SemanticsBinding on BindingBase { bool value = _accessibilityFeatures.disableAnimations; assert(() { if (debugSemanticsDisableAnimations != null) - value = debugSemanticsDisableAnimations; + value = debugSemanticsDisableAnimations; return true; }()); return value; diff --git a/packages/flutter/lib/src/widgets/app.dart b/packages/flutter/lib/src/widgets/app.dart index 13e6f43c9b9..22cc41e531d 100644 --- a/packages/flutter/lib/src/widgets/app.dart +++ b/packages/flutter/lib/src/widgets/app.dart @@ -929,7 +929,7 @@ class _WidgetsAppState extends State implements WidgetsBindingObserv } // Look for language+country match. if (userLocale.countryCode != null) { - final Locale match = languageAndCountryLocales['${userLocale.languageCode}_${userLocale.countryCode}']; + final Locale match = languageAndCountryLocales['${userLocale.languageCode}_${userLocale.countryCode}']; if (match != null) { return match; } diff --git a/packages/flutter/lib/src/widgets/scroll_controller.dart b/packages/flutter/lib/src/widgets/scroll_controller.dart index fd50a467db3..8b1ca319715 100644 --- a/packages/flutter/lib/src/widgets/scroll_controller.dart +++ b/packages/flutter/lib/src/widgets/scroll_controller.dart @@ -224,7 +224,7 @@ class ScrollController extends ChangeNotifier { /// This is used when the environment has changed and the [Scrollable] /// needs to recreate the [ScrollPosition] object. It is null the first /// time the [ScrollPosition] is created. - ScrollPosition createScrollPosition( + ScrollPosition createScrollPosition( ScrollPhysics physics, ScrollContext context, ScrollPosition oldPosition, diff --git a/packages/flutter/test/foundation/bit_field_test.dart b/packages/flutter/test/foundation/bit_field_test.dart index a2cf371e34b..9fff4dd1555 100644 --- a/packages/flutter/test/foundation/bit_field_test.dart +++ b/packages/flutter/test/foundation/bit_field_test.dart @@ -5,9 +5,7 @@ import 'package:flutter/foundation.dart'; import '../flutter_test_alternative.dart'; -enum _TestEnum { - a, b, c, d, e, f, g, h, -} +enum _TestEnum { a, b, c, d, e, f, g, h, } void main() { test('BitField control test', () { diff --git a/packages/flutter/test/rendering/mock_canvas.dart b/packages/flutter/test/rendering/mock_canvas.dart index 23c7322dbd3..805232a92c7 100644 --- a/packages/flutter/test/rendering/mock_canvas.dart +++ b/packages/flutter/test/rendering/mock_canvas.dart @@ -1182,10 +1182,10 @@ class _LinePaintPredicate extends _DrawCommandPaintPredicate { final Offset p1Argument = arguments[0]; final Offset p2Argument = arguments[1]; if (p1 != null && p1Argument != p1) { - throw 'It called $methodName with p1 endpoint, $p1Argument, which was not exactly the expected endpoint ($p1).'; + throw 'It called $methodName with p1 endpoint, $p1Argument, which was not exactly the expected endpoint ($p1).'; } if (p2 != null && p2Argument != p2) { - throw 'It called $methodName with p2 endpoint, $p2Argument, which was not exactly the expected endpoint ($p2).'; + throw 'It called $methodName with p2 endpoint, $p2Argument, which was not exactly the expected endpoint ($p2).'; } } diff --git a/packages/flutter/test/widgets/animated_size_test.dart b/packages/flutter/test/widgets/animated_size_test.dart index 3185a4acb6c..4a0253037ca 100644 --- a/packages/flutter/test/widgets/animated_size_test.dart +++ b/packages/flutter/test/widgets/animated_size_test.dart @@ -10,9 +10,9 @@ class TestPaintingContext implements PaintingContext { final List invocations = []; @override - void noSuchMethod(Invocation invocation) { - invocations.add(invocation); - } + void noSuchMethod(Invocation invocation) { + invocations.add(invocation); + } } void main() { diff --git a/packages/flutter/test/widgets/stack_test.dart b/packages/flutter/test/widgets/stack_test.dart index aefc1283b28..39e6226d7e9 100644 --- a/packages/flutter/test/widgets/stack_test.dart +++ b/packages/flutter/test/widgets/stack_test.dart @@ -12,9 +12,9 @@ class TestPaintingContext implements PaintingContext { final List invocations = []; @override - void noSuchMethod(Invocation invocation) { - invocations.add(invocation); - } + void noSuchMethod(Invocation invocation) { + invocations.add(invocation); + } } void main() { diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index bca4b00475f..c877b5a8096 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -676,9 +676,9 @@ class _AdbLogReader extends DeviceLogReader { final List args = ['shell', '-x', 'logcat', '-v', 'time']; final String lastTimestamp = device.lastLogcatTimestamp; if (lastTimestamp != null) - _timeOrigin = _adbTimestampToDateTime(lastTimestamp); + _timeOrigin = _adbTimestampToDateTime(lastTimestamp); else - _timeOrigin = null; + _timeOrigin = null; runCommand(device.adbCommandForDevice(args)).then((Process process) { _process = process; const Utf8Decoder decoder = Utf8Decoder(allowMalformed: true); diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart index 60ddf91191f..a13d1372f32 100644 --- a/packages/flutter_tools/lib/src/android/gradle.dart +++ b/packages/flutter_tools/lib/src/android/gradle.dart @@ -448,8 +448,9 @@ Future _buildGradleProjectV2( if (buildInfo.createPatch) { final AndroidApk package = AndroidApk.fromApk(apkFile); - final Directory baselineDir = fs.directory(buildInfo.baselineDir); - final File baselineApkFile = baselineDir.childFile('${package.versionCode}.apk');if (!baselineApkFile.existsSync()) + final Directory baselineDir = fs.directory(buildInfo.baselineDir); + final File baselineApkFile = baselineDir.childFile('${package.versionCode}.apk'); + if (!baselineApkFile.existsSync()) throwToolExit('Error: Could not find baseline package ${baselineApkFile.path}.'); printStatus('Found baseline package ${baselineApkFile.path}.'); diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index e61b4c1040a..8dca327c44e 100644 --- a/packages/flutter_tools/lib/src/base/process.dart +++ b/packages/flutter_tools/lib/src/base/process.dart @@ -381,8 +381,8 @@ class RunResult { return out.toString().trimRight(); } - /// Throws a [ProcessException] with the given `message`. - void throwException(String message) { + /// Throws a [ProcessException] with the given `message`. + void throwException(String message) { throw ProcessException( _command.first, _command.skip(1).toList(), diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 2a2d9d56fc9..79d30718451 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart @@ -99,7 +99,7 @@ class Daemon { _handleRequest, onDone: () { if (!_onExitCompleter.isCompleted) - _onExitCompleter.complete(0); + _onExitCompleter.complete(0); } ); } diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index b084fb43aad..a8718d66a3b 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -640,7 +640,6 @@ class PubspecYaml { // place to insert our transitive dependencies. if (section == Section.dependencies) endOfDirectDependencies = output.length; - endOfDevDependencies = output.length; if (section == Section.devDependencies) endOfDevDependencies = output.length; section = data.section; // track which section we're now in. diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart index 450b9a00815..eb584a186dd 100644 --- a/packages/flutter_tools/lib/src/compile.dart +++ b/packages/flutter_tools/lib/src/compile.dart @@ -224,7 +224,7 @@ class KernelCompiler { Uri mainUri; if (packagesPath != null) { command.addAll(['--packages', packagesPath]); - mainUri = _PackageUriMapper.findUri(mainPath, packagesPath); + mainUri = _PackageUriMapper.findUri(mainPath, packagesPath); } if (outputFilePath != null) { command.addAll(['--output-dill', outputFilePath]); diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart index a790c832be0..f918671cc67 100644 --- a/packages/flutter_tools/lib/src/doctor.dart +++ b/packages/flutter_tools/lib/src/doctor.dart @@ -68,7 +68,7 @@ class _DefaultDoctorValidatorsProvider implements DoctorValidatorsProvider { _validators.add(NoIdeValidator()); if (ProxyValidator.shouldShow) - _validators.add(ProxyValidator()); + _validators.add(ProxyValidator()); if (deviceManager.canListAnything) _validators.add(DeviceValidator()); diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index f9b53b98fe2..7a7274028d0 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart @@ -1305,7 +1305,7 @@ class Isolate extends ServiceObjectOwner { final Map result = await invokeFlutterExtensionRpcRaw('ext.flutter.saveCompilationTrace'); if (result != null && result['value'] is List) - return result['value'].cast(); + return result['value'].cast(); return null; } diff --git a/packages/flutter_tools/test/integration/flutter_run_test.dart b/packages/flutter_tools/test/integration/flutter_run_test.dart index f225533f15e..be1150caeae 100644 --- a/packages/flutter_tools/test/integration/flutter_run_test.dart +++ b/packages/flutter_tools/test/integration/flutter_run_test.dart @@ -45,9 +45,9 @@ void main() { expect(_proc.stdout, isNot(contains('flutter has exited unexpectedly'))); expect(_proc.stderr, isNot(contains('flutter has exited unexpectedly'))); if (!_proc.stderr.toString().contains('Unable to locate a development') - && !_proc.stdout.toString().contains('No devices found with name or id matching')) { - fail("'flutter run -d invalid-device-id' did not produce the expected error"); - } + && !_proc.stdout.toString().contains('No devices found with name or id matching')) { + fail("'flutter run -d invalid-device-id' did not produce the expected error"); + } }); test('writes pid-file', () async { diff --git a/packages/flutter_tools/test/integration/hot_reload_test.dart b/packages/flutter_tools/test/integration/hot_reload_test.dart index ee0e66b0563..5bd3b36ad10 100644 --- a/packages/flutter_tools/test/integration/hot_reload_test.dart +++ b/packages/flutter_tools/test/integration/hot_reload_test.dart @@ -41,8 +41,8 @@ void main() { final StringBuffer stdout = StringBuffer(); final StreamSubscription subscription = _flutter.stdout.listen(stdout.writeln); try { - await _flutter.hotReload(); - expect(stdout.toString(), contains('(((((RELOAD WORKED)))))')); + await _flutter.hotReload(); + expect(stdout.toString(), contains('(((((RELOAD WORKED)))))')); } finally { await subscription.cancel(); } diff --git a/packages/flutter_tools/test/integration/test_driver.dart b/packages/flutter_tools/test/integration/test_driver.dart index e8166f2e993..01482961ca5 100644 --- a/packages/flutter_tools/test/integration/test_driver.dart +++ b/packages/flutter_tools/test/integration/test_driver.dart @@ -82,11 +82,11 @@ abstract class FlutterTestDriver { }) async { final String flutterBin = fs.path.join(getFlutterRoot(), 'bin', 'flutter'); if (withDebugger) - arguments.add('--start-paused'); + arguments.add('--start-paused'); if (_printDebugOutputToStdOut) - arguments.add('--verbose'); + arguments.add('--verbose'); if (pidFile != null) { - arguments.addAll(['--pid-file', pidFile.path]); + arguments.addAll(['--pid-file', pidFile.path]); } if (script != null) { arguments.add(script);