Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: pkg/analyzer_cli/lib/src/boot_loader.dart

Issue 1975963002: Support the name analysis_options.yaml for analysis options files (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analyzer_cli/lib/src/boot_loader.dart
diff --git a/pkg/analyzer_cli/lib/src/boot_loader.dart b/pkg/analyzer_cli/lib/src/boot_loader.dart
index 6df71aea969ab71e8b378bc2155eba60c87cccf6..5b03f40ad6e4b0b513fe692f10c72f87f11af115 100644
--- a/pkg/analyzer_cli/lib/src/boot_loader.dart
+++ b/pkg/analyzer_cli/lib/src/boot_loader.dart
@@ -7,6 +7,7 @@ library analyzer_cli.src.boot_loader;
import 'dart:async';
import 'dart:isolate';
+import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/file_system/physical_file_system.dart';
import 'package:analyzer/source/analysis_options_provider.dart';
import 'package:analyzer/src/context/context.dart';
@@ -108,7 +109,7 @@ class BootLoader {
errorSink.writeln('Plugin configuration skipped: $details');
};
- /// Reads plugin config info from `.analysis_options`.
+ /// Reads plugin config info from the analysis options file.
PluginConfigOptionsProcessor _pluginOptionsProcessor =
new PluginConfigOptionsProcessor(_pluginConfigErrorHandler);
@@ -126,12 +127,26 @@ class BootLoader {
args: args, packageRootPath: options.packageRootPath);
}
- void _processAnalysisOptions(CommandLineOptions options) {
+ File _getOptionsFile(
+ CommandLineOptions options, ResourceProvider resourceProvider) {
+ String analysisOptionsFile = options.analysisOptionsFile;
+ if (analysisOptionsFile != null) {
+ return resourceProvider.getFile(analysisOptionsFile);
+ }
+ File file =
+ resourceProvider.getFile(engine.AnalysisEngine.ANALYSIS_OPTIONS_FILE);
+ if (!file.exists) {
+ file = resourceProvider
+ .getFile(engine.AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE);
+ }
+ return file;
+ }
+
+ void _processAnalysisOptions(CommandLineOptions commandLineOptions) {
// Determine options file path.
- var filePath = options.analysisOptionsFile ??
- engine.AnalysisEngine.ANALYSIS_OPTIONS_FILE;
try {
- var file = PhysicalResourceProvider.INSTANCE.getFile(filePath);
+ File file = _getOptionsFile(
+ commandLineOptions, PhysicalResourceProvider.INSTANCE);
AnalysisOptionsProvider analysisOptionsProvider =
new AnalysisOptionsProvider();
Map<String, YamlNode> options =

Powered by Google App Engine
This is Rietveld 408576698