Google Git
Sign in
flutter/mirrors/flutter/c02b6a8bcf174e5220259f839705afeace151e92^!/./packages/flutter_tools/lib
commit
c02b6a8bcf174e5220259f839705afeace151e92
[log]
author
Alexandre Ardhuin <alexandre.ardhuin@gmail.com>
Fri Feb 02 23:27:29 2018 +0100
committer
GitHub <noreply@github.com>
Fri Feb 02 23:27:29 2018 +0100
tree
b827769227b06f810d698e762fc723acaab6c962
parent
688a571c71a00b136b1f31d54061ab05b1cc30c7 [diff]
some whitespace cleanup (#14443)


diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart
index aef36790..4a2c606 100644
--- a/packages/flutter_tools/lib/src/android/android_device.dart
+++ b/packages/flutter_tools/lib/src/android/android_device.dart

@@ -410,7 +410,7 @@
     cmd = adbCommandForDevice(<String>[
       'shell', 'am', 'start',
       '-a', 'android.intent.action.RUN',
-      '-f', '0x20000000',  // FLAG_ACTIVITY_SINGLE_TOP
+      '-f', '0x20000000', // FLAG_ACTIVITY_SINGLE_TOP
       '--ez', 'enable-background-compilation', 'true',
       '--ez', 'enable-dart-profiling', 'true',
     ]);

diff --git a/packages/flutter_tools/lib/src/android/android_sdk.dart b/packages/flutter_tools/lib/src/android/android_sdk.dart
index 5b178b7..a024d73 100644
--- a/packages/flutter_tools/lib/src/android/android_sdk.dart
+++ b/packages/flutter_tools/lib/src/android/android_sdk.dart

@@ -168,7 +168,7 @@
       return null;
     }
 
-    // Try to find the NDK compiler.  If we can't find it, it's also ok.
+    // Try to find the NDK compiler. If we can't find it, it's also ok.
     final String ndkDir = findNdk(androidHomeDir);
     String ndkCompiler;
     List<String> ndkCompilerArgs;

diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart
index bfe8963..c8060d1 100644
--- a/packages/flutter_tools/lib/src/artifacts.dart
+++ b/packages/flutter_tools/lib/src/artifacts.dart

@@ -114,7 +114,7 @@
   }
 
   @override
-  String getEngineType(TargetPlatform platform, [BuildMode mode]){
+  String getEngineType(TargetPlatform platform, [BuildMode mode]) {
     return fs.path.basename(_getEngineArtifactsPath(platform, mode));
   }
 

diff --git a/packages/flutter_tools/lib/src/base/flags.dart b/packages/flutter_tools/lib/src/base/flags.dart
index a6b750f..429b03c 100644
--- a/packages/flutter_tools/lib/src/base/flags.dart
+++ b/packages/flutter_tools/lib/src/base/flags.dart

@@ -44,7 +44,7 @@
   }
 
   /// `true` iff the given flag/option was either explicitly specified by the
-  /// user at  the command-line or it was defined to have a default value.
+  /// user at the command-line or it was defined to have a default value.
   bool contains(String key) {
     final ArgResults commandResults = _globalResults.command;
     final Iterable<String> options = commandResults?.options;

diff --git a/packages/flutter_tools/lib/src/base/os.dart b/packages/flutter_tools/lib/src/base/os.dart
index a1c7d8a..0d7bb12 100644
--- a/packages/flutter_tools/lib/src/base/os.dart
+++ b/packages/flutter_tools/lib/src/base/os.dart

@@ -166,7 +166,7 @@
     final List<String> lines = result.stdout.trim().split('\n');
     if (all)
       return lines.map((String path) => fs.file(path.trim())).toList();
-    return  <File>[fs.file(lines.first.trim())];
+    return <File>[fs.file(lines.first.trim())];
   }
 
   @override

diff --git a/packages/flutter_tools/lib/src/base/utils.dart b/packages/flutter_tools/lib/src/base/utils.dart
index 96b8b617..b5d096b 100644
--- a/packages/flutter_tools/lib/src/base/utils.dart
+++ b/packages/flutter_tools/lib/src/base/utils.dart

@@ -115,7 +115,7 @@
 /// absolute path.
 String getDisplayPath(String fullPath) {
   final String cwd = fs.currentDirectory.path + fs.path.separator;
-  return fullPath.startsWith(cwd) ?  fullPath.substring(cwd.length) : fullPath;
+  return fullPath.startsWith(cwd) ? fullPath.substring(cwd.length) : fullPath;
 }
 
 /// A class to maintain a list of items, fire events when items are added or
@@ -207,7 +207,7 @@
       '${_bitsDigits(16, 4)}${_bitsDigits(16, 4)}-'
           '${_bitsDigits(16, 4)}-'
           '4${_bitsDigits(12, 3)}-'
-          '${_printDigits(special,  1)}${_bitsDigits(12, 3)}-'
+          '${_printDigits(special, 1)}${_bitsDigits(12, 3)}-'
           '${_bitsDigits(16, 4)}${_bitsDigits(16, 4)}${_bitsDigits(16, 4)}';
   }
 

diff --git a/packages/flutter_tools/lib/src/build_info.dart b/packages/flutter_tools/lib/src/build_info.dart
index 8ed2b77..08d0d5e 100644
--- a/packages/flutter_tools/lib/src/build_info.dart
+++ b/packages/flutter_tools/lib/src/build_info.dart

@@ -29,7 +29,7 @@
 
   // Whether build should be done using Dart2 Frontend parser.
   final bool previewDart2;
-  
+
   // Whether build should use strong mode semantics.
   final bool strongMode;
 

diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
index 62083ac..81299b6 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart

@@ -236,7 +236,7 @@
   String get version => cache.getVersionFor(name);
 
   /// Keep track of the files we've downloaded for this execution so we
-  /// can delete them after completion.  We don't delete them right after
+  /// can delete them after completion. We don't delete them right after
   /// extraction in case [update] is interrupted, so we can restart without
   /// starting from scratch.
   final List<File> _downloadedFiles = <File>[];

diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart
index dd60d4d..59715d2 100644
--- a/packages/flutter_tools/lib/src/commands/build_aot.dart
+++ b/packages/flutter_tools/lib/src/commands/build_aot.dart

@@ -306,8 +306,8 @@
       }
       if (platform == TargetPlatform.android_arm) {
         genSnapshotCmd.addAll(<String>[
-          '--no-sim-use-hardfp',  // Android uses the softfloat ABI.
-          '--no-use-integer-division',  // Not supported by the Pixel in 32-bit mode.
+          '--no-sim-use-hardfp', // Android uses the softfloat ABI.
+          '--no-use-integer-division', // Not supported by the Pixel in 32-bit mode.
         ]);
       }
       break;
@@ -449,9 +449,9 @@
   } else {
     if (compileToSharedLibrary) {
       // A word of warning: Instead of compiling via two steps, to a .o file and
-      // then to a .so file we use only one command.  When using two commands
+      // then to a .so file we use only one command. When using two commands
       // gcc will end up putting a .eh_frame and a .debug_frame into the shared
-      // library.  Without stripping .debug_frame afterwards, unwinding tools
+      // library. Without stripping .debug_frame afterwards, unwinding tools
       // based upon libunwind use just one and ignore the contents of the other
       // (which causes it to not look into the other section and therefore not
       // find the correct unwinding information).

diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart
index 67d8a18..70ae24b 100644
--- a/packages/flutter_tools/lib/src/commands/build_apk.dart
+++ b/packages/flutter_tools/lib/src/commands/build_apk.dart

@@ -15,8 +15,8 @@
     usesPubOption();
 
     argParser
-      ..addFlag('preview-dart-2', negatable: false,  hide: !verboseHelp)
-      ..addFlag('strong', negatable: false,  hide: !verboseHelp)
+      ..addFlag('preview-dart-2', negatable: false, hide: !verboseHelp)
+      ..addFlag('strong', negatable: false, hide: !verboseHelp)
       ..addFlag('prefer-shared-library', negatable: false,
           help: 'Whether to prefer compiling to a *.so file (android only).')
       ..addOption('target-platform',

diff --git a/packages/flutter_tools/lib/src/commands/devices.dart b/packages/flutter_tools/lib/src/commands/devices.dart
index 242aab9..1c8ef4e 100644
--- a/packages/flutter_tools/lib/src/commands/devices.dart
+++ b/packages/flutter_tools/lib/src/commands/devices.dart

@@ -39,7 +39,7 @@
         printStatus('');
         for (String diagnostic in diagnostics) {
           printStatus('• ${diagnostic.replaceAll('\n', '\n  ')}');
-        }        
+        }
       }
     } else {
       printStatus('${devices.length} connected ${pluralize('device', devices.length)}:\n');

diff --git a/packages/flutter_tools/lib/src/commands/ide_config.dart b/packages/flutter_tools/lib/src/commands/ide_config.dart
index 1a7ee40..269674e 100644
--- a/packages/flutter_tools/lib/src/commands/ide_config.dart
+++ b/packages/flutter_tools/lib/src/commands/ide_config.dart

@@ -96,7 +96,7 @@
       return false;
     }
 
-    // Test byte by byte.  We're assuming that these are small files.
+    // Test byte by byte. We're assuming that these are small files.
     final List<int> srcBytes = src.readAsBytesSync();
     final List<int> destBytes = dest.readAsBytesSync();
     for (int i = 0; i < srcBytes.length; ++i) {

diff --git a/packages/flutter_tools/lib/src/commands/packages.dart b/packages/flutter_tools/lib/src/commands/packages.dart
index 42302a7..44aafbc 100644
--- a/packages/flutter_tools/lib/src/commands/packages.dart
+++ b/packages/flutter_tools/lib/src/commands/packages.dart

@@ -102,7 +102,7 @@
   }
 
   @override
-  Future<Null> runCommand() => pub(<String>['run', 'test']..addAll(argResults.rest), context:  PubContext.runTest, retry: false);
+  Future<Null> runCommand() => pub(<String>['run', 'test']..addAll(argResults.rest), context: PubContext.runTest, retry: false);
 }
 
 class PackagesPassthroughCommand extends FlutterCommand {

diff --git a/packages/flutter_tools/lib/src/crash_reporting.dart b/packages/flutter_tools/lib/src/crash_reporting.dart
index d2ab0b1..21caa67 100644
--- a/packages/flutter_tools/lib/src/crash_reporting.dart
+++ b/packages/flutter_tools/lib/src/crash_reporting.dart

@@ -87,7 +87,7 @@
       req.fields['product'] = _kProductId;
       req.fields['version'] = flutterVersion;
       req.fields['osName'] = platform.operatingSystem;
-      req.fields['osVersion'] = os.name;  // this actually includes version
+      req.fields['osVersion'] = os.name; // this actually includes version
       req.fields['type'] = _kDartTypeId;
       req.fields['error_runtime_type'] = '${error.runtimeType}';
 

diff --git a/packages/flutter_tools/lib/src/dart/sdk.dart b/packages/flutter_tools/lib/src/dart/sdk.dart
index b0cd984..b1af8d9 100644
--- a/packages/flutter_tools/lib/src/dart/sdk.dart
+++ b/packages/flutter_tools/lib/src/dart/sdk.dart

@@ -15,7 +15,7 @@
 const List<String> dartVmFlags = const <String>[];
 
 /// Return the platform specific name for the given Dart SDK binary. So, `pub`
-/// ==> `pub.bat`.  The default SDK location can be overridden with a specified
+/// ==> `pub.bat`. The default SDK location can be overridden with a specified
 /// [sdkLocation].
 String sdkBinaryName(String name, { String sdkLocation }) {
   return fs.path.absolute(fs.path.join(sdkLocation ?? dartSdkPath, 'bin', platform.isWindows ? '$name.bat' : name));

diff --git a/packages/flutter_tools/lib/src/flutter_manifest.dart b/packages/flutter_tools/lib/src/flutter_manifest.dart
index 81c5610..03cd721 100644
--- a/packages/flutter_tools/lib/src/flutter_manifest.dart
+++ b/packages/flutter_tools/lib/src/flutter_manifest.dart

@@ -12,7 +12,7 @@
 import 'cache.dart';
 import 'globals.dart';
 
-/// A wrapper around the `flutter` section in the  `pubspec.yaml` file.
+/// A wrapper around the `flutter` section in the `pubspec.yaml` file.
 class FlutterManifest {
   FlutterManifest._();
 

diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart
index 039f440..82ea083 100644
--- a/packages/flutter_tools/lib/src/run_hot.dart
+++ b/packages/flutter_tools/lib/src/run_hot.dart

@@ -452,7 +452,7 @@
     } else {
       final bool reloadOnTopOfSnapshot = _runningFromSnapshot;
       final String progressPrefix = reloadOnTopOfSnapshot ? 'Initializing' : 'Performing';
-      final Status status =  logger.startProgress(
+      final Status status = logger.startProgress(
         '$progressPrefix hot reload...',
         progressId: 'hot.reload'
       );

diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index 3907599..aafc205 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart

@@ -163,7 +163,7 @@
     final bool previewDart2 = argParser.options.containsKey('preview-dart-2')
         ? argResults['preview-dart-2']
         : false;
-    final bool strongMode =  argParser.options.containsKey('strong')
+    final bool strongMode = argParser.options.containsKey('strong')
         ? argResults['strong']
         : false;
     if (strongMode == true && previewDart2 == false) {
@@ -404,7 +404,7 @@
     final bool previewDart2 = argParser.options.containsKey('preview-dart-2')
         ? argResults['preview-dart-2']
         : false;
-    final bool strongMode =  argParser.options.containsKey('strong')
+    final bool strongMode = argParser.options.containsKey('strong')
         ? argResults['strong']
         : false;
     if (strongMode == true && previewDart2 == false) {

diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart
index 8f16dce..7794ebc 100644
--- a/packages/flutter_tools/lib/src/version.dart
+++ b/packages/flutter_tools/lib/src/version.dart

@@ -162,7 +162,7 @@
   static Future<Null> _removeVersionCheckRemoteIfExists() async {
     final List<String> remotes = (await _run(<String>['git', 'remote']))
         .split('\n')
-        .map((String name) => name.trim())  // to account for OS-specific line-breaks
+        .map((String name) => name.trim()) // to account for OS-specific line-breaks
         .toList();
     if (remotes.contains(_kVersionCheckRemote))
       await _run(<String>['git', 'remote', 'remove', _kVersionCheckRemote]);

diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart
index a5c45aa..f258e9b 100644
--- a/packages/flutter_tools/lib/src/vmservice.dart
+++ b/packages/flutter_tools/lib/src/vmservice.dart

@@ -547,7 +547,7 @@
   VMService get vmService => null;
 
   /// Builds a [ServiceObject] corresponding to the [id] from [map].
-  /// The result may come from the cache.  The result will not necessarily
+  /// The result may come from the cache. The result will not necessarily
   /// be [loaded].
   ServiceObject getFromMap(Map<String, dynamic> map);
 }
@@ -1171,7 +1171,7 @@
 
   Future<Map<String, dynamic>> flutterTogglePerformanceOverlayOverride() => _flutterToggle('showPerformanceOverlay');
 
-  Future<Map<String, dynamic>> flutterToggleWidgetInspector()  => _flutterToggle('debugWidgetInspector');
+  Future<Map<String, dynamic>> flutterToggleWidgetInspector() => _flutterToggle('debugWidgetInspector');
 
   Future<Null> flutterDebugAllowBanner(bool show) async {
     await invokeFlutterExtensionRpcRaw(