Remove the --package-default-analysis-options flag.
Change-Id: If36ee3478d8c95c38ff2cd5ed43f4dc3cdfe973e
Reviewed-on: https://dart-review.googlesource.com/60442
Commit-Queue: Devon Carew <devoncarew@google.com>
Reviewed-by: Dan Rubel <danrubel@google.com>
diff --git a/pkg/analyzer/lib/src/command_line/arguments.dart b/pkg/analyzer/lib/src/command_line/arguments.dart
index 263d250..a0a3140 100644
--- a/pkg/analyzer/lib/src/command_line/arguments.dart
+++ b/pkg/analyzer/lib/src/command_line/arguments.dart
@@ -27,7 +27,6 @@
const String implicitCastsFlag = 'implicit-casts';
const String lintsFlag = 'lints';
const String noImplicitDynamicFlag = 'no-implicit-dynamic';
-const String packageDefaultAnalysisOptions = 'package-default-analysis-options';
const String packageRootOption = 'package-root';
const String packagesOption = 'packages';
const String sdkPathOption = 'dart-sdk';
@@ -94,11 +93,6 @@
builderOptions.defaultPackageFilePath = args[packagesOption];
builderOptions.defaultPackagesDirectoryPath = args[packageRootOption];
//
- // Flags.
- //
- builderOptions.packageDefaultAnalysisOptions =
- args[packageDefaultAnalysisOptions];
- //
// Analysis options.
//
AnalysisOptionsImpl defaultOptions = new AnalysisOptionsImpl();
@@ -200,17 +194,6 @@
help: 'Define environment variables. For example, "-Dfoo=bar" defines an '
'environment variable named "foo" whose value is "bar".',
hide: hide);
- parser.addFlag(packageDefaultAnalysisOptions,
- help: 'If an analysis options file is not explicitly specified '
- 'via the "--$analysisOptionsFileOption" option\n'
- 'and an analysis options file cannot be found '
- 'in the project directory or any parent directory,\n'
- 'then look for analysis options in the following locations:\n'
- '- $flutterAnalysisOptionsPath\n'
- '- $bazelAnalysisOptionsPath',
- defaultsTo: true,
- negatable: true,
- hide: hide);
parser.addOption(packagesOption,
help: 'The path to the package resolution configuration file, which '
'supplies a mapping of package names\nto paths. This option cannot be '
diff --git a/pkg/analyzer/lib/src/context/builder.dart b/pkg/analyzer/lib/src/context/builder.dart
index e967809..e346ba6 100644
--- a/pkg/analyzer/lib/src/context/builder.dart
+++ b/pkg/analyzer/lib/src/context/builder.dart
@@ -452,28 +452,26 @@
verbose('Exception: $e\n when loading ${optionsFile.path}');
}
} else {
- // Search for the default analysis options
- // unless explicitly directed not to do so.
+ // Search for the default analysis options.
+ // TODO(danrubel) determine if bazel or gn project depends upon flutter
Source source;
- if (builderOptions.packageDefaultAnalysisOptions) {
- // TODO(danrubel) determine if bazel or gn project depends upon flutter
- if (workspace.hasFlutterDependency) {
- source = sourceFactory.forUri(flutterAnalysisOptionsPath);
- }
- if (source == null || !source.exists()) {
- source = sourceFactory.forUri(bazelAnalysisOptionsPath);
- }
- if (source != null && source.exists()) {
- try {
- optionMap = optionsProvider.getOptionsFromSource(source);
- if (contextRoot != null) {
- contextRoot.optionsFilePath = source.fullName;
- }
- verbose('Loaded analysis options from ${source.fullName}');
- } catch (e) {
- // Ignore exceptions thrown while trying to load the options file.
- verbose('Exception: $e\n when loading ${source.fullName}');
+ if (workspace.hasFlutterDependency) {
+ source = sourceFactory.forUri(flutterAnalysisOptionsPath);
+ }
+ if (source == null || !source.exists()) {
+ source = sourceFactory.forUri(bazelAnalysisOptionsPath);
+ }
+
+ if (source != null && source.exists()) {
+ try {
+ optionMap = optionsProvider.getOptionsFromSource(source);
+ if (contextRoot != null) {
+ contextRoot.optionsFilePath = source.fullName;
}
+ verbose('Loaded analysis options from ${source.fullName}');
+ } catch (e) {
+ // Ignore exceptions thrown while trying to load the options file.
+ verbose('Exception: $e\n when loading ${source.fullName}');
}
}
}
@@ -693,11 +691,6 @@
String defaultPackagesDirectoryPath;
/**
- * Allow Flutter and bazel default analysis options to be used.
- */
- bool packageDefaultAnalysisOptions = true;
-
- /**
* Initialize a newly created set of options
*/
ContextBuilderOptions();
diff --git a/pkg/analyzer/test/src/command_line/arguments_test.dart b/pkg/analyzer/test/src/command_line/arguments_test.dart
index 1d9afa9..8cbef81 100644
--- a/pkg/analyzer/test/src/command_line/arguments_test.dart
+++ b/pkg/analyzer/test/src/command_line/arguments_test.dart
@@ -154,7 +154,7 @@
void test_defineAnalysisArguments() {
ArgParser parser = new ArgParser();
defineAnalysisArguments(parser);
- expect(parser.options, hasLength(14));
+ expect(parser.options, hasLength(13));
}
void test_extractDefinedVariables() {
diff --git a/pkg/analyzer/test/src/context/builder_test.dart b/pkg/analyzer/test/src/context/builder_test.dart
index 558578c..94e546b 100644
--- a/pkg/analyzer/test/src/context/builder_test.dart
+++ b/pkg/analyzer/test/src/context/builder_test.dart
@@ -707,35 +707,6 @@
_expectEqualOptions(options, expected);
}
- void test_getAnalysisOptions_default_flutter_disabled() {
- _defineMockLintRules();
- ArgParser argParser = new ArgParser();
- defineAnalysisArguments(argParser);
- ArgResults argResults =
- argParser.parse(['--no-$packageDefaultAnalysisOptions']);
-
- builderOptions = createContextBuilderOptions(argResults);
- expect(builderOptions.packageDefaultAnalysisOptions, isFalse);
- builder = new ContextBuilder(resourceProvider, sdkManager, contentCache,
- options: builderOptions);
-
- AnalysisOptionsImpl expected = new AnalysisOptionsImpl();
-
- String packagesFilePath =
- resourceProvider.convertPath('/some/directory/path/.packages');
- createFile(packagesFilePath, 'flutter:/pkg/flutter/lib/');
- String optionsFilePath = resourceProvider
- .convertPath('/pkg/flutter/lib/analysis_options_user.yaml');
- createFile(optionsFilePath, '''
-linter:
- rules:
- - mock_lint_rule
-''');
- String projPath = resourceProvider.convertPath('/some/directory/path');
- AnalysisOptions options = builder.getAnalysisOptions(projPath);
- _expectEqualOptions(options, expected);
- }
-
void test_getAnalysisOptions_default_noOverrides() {
AnalysisOptionsImpl defaultOptions = new AnalysisOptionsImpl();
defaultOptions.enableLazyAssignmentOperators = true;
@@ -788,7 +759,6 @@
defineAnalysisArguments(argParser);
ArgResults argResults = argParser.parse([]);
builderOptions = createContextBuilderOptions(argResults);
- expect(builderOptions.packageDefaultAnalysisOptions, isTrue);
builder = new ContextBuilder(resourceProvider, sdkManager, contentCache,
options: builderOptions);
AnalysisOptionsImpl expected = new AnalysisOptionsImpl();
