CLI cleanup.

pkg/analyzer_cli/lib/src/driver.dart

Index: pkg/analyzer_cli/lib/src/driver.dart
diff --git a/pkg/analyzer_cli/lib/src/driver.dart b/pkg/analyzer_cli/lib/src/driver.dart
index 51efd83faf2d95b7e5b8fd6cd6963baf374ae37f..577c15d6104084a7a781eda02047e319db1a9686 100644
--- a/pkg/analyzer_cli/lib/src/driver.dart
+++ b/pkg/analyzer_cli/lib/src/driver.dart
@@ -8,7 +8,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:analyzer/file_system/file_system.dart' as fileSystem;
+import 'package:analyzer/file_system/file_system.dart' as file_system;
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/plugin/embedded_resolver_provider.dart';
 import 'package:analyzer/plugin/options.dart';
@@ -41,7 +41,7 @@ import 'package:analyzer_cli/src/options.dart';
 import 'package:analyzer_cli/src/perf_report.dart';
 import 'package:analyzer_cli/starter.dart';
 import 'package:linter/src/plugin/linter_plugin.dart';
-import 'package:package_config/discovery.dart' as pkgDiscovery;
+import 'package:package_config/discovery.dart' as pkg_discovery;
 import 'package:package_config/packages.dart' show Packages;
 import 'package:package_config/packages_file.dart' as pkgfile show parse;
 import 'package:package_config/src/packages_impl.dart' show MapPackages;
@@ -104,7 +104,7 @@ class Driver implements CommandLineStarter {
   AnalysisContext get context => _context;
 
   @override
-  void set userDefinedPlugins(List<Plugin> plugins) {
+  set userDefinedPlugins(List<Plugin> plugins) {

[Brian Wilkerson, 2016/05/18 14:42:19]

Personally, I like having "void" for setters. I know that it's five whole extra
characters, but when you follow the rule that everything should be type
annotated, then "void" visually fills in the space where a type would have been
and I find it easier to visually scan the code.

(I don't expect you to agree with me or change this, but wanted you to know that
I disagree with that rule that says that it should be removed so that you
wouldn't take my lgtm to be approval of this kind of change.)

[pquitslund, 2016/05/18 17:26:40]

Got it.  It should come as no surprise that I tend to prefer eliding the
(gratuitous) void but that hardly matters.  Consistency is far more important. 
Changing back.

     _userDefinedPlugins = plugins ?? <Plugin>[];
   }
 
@@ -331,10 +331,10 @@ class Driver implements CommandLineStarter {
   /// [options] and [customUrlMappings] settings, and return a
   /// [SourceFactory] that has been configured accordingly.
   SourceFactory _chooseUriResolutionPolicy(CommandLineOptions options,
-      Map<fileSystem.Folder, YamlMap> embedderMap, _PackageInfo packageInfo) {
+      Map<file_system.Folder, YamlMap> embedderMap, _PackageInfo packageInfo) {
     // Create a custom package resolver if one has been specified.
     if (packageResolverProvider != null) {
-      fileSystem.Folder folder =
+      file_system.Folder folder =
           PhysicalResourceProvider.INSTANCE.getResource('.');
       UriResolver resolver = packageResolverProvider(folder);
       if (resolver != null) {
@@ -373,11 +373,11 @@ class Driver implements CommandLineStarter {
         // Fall back to pub list-package-dirs.
         PubPackageMapProvider pubPackageMapProvider =
             new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
-        fileSystem.Resource cwd =
+        file_system.Resource cwd =
             PhysicalResourceProvider.INSTANCE.getResource('.');
         PackageMapInfo packageMapInfo =
             pubPackageMapProvider.computePackageMap(cwd);
-        Map<String, List<fileSystem.Folder>> packageMap =
+        Map<String, List<file_system.Folder>> packageMap =
             packageMapInfo.packageMap;
 
         // Only create a packageUriResolver if pub list-package-dirs succeeded.
@@ -492,7 +492,7 @@ class Driver implements CommandLineStarter {
     _PackageInfo packageInfo = _findPackages(options);
 
     // Process embedders.
-    Map<fileSystem.Folder, YamlMap> embedderMap =
+    Map<file_system.Folder, YamlMap> embedderMap =
         _findEmbedders(packageInfo.packageMap);
 
     // Scan for SDK extenders.
@@ -515,7 +515,7 @@ class Driver implements CommandLineStarter {
   /// Return discovered packagespec, or `null` if none is found.
   Packages _discoverPackagespec(Uri root) {
     try {
-      Packages packages = pkgDiscovery.findPackagesFromFile(root);
+      Packages packages = pkg_discovery.findPackagesFromFile(root);
       if (packages != Packages.noPackages) {
         return packages;
       }
@@ -526,8 +526,8 @@ class Driver implements CommandLineStarter {
     return null;
   }
 
-  Map<fileSystem.Folder, YamlMap> _findEmbedders(
-      Map<String, List<fileSystem.Folder>> packageMap) {
+  Map<file_system.Folder, YamlMap> _findEmbedders(
+      Map<String, List<file_system.Folder>> packageMap) {
     EmbedderYamlLocator locator =
         (_context as InternalAnalysisContext).embedderYamlLocator;
     locator.refresh(packageMap);
@@ -541,7 +541,7 @@ class Driver implements CommandLineStarter {
     }
 
     Packages packages;
-    Map<String, List<fileSystem.Folder>> packageMap;
+    Map<String, List<file_system.Folder>> packageMap;
 
     if (options.packageConfigPath != null) {
       String packageConfigPath = options.packageConfigPath;
@@ -560,7 +560,7 @@ class Driver implements CommandLineStarter {
       packageMap = _PackageRootPackageMapBuilder
           .buildPackageMap(options.packageRootPath);
     } else {
-      fileSystem.Resource cwd =
+      file_system.Resource cwd =
           PhysicalResourceProvider.INSTANCE.getResource('.');
       // Look for .packages.
       packages = _discoverPackagespec(new Uri.directory(cwd.path));
@@ -570,13 +570,13 @@ class Driver implements CommandLineStarter {
     return new _PackageInfo(packages, packageMap);
   }
 
-  Map<String, List<fileSystem.Folder>> _getPackageMap(Packages packages) {
+  Map<String, List<file_system.Folder>> _getPackageMap(Packages packages) {
     if (packages == null) {
       return null;
     }
 
-    Map<String, List<fileSystem.Folder>> folderMap =
-        new Map<String, List<fileSystem.Folder>>();
+    Map<String, List<file_system.Folder>> folderMap =
+        new Map<String, List<file_system.Folder>>();
     packages.asMap().forEach((String packagePath, Uri uri) {
       folderMap[packagePath] = [
         PhysicalResourceProvider.INSTANCE.getFolder(path.fromUri(uri))
@@ -585,11 +585,11 @@ class Driver implements CommandLineStarter {
     return folderMap;
   }
 
-  bool _hasSdkExt(Iterable<List<fileSystem.Folder>> folders) {
+  bool _hasSdkExt(Iterable<List<file_system.Folder>> folders) {
     if (folders != null) {
       //TODO: ideally share this traversal with SdkExtUriResolver
-      for (Iterable<fileSystem.Folder> libDirs in folders) {
-        if (libDirs.any((fileSystem.Folder libDir) =>
+      for (Iterable<file_system.Folder> libDirs in folders) {
+        if (libDirs.any((file_system.Folder libDir) =>
             libDir.getChild(SdkExtUriResolver.SDK_EXT_NAME).exists)) {
           return true;
         }
@@ -669,7 +669,7 @@ class Driver implements CommandLineStarter {
       CommandLineOptions options,
       void configureContextOptions(AnalysisOptionsImpl contextOptions)) {
     Map<String, String> definedVariables = options.definedVariables;
-    if (!definedVariables.isEmpty) {
+    if (definedVariables.isNotEmpty) {
       DeclaredVariables declaredVariables = context.declaredVariables;
       definedVariables.forEach((String variableName, String value) {
         declaredVariables.define(variableName, value);
@@ -705,8 +705,8 @@ class Driver implements CommandLineStarter {
     return true;
   }
 
-  static fileSystem.File _getOptionsFile(CommandLineOptions options) {
-    fileSystem.File file;
+  static file_system.File _getOptionsFile(CommandLineOptions options) {
+    file_system.File file;
     String filePath = options.analysisOptionsFile;
     if (filePath != null) {
       file = PhysicalResourceProvider.INSTANCE.getFile(filePath);
@@ -731,7 +731,7 @@ class Driver implements CommandLineStarter {
 
   static void _processAnalysisOptions(
       AnalysisContext context, CommandLineOptions options) {
-    fileSystem.File file = _getOptionsFile(options);
+    file_system.File file = _getOptionsFile(options);
     List<OptionsProcessor> optionsProcessors =
         AnalysisEngine.instance.optionsPlugin.optionsProcessors;
     try {
@@ -823,7 +823,7 @@ class _DriverError implements Exception {
 
 class _PackageInfo {
   Packages packages;
-  Map<String, List<fileSystem.Folder>> packageMap;
+  Map<String, List<file_system.Folder>> packageMap;
   _PackageInfo(this.packages, this.packageMap);
 }
 
@@ -833,7 +833,7 @@ class _PackageInfo {
 /// [_PackageRootPackageMapBuilder] creates a simple mapping from package name
 /// to full path on disk (resolving any symbolic links).
 class _PackageRootPackageMapBuilder {
-  static Map<String, List<fileSystem.Folder>> buildPackageMap(
+  static Map<String, List<file_system.Folder>> buildPackageMap(
       String packageRootPath) {
     var packageRoot = new Directory(packageRootPath);
     if (!packageRoot.existsSync()) {
@@ -841,7 +841,7 @@ class _PackageRootPackageMapBuilder {
           'Package root directory ($packageRootPath) does not exist.');
     }
     var packages = packageRoot.listSync(followLinks: false);
-    var result = new Map<String, List<fileSystem.Folder>>();
+    var result = new Map<String, List<file_system.Folder>>();
     for (var package in packages) {
       var packageName = path.basename(package.path);
       var realPath = package.resolveSymbolicLinksSync();