some spaces formatting (#29452) * some space formattings * always use blocks in if-else if a block is used * format spaces in for and while * allow multiline if conditions * fix missing space
diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index b1bc093..a0ba839 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart
@@ -792,7 +792,7 @@ } _acceptedLastLine = false; } else if (line == '--------- beginning of system' || - line == '--------- beginning of main' ) { + line == '--------- beginning of main') { // hide the ugly adb logcat log boundaries at the start _acceptedLastLine = false; } else {
diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart index 0fcbd77..e08a3c4 100644 --- a/packages/flutter_tools/lib/src/android/gradle.dart +++ b/packages/flutter_tools/lib/src/android/gradle.dart
@@ -478,7 +478,7 @@ throwToolExit('Gradle task $assembleTask failed with exit code $exitCode', exitCode: exitCode); } - if(!isBuildingBundle) { + if (!isBuildingBundle) { final File apkFile = _findApkFile(project, buildInfo); if (apkFile == null) throwToolExit('Gradle build failed to produce an Android package.');
diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart index 6d92f28..ff4b3c3 100644 --- a/packages/flutter_tools/lib/src/application_package.dart +++ b/packages/flutter_tools/lib/src/application_package.dart
@@ -458,7 +458,7 @@ final int level = line.length - trimLine.length; // Handle level out - while(level <= currentElement.level) { + while (level <= currentElement.level) { currentElement = currentElement.parent; }
diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index c6ab59c..bd4015e 100644 --- a/packages/flutter_tools/lib/src/base/process.dart +++ b/packages/flutter_tools/lib/src/base/process.dart
@@ -97,7 +97,7 @@ Map<String, String> _environment(bool allowReentrantFlutter, [ Map<String, String> environment ]) { if (allowReentrantFlutter) { if (environment == null) - environment = <String, String>{ 'FLUTTER_ALREADY_LOCKED': 'true' }; + environment = <String, String>{'FLUTTER_ALREADY_LOCKED': 'true'}; else environment['FLUTTER_ALREADY_LOCKED'] = 'true'; }
diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 2f93ae5..e7b650a 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart
@@ -203,7 +203,7 @@ } void sendEvent(String name, [ dynamic args ]) { - final Map<String, dynamic> map = <String, dynamic>{ 'event': name }; + final Map<String, dynamic> map = <String, dynamic>{'event': name}; if (args != null) map['params'] = _toJsonable(args); _send(map); @@ -563,7 +563,7 @@ } void _sendAppEvent(AppInstance app, String name, [ Map<String, dynamic> args ]) { - final Map<String, dynamic> eventArgs = <String, dynamic> { 'appId': app.id }; + final Map<String, dynamic> eventArgs = <String, dynamic> {'appId': app.id}; if (args != null) eventArgs.addAll(args); sendEvent('app.$name', eventArgs); @@ -652,7 +652,7 @@ hostPort = await device.portForwarder.forward(devicePort, hostPort: hostPort); - return <String, dynamic>{ 'hostPort': hostPort }; + return <String, dynamic>{'hostPort': hostPort}; } /// Removes a forwarded port.
diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 8b1c742..11df0d5 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -295,7 +295,7 @@ '--packages=${PackageMap.globalPackagesPath}', '-rexpanded', ]), - environment: <String, String>{ 'VM_SERVICE_URL': observatoryUri }, + environment: <String, String>{'VM_SERVICE_URL': observatoryUri}, ); if (result != 0) throwToolExit('Driver tests failed: $result', exitCode: result);
diff --git a/packages/flutter_tools/lib/src/commands/version.dart b/packages/flutter_tools/lib/src/commands/version.dart index 22564de..33884d2 100644 --- a/packages/flutter_tools/lib/src/commands/version.dart +++ b/packages/flutter_tools/lib/src/commands/version.dart
@@ -16,7 +16,7 @@ import '../version.dart'; class VersionCommand extends FlutterCommand { - VersionCommand(): super() { + VersionCommand() : super() { argParser.addFlag('force', abbr: 'f', help: 'Force switch to older Flutter versions that do not include a version command',
diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart index b7945fd..4e8a69c 100644 --- a/packages/flutter_tools/lib/src/compile.dart +++ b/packages/flutter_tools/lib/src/compile.dart
@@ -378,7 +378,7 @@ } class _RejectRequest extends _CompilationRequest { - _RejectRequest(Completer<CompilerOutput> completer): super(completer); + _RejectRequest(Completer<CompilerOutput> completer) : super(completer); @override Future<CompilerOutput> _run(ResidentCompiler compiler) async =>
diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart index be0d09e..962bba6 100644 --- a/packages/flutter_tools/lib/src/doctor.dart +++ b/packages/flutter_tools/lib/src/doctor.dart
@@ -501,8 +501,8 @@ String get pluginsPath; static final Map<String, String> _idToTitle = <String, String>{ - 'IntelliJIdea' : 'IntelliJ IDEA Ultimate Edition', - 'IdeaIC' : 'IntelliJ IDEA Community Edition', + 'IntelliJIdea': 'IntelliJ IDEA Ultimate Edition', + 'IdeaIC': 'IntelliJ IDEA Community Edition', }; static final Version kMinIdeaVersion = Version(2017, 1, 0); @@ -615,9 +615,9 @@ final String id; static final Map<String, String> _dirNameToId = <String, String>{ - 'IntelliJ IDEA.app' : 'IntelliJIdea', - 'IntelliJ IDEA Ultimate.app' : 'IntelliJIdea', - 'IntelliJ IDEA CE.app' : 'IdeaIC', + 'IntelliJ IDEA.app': 'IntelliJIdea', + 'IntelliJ IDEA Ultimate.app': 'IntelliJIdea', + 'IntelliJ IDEA CE.app': 'IdeaIC', }; static Iterable<DoctorValidator> get installed {
diff --git a/packages/flutter_tools/lib/src/flutter_manifest.dart b/packages/flutter_tools/lib/src/flutter_manifest.dart index 7b39071..4a04029 100644 --- a/packages/flutter_tools/lib/src/flutter_manifest.dart +++ b/packages/flutter_tools/lib/src/flutter_manifest.dart
@@ -102,9 +102,8 @@ String get buildName { if (appVersion != null && appVersion.contains('+')) return appVersion.split('+')?.elementAt(0); - else { + else return appVersion; - } } /// The build version number from the `pubspec.yaml` file.
diff --git a/packages/flutter_tools/lib/src/ios/code_signing.dart b/packages/flutter_tools/lib/src/ios/code_signing.dart index 183c90e..3820e87 100644 --- a/packages/flutter_tools/lib/src/ios/code_signing.dart +++ b/packages/flutter_tools/lib/src/ios/code_signing.dart
@@ -187,8 +187,7 @@ if (validCodeSigningIdentities.contains(savedCertChoice)) { printStatus('Found saved certificate choice "$savedCertChoice". To clear, use "flutter config".'); return savedCertChoice; - } - else { + } else { printError('Saved signing certificate "$savedCertChoice" is not a valid development certificate'); } }
diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 4c6278e..2959a2e 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart
@@ -433,7 +433,7 @@ try { final List<int> bytes = utf8.encode(line); final List<int> out = <int>[]; - for (int i = 0; i < bytes.length; ) { + for (int i = 0; i < bytes.length;) { if (bytes[i] != kBackslash || i > bytes.length - 4) { // Unmapped byte: copy as-is. out.add(bytes[i++]);
diff --git a/packages/flutter_tools/lib/src/ios/ios_workflow.dart b/packages/flutter_tools/lib/src/ios/ios_workflow.dart index 4ae1173..675df08 100644 --- a/packages/flutter_tools/lib/src/ios/ios_workflow.dart +++ b/packages/flutter_tools/lib/src/ios/ios_workflow.dart
@@ -192,8 +192,7 @@ status = ValidationType.missing; messages.add(ValidationMessage.error( userMessages.cocoaPodsMissing(noCocoaPodsConsequence, cocoaPodsInstallInstructions))); - } - else if (cocoaPodsStatus == CocoaPodsStatus.unknownVersion) { + } else if (cocoaPodsStatus == CocoaPodsStatus.unknownVersion) { status = ValidationType.partial; messages.add(ValidationMessage.hint( userMessages.cocoaPodsUnknownVersion(unknownCocoaPodsConsequence, cocoaPodsUpgradeInstructions)));
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index e754274..50bdf32 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -599,8 +599,7 @@ if (result.xcodeBuildExecution != null && result.xcodeBuildExecution.buildForPhysicalDevice && !<String>['DEVELOPMENT_TEAM', 'PROVISIONING_PROFILE'].any( - result.xcodeBuildExecution.buildSettings.containsKey) - ) { + result.xcodeBuildExecution.buildSettings.containsKey)) { printError(noDevelopmentTeamInstruction, emphasis: true); return; } @@ -722,7 +721,7 @@ // the directory and basenames. 'framework': fs.path.basenameWithoutExtension(service['ios-framework']), }).toList(); - final Map<String, dynamic> jsonObject = <String, dynamic>{ 'services' : jsonServices }; + final Map<String, dynamic> jsonObject = <String, dynamic>{'services': jsonServices}; manifest.writeAsStringSync(json.encode(jsonObject), mode: FileMode.write, flush: true); }
diff --git a/packages/flutter_tools/lib/src/ios/plist_utils.dart b/packages/flutter_tools/lib/src/ios/plist_utils.dart index 2b3b75c..0a67279 100644 --- a/packages/flutter_tools/lib/src/ios/plist_utils.dart +++ b/packages/flutter_tools/lib/src/ios/plist_utils.dart
@@ -29,7 +29,7 @@ final List<String> args = <String>[ executable, 'read', normalizedPlistPath, ]; - if (key != null && key.isNotEmpty){ + if (key != null && key.isNotEmpty) { args.add(key); } final String value = runCheckedSync(args);
diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart index 524f9ff..31de4bd 100644 --- a/packages/flutter_tools/lib/src/run_hot.dart +++ b/packages/flutter_tools/lib/src/run_hot.dart
@@ -406,7 +406,7 @@ final Map<String, String> analyticsParameters = reason == null ? null - : <String, String>{ kEventReloadReasonParameterName: reason }; + : <String, String>{kEventReloadReasonParameterName: reason}; if (!_isPaused()) { printTrace('Refreshing active FlutterViews before restarting.');
diff --git a/packages/flutter_tools/lib/src/services.dart b/packages/flutter_tools/lib/src/services.dart index 1a71757..7cd0a58 100644 --- a/packages/flutter_tools/lib/src/services.dart +++ b/packages/flutter_tools/lib/src/services.dart
@@ -105,7 +105,7 @@ 'class': service['android-class'], }).toList(); - final Map<String, dynamic> jsonObject = <String, dynamic>{ 'services': services }; + final Map<String, dynamic> jsonObject = <String, dynamic>{'services': services}; final File servicesFile = fs.file(fs.path.join(dir, 'services.json')); servicesFile.writeAsStringSync(json.encode(jsonObject), mode: FileMode.write, flush: true); return servicesFile;
diff --git a/packages/flutter_tools/lib/src/test/event_printer.dart b/packages/flutter_tools/lib/src/test/event_printer.dart index 81fd5798..dee2d00 100644 --- a/packages/flutter_tools/lib/src/test/event_printer.dart +++ b/packages/flutter_tools/lib/src/test/event_printer.dart
@@ -19,7 +19,7 @@ } void _sendEvent(String name, [ dynamic params ]) { - final Map<String, dynamic> map = <String, dynamic>{ 'event': name}; + final Map<String, dynamic> map = <String, dynamic>{'event': name}; if (params != null) { map['params'] = params; }
diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index e2c2890..545e773 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart
@@ -352,7 +352,7 @@ Future<void> _streamListen(String streamId) async { if (!_listeningFor.contains(streamId)) { _listeningFor.add(streamId); - await _sendRequest('streamListen', <String, dynamic>{ 'streamId': streamId }); + await _sendRequest('streamListen', <String, dynamic>{'streamId': streamId}); } } @@ -873,7 +873,7 @@ /// Create a new development file system on the device. Future<Map<String, dynamic>> createDevFS(String fsName) { - return invokeRpcRaw('_createDevFS', params: <String, dynamic> { 'fsName': fsName }); + return invokeRpcRaw('_createDevFS', params: <String, dynamic> {'fsName': fsName}); } /// List the development file system son the device. @@ -913,12 +913,12 @@ /// The complete list of a file system. Future<List<String>> listDevFSFiles(String fsName) async { - return (await invokeRpcRaw('_listDevFSFiles', params: <String, dynamic>{ 'fsName': fsName }))['files']; + return (await invokeRpcRaw('_listDevFSFiles', params: <String, dynamic>{'fsName': fsName}))['files']; } /// Delete an existing file system. Future<Map<String, dynamic>> deleteDevFS(String fsName) { - return invokeRpcRaw('_deleteDevFS', params: <String, dynamic>{ 'fsName': fsName }); + return invokeRpcRaw('_deleteDevFS', params: <String, dynamic>{'fsName': fsName}); } Future<ServiceMap> runInView( @@ -1273,7 +1273,7 @@ if (state != null && state.containsKey('enabled') && state['enabled'] is String) { state = await invokeFlutterExtensionRpcRaw( 'ext.flutter.$name', - params: <String, dynamic>{ 'enabled': state['enabled'] == 'true' ? 'false' : 'true' }, + params: <String, dynamic>{'enabled': state['enabled'] == 'true' ? 'false' : 'true'}, ); } return state; @@ -1288,7 +1288,7 @@ Future<Map<String, dynamic>> flutterDebugAllowBanner(bool show) { return invokeFlutterExtensionRpcRaw( 'ext.flutter.debugAllowBanner', - params: <String, dynamic>{ 'enabled': show ? 'true' : 'false' }, + params: <String, dynamic>{'enabled': show ? 'true' : 'false'}, ); } @@ -1331,7 +1331,7 @@ Future<String> flutterPlatformOverride([ String platform ]) async { final Map<String, dynamic> result = await invokeFlutterExtensionRpcRaw( 'ext.flutter.platformOverride', - params: platform != null ? <String, dynamic>{ 'value': platform } : <String, String>{}, + params: platform != null ? <String, dynamic>{'value': platform} : <String, String>{}, ); if (result != null && result['value'] is String) return result['value'];