From c9010c91f68dc6222c338913dfd6f79d3eb657bc Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Tue, 3 May 2016 09:09:00 -0700 Subject: [PATCH] fix analysis errors (#3677) * fix analysis errors * review comments; fix test * re-add an export for debugPrint --- packages/flutter/lib/src/rendering/debug.dart | 2 +- .../flutter/lib/src/services/system_chrome.dart | 2 +- packages/flutter/lib/src/widgets/basic.dart | 1 - .../flutter/lib/src/widgets/transitions.dart | 1 - packages/flutter_driver/lib/flutter_driver.dart | 4 ---- packages/flutter_tools/lib/src/android/adb.dart | 8 ++++---- .../lib/src/android/android_device.dart | 8 +++++--- packages/flutter_tools/lib/src/base/context.dart | 2 +- packages/flutter_tools/lib/src/base/os.dart | 2 +- packages/flutter_tools/lib/src/base/process.dart | 2 +- packages/flutter_tools/lib/src/cache.dart | 8 ++++---- .../lib/src/commands/build_aot.dart | 6 +++--- .../lib/src/commands/build_apk.dart | 6 +++--- .../flutter_tools/lib/src/commands/daemon.dart | 8 ++++---- .../flutter_tools/lib/src/commands/drive.dart | 4 ++-- packages/flutter_tools/lib/src/device.dart | 10 +++++----- packages/flutter_tools/lib/src/ios/devices.dart | 16 ++++++++-------- packages/flutter_tools/lib/src/ios/mac.dart | 8 ++++---- .../lib/src/ios/setup_xcodeproj.dart | 2 +- .../flutter_tools/lib/src/ios/simulators.dart | 12 ++++++------ .../lib/src/runner/flutter_command.dart | 2 +- packages/flutter_tools/lib/src/services.dart | 6 +++--- .../lib/src/test/flutter_platform.dart | 4 ++-- packages/flutter_tools/lib/src/toolchain.dart | 2 +- .../test/analyze_duplicate_names_test.dart | 4 +++- packages/flutter_tools/test/daemon_test.dart | 4 ++-- packages/flutter_tools/test/devices.test.dart | 4 ++-- packages/flutter_tools/test/drive_test.dart | 16 ++++++++-------- packages/flutter_tools/test/install_test.dart | 4 ++-- packages/flutter_tools/test/listen_test.dart | 2 +- packages/flutter_tools/test/src/context.dart | 2 +- packages/flutter_tools/test/stop_test.dart | 4 ++-- packages/flutter_tools/test/trace_test.dart | 2 +- packages/flutter_tools/tool/daemon_client.dart | 12 ++++++------ 34 files changed, 89 insertions(+), 91 deletions(-) diff --git a/packages/flutter/lib/src/rendering/debug.dart b/packages/flutter/lib/src/rendering/debug.dart index 06850aded8..f91c1e23c3 100644 --- a/packages/flutter/lib/src/rendering/debug.dart +++ b/packages/flutter/lib/src/rendering/debug.dart @@ -5,7 +5,7 @@ import 'package:flutter/painting.dart'; import 'package:flutter/rendering.dart'; -export 'package:flutter/services.dart' show debugPrint; +export 'package:flutter/foundation.dart' show debugPrint; /// Causes each RenderBox to paint a box around its bounds, and some extra /// boxes, such as RenderPadding, to draw construction lines. diff --git a/packages/flutter/lib/src/services/system_chrome.dart b/packages/flutter/lib/src/services/system_chrome.dart index 05040114a7..5f32668f2f 100644 --- a/packages/flutter/lib/src/services/system_chrome.dart +++ b/packages/flutter/lib/src/services/system_chrome.dart @@ -9,7 +9,7 @@ import 'package:sky_services/flutter/platform/system_chrome.mojom.dart'; import 'shell.dart'; -export 'package:sky_services/flutter/platform/system_chrome.mojom.dart' show DeviceOrientation, SystemUIOverlay; +export 'package:sky_services/flutter/platform/system_chrome.mojom.dart' show DeviceOrientation; mojom.SystemChromeProxy _initSystemChromeProxy() { mojom.SystemChromeProxy proxy = new mojom.SystemChromeProxy.unbound(); diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index 44baf3d24f..04d3e9e0ee 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -32,7 +32,6 @@ export 'package:flutter/rendering.dart' show MaxTileWidthGridDelegate, MultiChildLayoutDelegate, PaintingContext, - PlainTextSpan, PointerCancelEvent, PointerCancelEventListener, PointerDownEvent, diff --git a/packages/flutter/lib/src/widgets/transitions.dart b/packages/flutter/lib/src/widgets/transitions.dart index e0c3e7abf8..0729def66b 100644 --- a/packages/flutter/lib/src/widgets/transitions.dart +++ b/packages/flutter/lib/src/widgets/transitions.dart @@ -9,7 +9,6 @@ import 'package:vector_math/vector_math_64.dart' show Matrix4; import 'basic.dart'; import 'framework.dart'; -export 'package:flutter/animation.dart' show AnimationDirection; export 'package:flutter/rendering.dart' show RelativeRect; /// A widget that rebuilds when the given animation changes value. diff --git a/packages/flutter_driver/lib/flutter_driver.dart b/packages/flutter_driver/lib/flutter_driver.dart index 954dcd6981..5f93969d07 100644 --- a/packages/flutter_driver/lib/flutter_driver.dart +++ b/packages/flutter_driver/lib/flutter_driver.dart @@ -32,14 +32,10 @@ export 'src/health.dart' show HealthStatus; export 'src/message.dart' show - Message, Command, - CommandWithTarget, Result; export 'src/timeline_summary.dart' show - summarizeTimeline, - EventTrace, TimelineSummary; export 'src/timeline.dart' show diff --git a/packages/flutter_tools/lib/src/android/adb.dart b/packages/flutter_tools/lib/src/android/adb.dart index afaf6a8485..aa939b58a5 100644 --- a/packages/flutter_tools/lib/src/android/adb.dart +++ b/packages/flutter_tools/lib/src/android/adb.dart @@ -23,7 +23,7 @@ class Adb { bool exists() { try { - runCheckedSync([adbPath, 'version']); + runCheckedSync([adbPath, 'version']); return true; } catch (exception) { return false; @@ -36,18 +36,18 @@ class Adb { /// Revision eac51f2bb6a8-android /// /// This method throws if `adb version` fails. - String getVersion() => runCheckedSync([adbPath, 'version']); + String getVersion() => runCheckedSync([adbPath, 'version']); /// Starts the adb server. This will throw if there's an problem starting the /// adb server. void startServer() { - runCheckedSync([adbPath, 'start-server']); + runCheckedSync([adbPath, 'start-server']); } /// Stops the adb server. This will throw if there's an problem stopping the /// adb server. void killServer() { - runCheckedSync([adbPath, 'kill-server']); + runCheckedSync([adbPath, 'kill-server']); } /// Ask the ADB server for its internal version number. diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index 7a63f4c01c..ced99aa6a1 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -56,7 +56,9 @@ class AndroidDevice extends Device { if (_isLocalEmulator == null) { // http://developer.android.com/ndk/guides/abis.html (x86, armeabi-v7a, ...) try { - String value = runCheckedSync(adbCommandForDevice(['shell', 'getprop', 'ro.product.cpu.abi'])); + String value = runCheckedSync(adbCommandForDevice( + ['shell', 'getprop', 'ro.product.cpu.abi'] + )); _isLocalEmulator = value.startsWith('x86'); } catch (error) { _isLocalEmulator = false; @@ -164,7 +166,7 @@ class AndroidDevice extends Device { @override bool isAppInstalled(ApplicationPackage app) { // This call takes 400ms - 600ms. - if (runCheckedSync(adbCommandForDevice(['shell', 'pm', 'path', app.id])).isEmpty) + if (runCheckedSync(adbCommandForDevice(['shell', 'pm', 'path', app.id])).isEmpty) return false; // Check the application SHA. @@ -405,7 +407,7 @@ class AndroidDevice extends Device { /// /// [mockAdbOutput] is public for testing. List getAdbDevices({ String mockAdbOutput }) { - List devices = []; + List devices = []; List output; if (mockAdbOutput == null) { diff --git a/packages/flutter_tools/lib/src/base/context.dart b/packages/flutter_tools/lib/src/base/context.dart index 87b9da4a12..e00e08c778 100644 --- a/packages/flutter_tools/lib/src/base/context.dart +++ b/packages/flutter_tools/lib/src/base/context.dart @@ -57,6 +57,6 @@ class AppContext { } dynamic runInZone(dynamic method()) { - return runZoned(method, zoneValues: {'context': this}); + return runZoned(method, zoneValues: {'context': this}); } } diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart index e268b6c0dc..ccd227b82d 100644 --- a/packages/flutter_tools/lib/src/base/os.dart +++ b/packages/flutter_tools/lib/src/base/os.dart @@ -48,7 +48,7 @@ class _PosixUtils extends OperatingSystemUtils { @override ProcessResult makeExecutable(File file) { - return Process.runSync('chmod', ['a+x', file.path]); + return Process.runSync('chmod', ['a+x', file.path]); } /// Return the path (with symlinks resolved) to the given executable, or `null` diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart index adaf50467e..7c478f70b4 100644 --- a/packages/flutter_tools/lib/src/base/process.dart +++ b/packages/flutter_tools/lib/src/base/process.dart @@ -18,7 +18,7 @@ typedef String StringConverter(String string); Future runCommand(List cmd, { String workingDirectory }) async { printTrace(cmd.join(' ')); String executable = cmd[0]; - List arguments = cmd.length > 1 ? cmd.sublist(1) : []; + List arguments = cmd.length > 1 ? cmd.sublist(1) : []; Process process = await Process.start( executable, arguments, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index ec976cedfd..892657baa8 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -206,12 +206,12 @@ class FlutterEngine { // Return a list of (cache directory path, download URL path) tuples. List> _getToolsDirs() { if (Platform.isMacOS) - return >[['darwin-x64', 'darwin-x64/artifacts.zip']]; + return >[['darwin-x64', 'darwin-x64/artifacts.zip']]; else if (Platform.isLinux) return >[ - ['linux-x64', 'linux-x64/artifacts.zip'], - ['android-arm-profile/linux-x64', 'android-arm-profile/linux-x64.zip'], - ['android-arm-release/linux-x64', 'android-arm-release/linux-x64.zip'], + ['linux-x64', 'linux-x64/artifacts.zip'], + ['android-arm-profile/linux-x64', 'android-arm-profile/linux-x64.zip'], + ['android-arm-release/linux-x64', 'android-arm-release/linux-x64.zip'], ]; else return >[]; diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart index 63ae5701ef..df010a30f2 100644 --- a/packages/flutter_tools/lib/src/commands/build_aot.dart +++ b/packages/flutter_tools/lib/src/commands/build_aot.dart @@ -107,7 +107,7 @@ String buildAotSnapshot( String vmServicePath = path.join(skyEngineSdkExt, 'dart', 'runtime', 'bin', 'vmservice', 'vmservice_io.dart'); String jniPath = path.join(skyEngineSdkExt, 'dart_jni', 'jni.dart'); - List filePaths = [ + List filePaths = [ genSnapshot, vmEntryPoints, vmEntryPointsAndroid, mojoInternalPath, uiPath, vmServicePath, jniPath ]; List missingFiles = filePaths.where((String p) => !FileSystemEntity.isFileSync(p)).toList(); @@ -116,7 +116,7 @@ String buildAotSnapshot( return null; } - List genSnapshotCmd = [ + List genSnapshotCmd = [ genSnapshot, '--vm_isolate_snapshot=$vmIsolateSnapshot', '--isolate_snapshot=$isolateSnapshot', @@ -133,7 +133,7 @@ String buildAotSnapshot( ]; if (!(tools.engineRelease || buildMode == BuildMode.release)) { - genSnapshotCmd.addAll([ + genSnapshotCmd.addAll([ '--no-checked', '--conditional_directives', ]); diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart index f784dd5c19..f5fa04ec75 100644 --- a/packages/flutter_tools/lib/src/commands/build_apk.dart +++ b/packages/flutter_tools/lib/src/commands/build_apk.dart @@ -111,7 +111,7 @@ class _ApkBuilder { '-F', outputApk.path, ]; if (resources != null) - packageArgs.addAll(['-S', resources.absolute.path]); + packageArgs.addAll(['-S', resources.absolute.path]); packageArgs.add(artifacts.path); runCheckedSync(packageArgs); } @@ -136,7 +136,7 @@ class _ApkComponents { File manifest; File icuData; List jars; - List> services = []; + List> services = >[]; File libSkyShell; File debugKeystore; Directory resources; @@ -408,7 +408,7 @@ bool _needsRebuild(String apkPath, String manifest) { // Note: This list of dependencies is imperfect, but will do for now. We // purposely don't include the .dart files, because we can load those // over the network without needing to rebuild (at least on Android). - Iterable dependenciesStat = [ + Iterable dependenciesStat = [ manifest, _kFlutterManifestPath, _kPackagesStatusPath diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 72c9afe800..6a8e8a314a 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart @@ -135,7 +135,7 @@ class Daemon { _domainMap[prefix].handleCommand(name, id, request['params']); } catch (error) { - _send({'id': id, 'error': _toJsonable(error)}); + _send({'id': id, 'error': _toJsonable(error)}); } } @@ -181,7 +181,7 @@ abstract class Domain { } void sendEvent(String name, [dynamic args]) { - Map map = { 'event': name }; + Map map = { 'event': name }; if (args != null) map['params'] = _toJsonable(args); _send(map); @@ -202,13 +202,13 @@ class DaemonDomain extends Domain { _subscription = daemon.notifyingLogger.onMessage.listen((LogMessage message) { if (message.stackTrace != null) { - sendEvent('daemon.logMessage', { + sendEvent('daemon.logMessage', { 'level': message.level, 'message': message.message, 'stackTrace': message.stackTrace.toString() }); } else { - sendEvent('daemon.logMessage', { + sendEvent('daemon.logMessage', { 'level': message.level, 'message': message.message }); diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 4a0a9957dd..7451bc4357 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart @@ -109,7 +109,7 @@ class DriveCommand extends RunCommandBase { } try { - return await testRunner([testFile]) + return await testRunner([testFile]) .catchError((dynamic error, dynamic stackTrace) { printError('CAUGHT EXCEPTION: $error\n$stackTrace'); return 1; @@ -162,7 +162,7 @@ class DriveCommand extends RunCommandBase { // if the application is `lib/foo/bar.dart`, the test file is expected to // be `test_driver/foo/bar_test.dart`. String pathWithNoExtension = path.withoutExtension(path.joinAll( - [packageDir, 'test_driver']..addAll(parts.skip(1)))); + [packageDir, 'test_driver']..addAll(parts.skip(1)))); return '${pathWithNoExtension}_test${path.extension(appFile)}'; } } diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart index 20a3a9870d..2d9d5f7772 100644 --- a/packages/flutter_tools/lib/src/device.dart +++ b/packages/flutter_tools/lib/src/device.dart @@ -247,12 +247,12 @@ abstract class Device { } await client.sendRequest('_setVMTimelineFlags', - {'recordedStreams': ['Compiler', 'Dart', 'Embedder', 'GC']} + {'recordedStreams': ['Compiler', 'Dart', 'Embedder', 'GC']} ); await client.sendRequest('_clearVMTimeline'); } - /// Stops tracing, optionally waiting + /// Stops tracing, optionally waiting Future> stopTracingAndDownloadTimeline(int observatoryPort, {bool waitForFirstFrame: false}) async { rpc.Peer peer; try { @@ -270,7 +270,7 @@ abstract class Device { if (!waitForFirstFrame) { // Stop tracing immediately and get the timeline - await peer.sendRequest('_setVMTimelineFlags', {'recordedStreams': '[]'}); + await peer.sendRequest('_setVMTimelineFlags', {'recordedStreams': '[]'}); timeline = await fetchTimeline(); } else { Completer whenFirstFrameRendered = new Completer(); @@ -285,7 +285,7 @@ abstract class Device { } } }); - await peer.sendRequest('streamListen', {'streamId': 'Timeline'}); + await peer.sendRequest('streamListen', {'streamId': 'Timeline'}); await whenFirstFrameRendered.future.timeout( const Duration(seconds: 10), onTimeout: () { @@ -298,7 +298,7 @@ abstract class Device { } ); timeline = await fetchTimeline(); - await peer.sendRequest('_setVMTimelineFlags', {'recordedStreams': '[]'}); + await peer.sendRequest('_setVMTimelineFlags', {'recordedStreams': '[]'}); } return timeline; diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 00b9d6a5a6..fb06f29da2 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -81,7 +81,7 @@ class IOSDevice extends Device { if (!doctor.iosWorkflow.hasIDeviceId) return []; - List devices = []; + List devices = []; for (String id in _getAttachedDeviceIDs(mockIOS)) { String name = _getDeviceName(id, mockIOS); devices.add(new IOSDevice(id, name: name)); @@ -92,7 +92,7 @@ class IOSDevice extends Device { static Iterable _getAttachedDeviceIDs([IOSDevice mockIOS]) { String listerPath = (mockIOS != null) ? mockIOS.listerPath : _checkForCommand('idevice_id'); try { - String output = runSync([listerPath, '-l']); + String output = runSync([listerPath, '-l']); return output.trim().split('\n').where((String s) => s != null && s.isNotEmpty); } catch (e) { return []; @@ -103,17 +103,17 @@ class IOSDevice extends Device { String informerPath = (mockIOS != null) ? mockIOS.informerPath : _checkForCommand('ideviceinfo'); - return runSync([informerPath, '-k', 'DeviceName', '-u', deviceID]).trim(); + return runSync([informerPath, '-k', 'DeviceName', '-u', deviceID]).trim(); } - static final Map _commandMap = {}; + static final Map _commandMap = {}; static String _checkForCommand( String command, [ String macInstructions = _ideviceinstallerInstructions ]) { return _commandMap.putIfAbsent(command, () { try { - command = runCheckedSync(['which', command]).trim(); + command = runCheckedSync(['which', command]).trim(); } catch (e) { if (Platform.isMacOS) { printError('$command not found. $macInstructions'); @@ -128,7 +128,7 @@ class IOSDevice extends Device { @override bool installApp(ApplicationPackage app) { try { - runCheckedSync([installerPath, '-i', app.localPath]); + runCheckedSync([installerPath, '-i', app.localPath]); return true; } catch (e) { return false; @@ -142,7 +142,7 @@ class IOSDevice extends Device { @override bool isAppInstalled(ApplicationPackage app) { try { - String apps = runCheckedSync([installerPath, '--list-apps']); + String apps = runCheckedSync([installerPath, '--list-apps']); if (new RegExp(app.id, multiLine: true).hasMatch(apps)) { return true; } @@ -181,7 +181,7 @@ class IOSDevice extends Device { } // Step 3: Attempt to install the application on the device. - int installationResult = await runCommandAndStreamOutput([ + int installationResult = await runCommandAndStreamOutput([ '/usr/bin/env', 'ios-deploy', '--id', diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index b7fe3a0bba..8d8bffc85e 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -207,7 +207,7 @@ String _getIOSEngineRevision(ApplicationPackage app) { } Future _addServicesToBundle(Directory bundle) async { - List> services = []; + List> services = >[]; printTrace("Trying to resolve native pub services."); // Step 1: Parse the service configuration yaml files present in the service @@ -237,18 +237,18 @@ Future _copyServiceFrameworks(List> services, Director continue; } // Shell out so permissions on the dylib are preserved. - runCheckedSync(['/bin/cp', dylib.path, frameworksDirectory.path]); + runCheckedSync(['/bin/cp', dylib.path, frameworksDirectory.path]); } } void _copyServiceDefinitionsManifest(List> services, File manifest) { printTrace("Creating service definitions manifest at '${manifest.path}'"); - List> jsonServices = services.map((Map service) => { + List> jsonServices = services.map((Map service) => { 'name': service['name'], // Since we have already moved it to the Frameworks directory. Strip away // the directory and basenames. 'framework': path.basenameWithoutExtension(service['ios-framework']) }).toList(); - Map json = { 'services' : jsonServices }; + Map json = { 'services' : jsonServices }; manifest.writeAsStringSync(JSON.encode(json), mode: FileMode.WRITE, flush: true); } diff --git a/packages/flutter_tools/lib/src/ios/setup_xcodeproj.dart b/packages/flutter_tools/lib/src/ios/setup_xcodeproj.dart index 67e82ddfa0..e8d68b1ee7 100644 --- a/packages/flutter_tools/lib/src/ios/setup_xcodeproj.dart +++ b/packages/flutter_tools/lib/src/ios/setup_xcodeproj.dart @@ -36,7 +36,7 @@ bool _inflateXcodeArchive(String directory, List archiveBytes) { dir.createSync(recursive: true); // Unzip the Xcode project into the new empty directory - runCheckedSync(['/usr/bin/unzip', tempFile.path, '-d', dir.path]); + runCheckedSync(['/usr/bin/unzip', tempFile.path, '-d', dir.path]); } catch (error) { printTrace('$error'); return false; diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart index a55a74a518..622dd58c10 100644 --- a/packages/flutter_tools/lib/src/ios/simulators.dart +++ b/packages/flutter_tools/lib/src/ios/simulators.dart @@ -71,7 +71,7 @@ class SimControl { // "template" is but the built-in 'Blank' seems to work. -l causes xcrun to // quit after a time limit without killing the simulator. We quit after // 1 second. - List args = [_xcrunPath, 'instruments', '-w', deviceName, '-t', 'Blank', '-l', '1']; + List args = [_xcrunPath, 'instruments', '-w', deviceName, '-t', 'Blank', '-l', '1']; printTrace(args.join(' ')); runDetached(args); printStatus('Waiting for iOS Simulator to boot...'); @@ -112,7 +112,7 @@ class SimControl { // Create new device String deviceName = '${deviceType.name} $_kFlutterTestDeviceSuffix'; - List args = [_xcrunPath, 'simctl', 'create', deviceName, deviceType.identifier, runtime]; + List args = [_xcrunPath, 'simctl', 'create', deviceName, deviceType.identifier, runtime]; printTrace(args.join(' ')); runCheckedSync(args); @@ -275,11 +275,11 @@ class SimControl { bool _isAnyConnected() => getConnectedDevices().isNotEmpty; void install(String deviceId, String appPath) { - runCheckedSync([_xcrunPath, 'simctl', 'install', deviceId, appPath]); + runCheckedSync([_xcrunPath, 'simctl', 'install', deviceId, appPath]); } void launch(String deviceId, String appIdentifier, [List launchArgs]) { - List args = [_xcrunPath, 'simctl', 'launch', deviceId, appIdentifier]; + List args = [_xcrunPath, 'simctl', 'launch', deviceId, appIdentifier]; if (launchArgs != null) args.addAll(launchArgs); runCheckedSync(args); @@ -508,7 +508,7 @@ class IOSSimulator extends Device { } bool _applicationIsInstalledAndRunning(ApplicationPackage app) { - bool isInstalled = exitsHappy([ + bool isInstalled = exitsHappy([ 'xcrun', 'simctl', 'get_app_container', @@ -516,7 +516,7 @@ class IOSSimulator extends Device { app.id, ]); - bool isRunning = exitsHappy([ + bool isRunning = exitsHappy([ '/usr/bin/killall', 'Runner', ]); diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 71f6dd1c0c..8bc1e5611b 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -74,7 +74,7 @@ abstract class FlutterCommand extends Command { } BuildMode getBuildMode() { - List modeFlags = [argResults['debug'], argResults['profile'], argResults['release']]; + List modeFlags = [argResults['debug'], argResults['profile'], argResults['release']]; if (modeFlags.where((bool flag) => flag).length > 1) throw new UsageException('Only one of --debug, --profile, or --release should be specified.', null); diff --git a/packages/flutter_tools/lib/src/services.dart b/packages/flutter_tools/lib/src/services.dart index f041293bda..63ac3f4c1b 100644 --- a/packages/flutter_tools/lib/src/services.dart +++ b/packages/flutter_tools/lib/src/services.dart @@ -51,7 +51,7 @@ Future parseServiceConfigs( } for (Map service in serviceConfig['services']) { - services.add({ + services.add({ 'root': serviceRoot, 'name': service['name'], 'android-class': service['android-class'], @@ -92,12 +92,12 @@ File generateServiceDefinitions( String dir, List> servicesIn ) { List> services = - servicesIn.map((Map service) => { + servicesIn.map((Map service) => { 'name': service['name'], 'class': service['android-class'] }).toList(); - Map json = { 'services': services }; + Map json = { 'services': services }; File servicesFile = new File(path.join(dir, 'services.json')); servicesFile.writeAsStringSync(JSON.encode(json), mode: FileMode.WRITE, flush: true); return servicesFile; diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart index b890b44214..2d0c0c3908 100644 --- a/packages/flutter_tools/lib/src/test/flutter_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart @@ -23,7 +23,7 @@ const String _kPath = '/runner'; String shellPath; void installHook() { - hack.registerPlatformPlugin([TestPlatform.vm], () => new FlutterPlatform()); + hack.registerPlatformPlugin([TestPlatform.vm], () => new FlutterPlatform()); } class _ServerInfo { @@ -46,7 +46,7 @@ Future<_ServerInfo> _startServer() async { Future _startProcess(String mainPath, { String packages }) { assert(shellPath != null || _kSkyShell != null); // Please provide the path to the shell in the SKY_SHELL environment variable. - return Process.start(shellPath ?? _kSkyShell, [ + return Process.start(shellPath ?? _kSkyShell, [ '--enable-checked-mode', '--non-interactive', '--packages=$packages', diff --git a/packages/flutter_tools/lib/src/toolchain.dart b/packages/flutter_tools/lib/src/toolchain.dart index 92ecb98b24..7c876560ba 100644 --- a/packages/flutter_tools/lib/src/toolchain.dart +++ b/packages/flutter_tools/lib/src/toolchain.dart @@ -29,7 +29,7 @@ class SnapshotCompiler { assert(mainPath != null); assert(snapshotPath != null); - final List args = [ + final List args = [ _path, mainPath, '--packages=${PackageMap.instance.packagesPath}', diff --git a/packages/flutter_tools/test/analyze_duplicate_names_test.dart b/packages/flutter_tools/test/analyze_duplicate_names_test.dart index 26e821853a..0676e25f90 100644 --- a/packages/flutter_tools/test/analyze_duplicate_names_test.dart +++ b/packages/flutter_tools/test/analyze_duplicate_names_test.dart @@ -35,7 +35,9 @@ void main() { AnalyzeCommand command = new AnalyzeCommand(); applyMocksToCommand(command); - return createTestCommandRunner(command).run(['analyze', '--no-current-package', '--no-current-directory', dartFileA.path, dartFileB.path]).then((int code) { + return createTestCommandRunner(command).run( + ['analyze', '--no-current-package', '--no-current-directory', dartFileA.path, dartFileB.path] + ).then((int code) { expect(code, equals(1)); expect(testLogger.errorText, '[warning] The imported libraries \'a.dart\' and \'b.dart\' cannot have the same name \'test\' (${dartFileB.path})\n'); expect(testLogger.statusText, 'Analyzing 2 entry points...\n'); diff --git a/packages/flutter_tools/test/daemon_test.dart b/packages/flutter_tools/test/daemon_test.dart index 793f0b9728..23032e30fd 100644 --- a/packages/flutter_tools/test/daemon_test.dart +++ b/packages/flutter_tools/test/daemon_test.dart @@ -88,7 +88,7 @@ void main() { (Map result) => responses.add(result), notifyingLogger: notifyingLogger ); - commands.add({'id': 0, 'method': 'daemon.shutdown'}); + commands.add({'id': 0, 'method': 'daemon.shutdown'}); return daemon.onExit.then((int code) { expect(code, 0); }); @@ -121,7 +121,7 @@ void main() { (Map result) => responses.add(result), notifyingLogger: notifyingLogger ); - commands.add({'id': 0, 'method': 'device.getDevices'}); + commands.add({'id': 0, 'method': 'device.getDevices'}); Map response = await responses.stream.where(_notEvent).first; expect(response['id'], 0); expect(response['result'], isList); diff --git a/packages/flutter_tools/test/devices.test.dart b/packages/flutter_tools/test/devices.test.dart index 49660c75de..cb2239f523 100644 --- a/packages/flutter_tools/test/devices.test.dart +++ b/packages/flutter_tools/test/devices.test.dart @@ -14,14 +14,14 @@ void main() { group('devices', () { testUsingContext('returns 0 when called', () { DevicesCommand command = new DevicesCommand(); - return createTestCommandRunner(command).run(['list']).then((int code) { + return createTestCommandRunner(command).run(['list']).then((int code) { expect(code, equals(0)); }); }); testUsingContext('no error when no connected devices', () { DevicesCommand command = new DevicesCommand(); - return createTestCommandRunner(command).run(['list']).then((int code) { + return createTestCommandRunner(command).run(['list']).then((int code) { expect(code, equals(0)); expect(testLogger.statusText, contains('No connected devices')); }); diff --git a/packages/flutter_tools/test/drive_test.dart b/packages/flutter_tools/test/drive_test.dart index 4f20623c89..0f7ac54779 100644 --- a/packages/flutter_tools/test/drive_test.dart +++ b/packages/flutter_tools/test/drive_test.dart @@ -60,7 +60,7 @@ void main() { testUsingContext('returns 1 when test file is not found', () { withMockDevice(); - List args = [ + List args = [ 'drive', '--target=/some/app/test/e2e.dart', ]; @@ -84,7 +84,7 @@ void main() { await memFs.file(testApp).writeAsString('main() {}'); await memFs.file(testFile).writeAsString('main() {}'); - List args = [ + List args = [ 'drive', '--target=$testApp', ]; @@ -102,7 +102,7 @@ void main() { useInMemoryFileSystem(cwd: packageDir); String appFile = '/not/in/my/app.dart'; - List args = [ + List args = [ 'drive', '--target=$appFile', ]; @@ -120,7 +120,7 @@ void main() { useInMemoryFileSystem(cwd: packageDir); String appFile = '/my/app/main.dart'; - List args = [ + List args = [ 'drive', '--target=$appFile', ]; @@ -144,7 +144,7 @@ void main() { return new Future.value(0); }); testRunner = expectAsync((List testArgs) { - expect(testArgs, [testFile]); + expect(testArgs, [testFile]); return new Future.value(0); }); appStopper = expectAsync((_) { @@ -155,7 +155,7 @@ void main() { await memFs.file(testApp).writeAsString('main() {}'); await memFs.file(testFile).writeAsString('main() {}'); - List args = [ + List args = [ 'drive', '--target=$testApp', ]; @@ -186,7 +186,7 @@ void main() { await memFs.file(testApp).writeAsString('main() {}'); await memFs.file(testFile).writeAsString('main() {}'); - List args = [ + List args = [ 'drive', '--target=$testApp', ]; @@ -243,7 +243,7 @@ void main() { Device emulator = new MockDevice(); when(emulator.name).thenReturn('new-simulator'); when(IOSSimulatorUtils.instance.getAttachedDevices()) - .thenReturn([emulator]); + .thenReturn([emulator]); Device device = await findTargetDevice(); expect(device.name, 'new-simulator'); diff --git a/packages/flutter_tools/test/install_test.dart b/packages/flutter_tools/test/install_test.dart index a71207de3a..2b0d0b6bd2 100644 --- a/packages/flutter_tools/test/install_test.dart +++ b/packages/flutter_tools/test/install_test.dart @@ -21,7 +21,7 @@ void main() { when(device.installApp(any)).thenReturn(true); testDeviceManager.addDevice(device); - return createTestCommandRunner(command).run(['install']).then((int code) { + return createTestCommandRunner(command).run(['install']).then((int code) { expect(code, equals(0)); }); }); @@ -35,7 +35,7 @@ void main() { when(device.installApp(any)).thenReturn(true); testDeviceManager.addDevice(device); - return createTestCommandRunner(command).run(['install']).then((int code) { + return createTestCommandRunner(command).run(['install']).then((int code) { expect(code, equals(0)); }); }); diff --git a/packages/flutter_tools/test/listen_test.dart b/packages/flutter_tools/test/listen_test.dart index 56bac434a8..fd9eeb8c3d 100644 --- a/packages/flutter_tools/test/listen_test.dart +++ b/packages/flutter_tools/test/listen_test.dart @@ -14,7 +14,7 @@ void main() { testUsingContext('returns 1 when no device is connected', () { ListenCommand command = new ListenCommand(singleRun: true); applyMocksToCommand(command); - return createTestCommandRunner(command).run(['listen']).then((int code) { + return createTestCommandRunner(command).run(['listen']).then((int code) { expect(code, equals(1)); }); }); diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart index f0ac2f0c95..2c4705b907 100644 --- a/packages/flutter_tools/test/src/context.dart +++ b/packages/flutter_tools/test/src/context.dart @@ -108,7 +108,7 @@ class MockDoctor extends Doctor { class MockSimControl extends Mock implements SimControl { MockSimControl() { - when(this.getConnectedDevices()).thenReturn([]); + when(this.getConnectedDevices()).thenReturn([]); } } diff --git a/packages/flutter_tools/test/stop_test.dart b/packages/flutter_tools/test/stop_test.dart index 0e3fc235a8..7effdded98 100644 --- a/packages/flutter_tools/test/stop_test.dart +++ b/packages/flutter_tools/test/stop_test.dart @@ -20,7 +20,7 @@ void main() { MockAndroidDevice device = new MockAndroidDevice(); when(device.stopApp(any)).thenReturn(new Future.value(true)); testDeviceManager.addDevice(device); - return createTestCommandRunner(command).run(['stop']).then((int code) { + return createTestCommandRunner(command).run(['stop']).then((int code) { expect(code, equals(0)); }); }); @@ -32,7 +32,7 @@ void main() { when(device.stopApp(any)).thenReturn(new Future.value(true)); testDeviceManager.addDevice(device); - return createTestCommandRunner(command).run(['stop']).then((int code) { + return createTestCommandRunner(command).run(['stop']).then((int code) { expect(code, equals(0)); }); }); diff --git a/packages/flutter_tools/test/trace_test.dart b/packages/flutter_tools/test/trace_test.dart index e9870679a9..bb14435e1b 100644 --- a/packages/flutter_tools/test/trace_test.dart +++ b/packages/flutter_tools/test/trace_test.dart @@ -14,7 +14,7 @@ void main() { testUsingContext('returns 1 when no Android device is connected', () { TraceCommand command = new TraceCommand(); applyMocksToCommand(command); - return createTestCommandRunner(command).run(['trace']).then((int code) { + return createTestCommandRunner(command).run(['trace']).then((int code) { expect(code, equals(1)); }); }); diff --git a/packages/flutter_tools/tool/daemon_client.dart b/packages/flutter_tools/tool/daemon_client.dart index 31a937c9de..f11fc0f0a9 100644 --- a/packages/flutter_tools/tool/daemon_client.dart +++ b/packages/flutter_tools/tool/daemon_client.dart @@ -16,7 +16,7 @@ Process daemon; // devices: list devices Future main() async { - daemon = await Process.start('dart', ['bin/flutter_tools.dart', 'daemon']); + daemon = await Process.start('dart', ['bin/flutter_tools.dart', 'daemon']); print('daemon process started, pid: ${daemon.pid}'); daemon.stdout @@ -28,15 +28,15 @@ Future main() async { stdout.write('> '); stdin.transform(UTF8.decoder).transform(const LineSplitter()).listen((String line) { if (line == 'version' || line == 'v') { - _send({'method': 'daemon.version'}); + _send({'method': 'daemon.version'}); } else if (line == 'shutdown' || line == 'q') { - _send({'method': 'daemon.shutdown'}); + _send({'method': 'daemon.shutdown'}); } else if (line == 'start') { - _send({'method': 'app.start'}); + _send({'method': 'app.start'}); } else if (line == 'stopAll') { - _send({'method': 'app.stopAll'}); + _send({'method': 'app.stopAll'}); } else if (line == 'devices') { - _send({'method': 'device.getDevices'}); + _send({'method': 'device.getDevices'}); } else { print('command not understood: $line'); }