languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-05 06:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLI cleanup.

Browse source 
A little linting.

BUG=
R=brianwilkerson@google.com

Review URL: https://codereview.chromium.org/1986943002 .
This commit is contained in:
pq 2016-05-18 10:30:09 -07:00
parent 54350526b9
commit ff857f1b71
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/analyzer_cli/lib/src/build_mode.dart
View file

@ -62,6 +62,7 @@ class AnalyzerWorkerLoop extends SyncWorkerLoop {
/**
* Perform a single loop step.
*/
@override
WorkResponse performRequest(WorkRequest request) {
errorBuffer.clear();
outBuffer.clear();

50
pkg/analyzer_cli/lib/src/driver.dart
View file

@ -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<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();