Chromium Code Reviews| 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 680b6b3af76ccf6309159b05140be4ce5dea5ff6..e0aa9347fb8d6db59135d2d61943b59e1a3b317f 100644 |
| --- a/pkg/analyzer_cli/lib/src/driver.dart |
| +++ b/pkg/analyzer_cli/lib/src/driver.dart |
| @@ -54,6 +54,8 @@ import 'package:telemetry/crash_reporting.dart'; |
| import 'package:telemetry/telemetry.dart' as telemetry; |
| import 'package:yaml/yaml.dart'; |
| +const _analyticsID = 'UA-26406144-28'; |
| + |
| /// Shared IO sink for standard error reporting. |
| @visibleForTesting |
| StringSink errorSink = io.stderr; |
| @@ -62,20 +64,18 @@ StringSink errorSink = io.stderr; |
| @visibleForTesting |
| StringSink outSink = io.stdout; |
| -/// Test this option map to see if it specifies lint rules. |
| -bool containsLintRuleEntry(Map<String, YamlNode> options) { |
| - var linterNode = options['linter']; |
| - return linterNode is YamlMap && linterNode.containsKey('rules'); |
| -} |
| - |
| telemetry.Analytics _analytics; |
| -const _analyticsID = 'UA-26406144-28'; |
| - |
| /// The analytics instance for analyzer-cli. |
| telemetry.Analytics get analytics => (_analytics ??= |
| telemetry.createAnalyticsInstance(_analyticsID, 'analyzer-cli')); |
| +/// Test this option map to see if it specifies lint rules. |
| +bool containsLintRuleEntry(Map<String, YamlNode> options) { |
| + var linterNode = options['linter']; |
| + return linterNode is YamlMap && linterNode.containsKey('rules'); |
| +} |
| + |
| /// Make sure that we create an analytics instance that doesn't send for this |
| /// session. |
| void disableAnalyticsForSession() { |
| @@ -133,10 +133,6 @@ class Driver implements CommandLineStarter { |
| CrashReportSender _crashReportSender; |
| // TODO(devoncarew): Replace with the real crash product ID. |
|
Brian Wilkerson
2017/07/07 15:40:54
The comment was separated from the getter. Please
|
| - /// The crash reporting instance for analyzer-cli. |
| - CrashReportSender get crashReportSender => (_crashReportSender ??= |
| - new CrashReportSender('Dart_analyzer_cli', analytics)); |
| - |
| /// Create a new Driver instance. |
| /// |
| /// [isTesting] is true if we're running in a test environment. |
| @@ -150,6 +146,10 @@ class Driver implements CommandLineStarter { |
| @visibleForTesting |
| AnalysisContext get context => _context; |
| + /// The crash reporting instance for analyzer-cli. |
| + CrashReportSender get crashReportSender => (_crashReportSender ??= |
| + new CrashReportSender('Dart_analyzer_cli', analytics)); |
| + |
| @override |
| void set userDefinedPlugins(List<Plugin> plugins) { |
| _userDefinedPlugins = plugins ?? <Plugin>[]; |
| @@ -864,11 +864,9 @@ class Driver implements CommandLineStarter { |
| static void setAnalysisContextOptions( |
| file_system.ResourceProvider resourceProvider, |
| AnalysisContext context, |
| - CommandLineOptions options, |
| - void configureContextOptions(AnalysisOptionsImpl contextOptions)) { |
| + CommandLineOptions options) { |
| AnalysisOptionsImpl analysisOptions = |
| createAnalysisOptionsForCommandLineOptions(resourceProvider, options); |
| - configureContextOptions(analysisOptions); |
| setupAnalysisContext(context, options, analysisOptions); |
| } |