Fixes for review comments.

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 'package:analysis_server/src/package_map_provider.dart';
@@ skipping 70 matching lines @@
   /**
    * Remove the context associated with the given [folder].
    */
   void removeContext(Folder folder);
 
   /**
    * Change the set of paths which should be used as starting points to
    * determine the context directories.
    */
   void setRoots(List<String> includedPaths, List<String> excludedPaths) {
+    List<Folder> contextFolders = _contexts.keys.toList();
     // included
     Set<Folder> includedFolders = new HashSet<Folder>();
     for (int i = 0; i < includedPaths.length; i++) {
       String path = includedPaths[i];
       Resource resource = resourceProvider.getResource(path);
       if (resource is Folder) {
         includedFolders.add(resource);
       } else {
         // TODO(scheglov) implemented separate files analysis
         throw new UnimplementedError(
             '$path is not a folder. '
                 'Only support for folder analysis is implemented currently.');
       }
     }
     // excluded
     // TODO(scheglov) remove when implemented
     if (excludedPaths.isNotEmpty) {
       throw new UnimplementedError('Excluded paths are not supported yet');
     }
     Set<Folder> excludedFolders = new HashSet<Folder>();
-    // diff
-    Set<Folder> currentFolders = _contexts.keys.toSet();
-    Set<Folder> newFolders = new HashSet<Folder>();
-    Set<Folder> oldFolders = new HashSet<Folder>();
-    for (Folder currentFolder in currentFolders) {
+    // destroy old contexts
+    for (Folder contextFolder in contextFolders) {
       bool isIncluded = includedFolders.any((folder) {
-        return folder.contains(currentFolder.path);
+        return folder.contains(contextFolder.path);
       });
       if (!isIncluded) {
-        oldFolders.add(currentFolder);
+        _destroyContext(contextFolder);
       }
     }
+    // create new contexts
     for (Folder includedFolder in includedFolders) {
-      bool wasIncluded = currentFolders.any((folder) {
+      bool wasIncluded = contextFolders.any((folder) {
         return folder.contains(includedFolder.path);
       });
       if (!wasIncluded) {
-        newFolders.add(includedFolder);
+        _createContexts(includedFolder, false);
       }
     }
-    // destroy old contexts
-    for (Folder folder in oldFolders) {
-      _destroyContext(folder);
-    }
-    // create new contexts
-    for (Folder folder in newFolders) {
-      _createContexts(folder, false);
-    }
   }
 
   /**
    * Called when the package map for a context has changed.
    */
   void updateContextPackageMap(Folder contextFolder, Map<String,
       List<Folder>> packageMap);
 
   /**
    * Create a new empty context associated with [folder].
@@ skipping 27 matching lines @@
 
   /**
    * Creates a new context associated with [folder].
    *
    * If there are subfolders with 'pubspec.yaml' files, separate contexts
    * are created for them, and excluded from the context associated with
    * [folder].
    *
    * If [folder] itself contains a 'pubspec.yaml' file, subfolders are ignored.
    *
+   * If [withPubspecOnly] is `true`, a context will be created only if there
+   * is a 'pubspec.yaml' file in [folder].
+   *
    * Returns create pubspec-based contexts.
    */
   List<_ContextInfo> _createContexts(Folder folder, bool withPubspecOnly) {
     // check if there is a pubspec in the folder
     {
       File pubspecFile = folder.getChild(PUBSPEC_NAME);
       if (pubspecFile.exists) {
         _ContextInfo info = _createContextWithSources(folder, <_ContextInfo>[]);
         return [info];
       }
@@ skipping 25 matching lines @@
   }
 
   /**
    * Extract a new [pubspecFile]-based context from [oldInfo].
    */
   void _extractContext(_ContextInfo oldInfo, File pubspecFile) {
     Folder newFolder = pubspecFile.parent;
     _ContextInfo newInfo = _createContext(newFolder, []);
     newInfo.parent = oldInfo;
     // prepare sources to extract
-    Map<String, Source> extractSources = new HashMap<String, Source>();
+    Map<String, Source> extractedSources = new HashMap<String, Source>();
     oldInfo.sources.forEach((path, source) {
       if (newFolder.contains(path)) {
-        extractSources[path] = source;
+        extractedSources[path] = source;
       }
     });
     // update new context
     {
       ChangeSet changeSet = new ChangeSet();
-      extractSources.forEach((path, source) {
+      extractedSources.forEach((path, source) {
         newInfo.sources[path] = source;
         changeSet.addedSource(source);
       });
       applyChangesToContext(newFolder, changeSet);
     }
     // update old context
     {
       ChangeSet changeSet = new ChangeSet();
-      extractSources.forEach((path, source) {
+      extractedSources.forEach((path, source) {
         oldInfo.sources.remove(path);
         changeSet.removedSource(source);
       });
       applyChangesToContext(oldInfo.folder, changeSet);
     }
   }
 
   void _handleWatchEvent(Folder folder, _ContextInfo info, WatchEvent event) {
     String path = event.path;
     // maybe excluded, so other context will handle it
@@ skipping 90 matching lines @@
    * Merges [info] context into its parent.
    */
   void _mergeContext(_ContextInfo info) {
     // destroy the context
     _destroyContext(info.folder);
     // add files to the parent context
     _ContextInfo parentInfo = info.parent;
     if (parentInfo != null) {
       parentInfo.children.remove(info);
       ChangeSet changeSet = new ChangeSet();
-      _addSourceFiles(changeSet, info.folder, parentInfo);
+      info.sources.forEach((path, source) {
+        parentInfo.sources[path] = source;
+        changeSet.addedSource(source);
+      });
       applyChangesToContext(parentInfo.folder, changeSet);
     }
   }
 
   /**
    * Resursively adds all Dart and HTML files to the [changeSet].
    */
   static void _addSourceFiles(ChangeSet changeSet, Folder folder,
       _ContextInfo info) {
     if (info.excludesResource(folder)) {
@@ skipping 97 matching lines @@
     return excludes(resource.path);
   }
 
   /**
    * Returns `true` if [path] is the pubspec file of this context.
    */
   bool isPubspec(String path) {
     return path == pubspecPath;
   }
 }