Refactor creating AnalysisOptionsImpl and declared variables.

pkg/analyzer_cli/lib/src/driver.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
 import 'dart:io' as io;
 
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart' as file_system;
 import 'package:analyzer/file_system/file_system.dart';
@@ skipping 566 matching lines @@
     analysisOptions.analyzeFunctionBodiesPredicate =
         _chooseDietParsingPolicy(options);
 
     // If we have the analysis driver, and the new analysis options are the
     // same, we can reuse this analysis driver.
     if (_context != null &&
         _equalAnalysisOptions(_context.analysisOptions, analysisOptions)) {
       return;
     }
 
+    // Set up logging.
+    if (options.log) {
+      AnalysisEngine.instance.logger = new StdLogger();
+    }
+
     // Save stats from previous context before clobbering it.
     if (_context != null) {
       _analyzedFileCount += _context.sources.length;
     }
 
     // Find package info.
     _PackageInfo packageInfo = _findPackages(options);
 
     // Process embedders.
     Map<file_system.Folder, YamlMap> embedderMap =
@@ skipping 22 matching lines @@
       summaryDataStore.addBundle(null, sdkBundle);
     }
 
     // Choose a package resolution policy and a diet parsing policy based on
     // the command-line options.
     SourceFactory sourceFactory = _chooseUriResolutionPolicy(options,
         embedderMap, packageInfo, summaryDataStore, true, analysisOptions);
 
     // Create a context.
     _context = AnalysisEngine.instance.createAnalysisContext();
-    setupAnalysisContext(_context, options, analysisOptions);
+    _context.analysisOptions = analysisOptions;
     _context.sourceFactory = sourceFactory;
+    declareVariables(context.declaredVariables, options);
 
     if (options.enableNewAnalysisDriver) {
       PerformanceLog log = new PerformanceLog(null);
       AnalysisDriverScheduler scheduler = new AnalysisDriverScheduler(log);
       analysisDriver = new AnalysisDriver(
           scheduler,
           log,
           resourceProvider,
           analysisDriverMemoryByteStore,
           new FileContentOverlay(),
@@ skipping 213 matching lines @@
     contextOptions.generateImplicitErrors = options.showPackageWarnings;
     contextOptions.generateSdkErrors = options.showSdkWarnings;
     if (options.enableAssertInitializer != null) {
       contextOptions.enableAssertInitializer = options.enableAssertInitializer;
     }
 
     _directoryToAnalysisOptions[contextRootDirectory] = contextOptions;
     return contextOptions;
   }
 
-  static void setAnalysisContextOptions(
-      file_system.ResourceProvider resourceProvider,
-      AnalysisContext context,
-      CommandLineOptions options) {
-    AnalysisOptionsImpl analysisOptions =
-        createAnalysisOptionsForCommandLineOptions(resourceProvider, options);
-    setupAnalysisContext(context, options, analysisOptions);
-  }
-
-  static void setupAnalysisContext(AnalysisContext context,
-      CommandLineOptions options, AnalysisOptionsImpl analysisOptions) {
+  /// Copy variables defined in the [options] into [declaredVariables].
+  static void declareVariables(
+      DeclaredVariables declaredVariables, CommandLineOptions options) {
     Map<String, String> definedVariables = options.definedVariables;
     if (definedVariables.isNotEmpty) {
-      DeclaredVariables declaredVariables = context.declaredVariables;
       definedVariables.forEach((String variableName, String value) {
         declaredVariables.define(variableName, value);
       });
     }
-
-    if (options.log) {
-      AnalysisEngine.instance.logger = new StdLogger();
-    }
-
-    // Set context options.
-    context.analysisOptions = analysisOptions;
   }
 
   /// Return whether the [newOptions] are equal to the [previous].
   static bool _equalCommandLineOptions(
       CommandLineOptions previous, CommandLineOptions newOptions) {
     if (previous == null || newOptions == null) {
       return false;
     }
     if (newOptions.packageRootPath != previous.packageRootPath) {
       return false;
@@ skipping 106 matching lines @@
     for (var package in packages) {
       var packageName = path.basename(package.path);
       var realPath = package.resolveSymbolicLinksSync();
       result[packageName] = [
         PhysicalResourceProvider.INSTANCE.getFolder(realPath)
       ];
     }
     return result;
   }
 }