Fix bug when packages file changes in new driver

pkg/analysis_server/lib/src/context_manager.dart

 // Copyright (c) 2014, 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.
 
 library context.directory.manager;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:core';
@@ skipping 970 matching lines @@
         }
         _addSourceFiles(changeSet, child, info);
       }
     }
   }
 
   void _checkForAnalysisOptionsUpdate(
       String path, ContextInfo info, ChangeType changeType) {
     if (AnalysisEngine.isAnalysisOptionsFileName(path, pathContext)) {
       if (enableNewAnalysisDriver) {
-        // TODO(brianwilkerson) Implement this.
-//        AnalysisDriver driver = info.analysisDriver;
-//        String contextRoot = info.folder.path;
-//        ContextBuilder builder =
-//        callbacks.createContextBuilder(info.folder, defaultContextOptions);
-//        AnalysisOptions options = builder.getAnalysisOptions(contextRoot);
-//        driver.analysisOptions = options;
-//        driver.sourceFactory = builder.createSourceFactory(contextRoot, options);
+        AnalysisDriver driver = info.analysisDriver;
+        String contextRoot = info.folder.path;
+        ContextBuilder builder =
+            callbacks.createContextBuilder(info.folder, defaultContextOptions);
+        AnalysisOptions options = builder.getAnalysisOptions(contextRoot);
+        SourceFactory factory =
+            builder.createSourceFactory(contextRoot, options);
+        driver.configure(analysisOptions: options, sourceFactory: factory);
         // TODO(brianwilkerson) Set exclusion patterns.
       } else {
         var analysisContext = info.context;
         if (analysisContext is context.AnalysisContextImpl) {
           Map<String, Object> options =
               readOptions(info.folder, info.disposition.packages);
           processOptionsForContext(info, options,
               optionsRemoved: changeType == ChangeType.REMOVE);
           analysisContext.sourceFactory = _createSourceFactory(
               analysisContext, analysisContext.analysisOptions, info.folder);
           callbacks.applyChangesToContext(info.folder, new ChangeSet());
         }
       }
     }
   }
 
   void _checkForPackagespecUpdate(
       String path, ContextInfo info, Folder folder) {
     // Check to see if this is the .packages file for this context and if so,
     // update the context's source factory.
     if (absolutePathContext.basename(path) == PACKAGE_SPEC_NAME) {
       String contextRoot = info.folder.path;
       ContextBuilder builder =
           callbacks.createContextBuilder(info.folder, defaultContextOptions);
       AnalysisOptions options = builder.getAnalysisOptions(contextRoot);
       SourceFactory factory = builder.createSourceFactory(contextRoot, options);
-      info.context.analysisOptions = options;
-      info.context.sourceFactory = factory;
+      if (enableNewAnalysisDriver) {
+        AnalysisDriver driver = info.analysisDriver;
+        driver.configure(analysisOptions: options, sourceFactory: factory);
+      } else {
+        info.context.analysisOptions = options;
+        info.context.sourceFactory = factory;
+      }
     }
   }
 
   /**
    * Compute the set of files that are being flushed, this is defined as
    * the set of sources in the removed context (context.sources), that are
    * orphaned by this context being removed (no other context includes this
    * file.)
    */
   List<String> _computeFlushedFiles(ContextInfo info) {
@@ skipping 909 matching lines @@
     }
     return _embedderLocator;
   }
 
   @override
   SdkExtensionFinder getSdkExtensionFinder(ResourceProvider resourceProvider) {
     return _sdkExtensionFinder ??=
         new SdkExtensionFinder(buildPackageMap(resourceProvider));
   }
 }