From ff857f1b71cec9716066e4ec089be2b48b7b48c0 Mon Sep 17 00:00:00 2001 From: pq Date: Wed, 18 May 2016 10:30:09 -0700 Subject: [PATCH] CLI cleanup. A little linting. BUG= R=brianwilkerson@google.com Review URL: https://codereview.chromium.org/1986943002 . --- pkg/analyzer_cli/lib/src/build_mode.dart | 1 + pkg/analyzer_cli/lib/src/driver.dart | 50 ++++++++++++------------ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/pkg/analyzer_cli/lib/src/build_mode.dart b/pkg/analyzer_cli/lib/src/build_mode.dart index 98f98d1062a..f6b3ddde3c7 100644 --- a/pkg/analyzer_cli/lib/src/build_mode.dart +++ b/pkg/analyzer_cli/lib/src/build_mode.dart @@ -62,6 +62,7 @@ class AnalyzerWorkerLoop extends SyncWorkerLoop { /** * Perform a single loop step. */ + @override WorkResponse performRequest(WorkRequest request) { errorBuffer.clear(); outBuffer.clear(); diff --git a/pkg/analyzer_cli/lib/src/driver.dart b/pkg/analyzer_cli/lib/src/driver.dart index 51efd83faf2..4d80c619888 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; @@ -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 embedderMap, _PackageInfo packageInfo) { + Map 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> packageMap = + Map> 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 embedderMap = + Map 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 _findEmbedders( - Map> packageMap) { + Map _findEmbedders( + Map> packageMap) { EmbedderYamlLocator locator = (_context as InternalAnalysisContext).embedderYamlLocator; locator.refresh(packageMap); @@ -541,7 +541,7 @@ class Driver implements CommandLineStarter { } Packages packages; - Map> packageMap; + Map> 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> _getPackageMap(Packages packages) { + Map> _getPackageMap(Packages packages) { if (packages == null) { return null; } - Map> folderMap = - new Map>(); + Map> folderMap = + new Map>(); 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> folders) { + bool _hasSdkExt(Iterable> folders) { if (folders != null) { //TODO: ideally share this traversal with SdkExtUriResolver - for (Iterable libDirs in folders) { - if (libDirs.any((fileSystem.Folder libDir) => + for (Iterable 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 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 optionsProcessors = AnalysisEngine.instance.optionsPlugin.optionsProcessors; try { @@ -823,7 +823,7 @@ class _DriverError implements Exception { class _PackageInfo { Packages packages; - Map> packageMap; + Map> 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> buildPackageMap( + static Map> 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>(); + var result = new Map>(); for (var package in packages) { var packageName = path.basename(package.path); var realPath = package.resolveSymbolicLinksSync();