Fixes for adding/removing pubspecs to/from roots.

pkg/analysis_server/test/context_manager_test.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 test.context.directory.manager;
 
 import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/package_map_provider.dart';
 import 'package:analysis_testing/reflective_tests.dart';
 import 'package:analyzer/file_system/file_system.dart';
@@ skipping 138 matching lines @@
 
   void test_setRoots_addFolderWithoutPubspec() {
     packageMapProvider.packageMap = null;
     manager.setRoots(<String>[projPath], <String>[]);
     // verify
     expect(manager.currentContextPaths, hasLength(1));
     expect(manager.currentContextPaths, contains(projPath));
     expect(manager.currentContextFilePaths[projPath], hasLength(0));
   }
 
+  void test_setRoots_ignoreSubContext_ofSubContext() {
+    // prepare paths
+    String root = '/root';
+    String rootFile = '$root/root.dart';
+    String subProject = '$root/sub';
+    String subPubspec = '$subProject/pubspec.yaml';
+    String subFile = '$subProject/bin/sub.dart';
+    String subSubPubspec = '$subProject/subsub/pubspec.yaml';
+    // create files
+    resourceProvider.newFile(rootFile, 'library root;');
+    resourceProvider.newFile(subPubspec, 'pubspec');
+    resourceProvider.newFile(subFile, 'library sub;');
+    resourceProvider.newFile(subSubPubspec, 'pubspec');
+    // set roots
+    manager.setRoots(<String>[root], <String>[]);
+    manager.assertContextPaths([root, subProject]);
+    manager.assertContextFiles(root, [rootFile]);
+    manager.assertContextFiles(subProject, [subFile]);
+  }
+
   void test_setRoots_newlyAddedFoldersGetProperPackageMap() {
     String packagePath = '/package/foo';
     Folder packageFolder = resourceProvider.newFolder(packagePath);
     packageMapProvider.packageMap = {
       'foo': [packageFolder]
     };
     manager.setRoots(<String>[projPath], <String>[]);
     expect(
         manager.currentContextPackageMaps[projPath],
         equals(packageMapProvider.packageMap));
@@ skipping 93 matching lines @@
     // add file in subfolder
     String filePath = posix.join(projPath, 'foo', 'bar.dart');
     resourceProvider.newFile(filePath, 'contents');
     // the file was added
     return pumpEventQueue().then((_) {
       expect(filePaths, hasLength(1));
       expect(filePaths, contains(filePath));
     });
   }
 
-  test_watch_addPubspec() {
+  test_watch_addPubspec_toRoot() {
     // prepare paths
     String root = '/root';
     String rootFile = '$root/root.dart';
+    String rootPubspec = '$root/pubspec.yaml';
+    // create files
+    resourceProvider.newFile(rootFile, 'library root;');
+    // set roots
+    manager.setRoots(<String>[root], <String>[]);
+    manager.assertContextPaths([root]);
+    // verify files
+    manager.assertContextFiles(root, [rootFile]);
+    // add pubspec - still just one root
+    resourceProvider.newFile(rootPubspec, 'pubspec');
+    return pumpEventQueue().then((_) {
+      manager.assertContextPaths([root]);
+      manager.assertContextFiles(root, [rootFile]);
+    });
+  }
+
+  test_watch_addPubspec_toSubFolder() {
+    // prepare paths
+    String root = '/root';
+    String rootFile = '$root/root.dart';
     String subProject = '$root/sub/aaa';
     String subPubspec = '$subProject/pubspec.yaml';
     String subFile = '$subProject/bin/a.dart';
     // create files
     resourceProvider.newFile(rootFile, 'library root;');
     resourceProvider.newFile(subFile, 'library a;');
     // set roots
     manager.setRoots(<String>[root], <String>[]);
     manager.assertContextPaths([root]);
     // verify files
     manager.assertContextFiles(root, [rootFile, subFile]);
     // add pubspec
     resourceProvider.newFile(subPubspec, 'pubspec');
     return pumpEventQueue().then((_) {
       manager.assertContextPaths([root, subProject]);
       manager.assertContextFiles(root, [rootFile]);
       manager.assertContextFiles(subProject, [subFile]);
     });
   }
 
+  test_watch_addPubspec_toSubFolder_ofSubFolder() {
+    // prepare paths
+    String root = '/root';
+    String rootFile = '$root/root.dart';
+    String subProject = '$root/sub';
+    String subPubspec = '$subProject/pubspec.yaml';
+    String subFile = '$subProject/bin/sub.dart';
+    String subSubPubspec = '$subProject/subsub/pubspec.yaml';
+    // create files
+    resourceProvider.newFile(rootFile, 'library root;');
+    resourceProvider.newFile(subPubspec, 'pubspec');
+    resourceProvider.newFile(subFile, 'library sub;');
+    // set roots
+    manager.setRoots(<String>[root], <String>[]);
+    manager.assertContextPaths([root, subProject]);
+    manager.assertContextFiles(root, [rootFile]);
+    manager.assertContextFiles(subProject, [subFile]);
+    // add pubspec - ignore, because is already in a pubspec-based context
+    resourceProvider.newFile(subSubPubspec, 'pubspec');
+    return pumpEventQueue().then((_) {
+      manager.assertContextPaths([root, subProject]);
+      manager.assertContextFiles(root, [rootFile]);
+      manager.assertContextFiles(subProject, [subFile]);
+    });
+  }
+
   test_watch_deleteFile() {
     String filePath = posix.join(projPath, 'foo.dart');
     // add root with a file
     resourceProvider.newFile(filePath, 'contents');
     manager.setRoots(<String>[projPath], <String>[]);
     // the file was added
     Map<String, int> filePaths = manager.currentContextFilePaths[projPath];
     expect(filePaths, hasLength(1));
     expect(filePaths, contains(filePath));
     // delete the file
     resourceProvider.deleteFile(filePath);
     return pumpEventQueue().then((_) {
       return expect(filePaths, hasLength(0));
     });
   }
 
-  test_watch_deletePubspec() {
+  test_watch_deletePubspec_fromRoot() {
+    // prepare paths
+    String root = '/root';
+    String rootPubspec = '$root/pubspec.yaml';
+    String rootFile = '$root/root.dart';
+    // create files
+    resourceProvider.newFile(rootPubspec, 'pubspec');
+    resourceProvider.newFile(rootFile, 'library root;');
+    // set roots
+    manager.setRoots(<String>[root], <String>[]);
+    manager.assertContextPaths([root]);
+    manager.assertContextFiles(root, [rootFile]);
+    // delete the pubspec
+    resourceProvider.deleteFile(rootPubspec);
+    return pumpEventQueue().then((_) {
+      manager.assertContextPaths([root]);
+      manager.assertContextFiles(root, [rootFile]);
+    });
+  }
+
+  test_watch_deletePubspec_fromSubFolder() {
     // prepare paths
     String root = '/root';
     String rootFile = '$root/root.dart';
     String subProject = '$root/sub/aaa';
     String subPubspec = '$subProject/pubspec.yaml';
     String subFile = '$subProject/bin/a.dart';
     // create files
     resourceProvider.newFile(subPubspec, 'pubspec');
     resourceProvider.newFile(rootFile, 'library root;');
     resourceProvider.newFile(subFile, 'library a;');
@@ skipping 149 matching lines @@
     currentContextFilePaths.remove(path);
     currentContextPackageMaps.remove(path);
   }
 
   @override
   void updateContextPackageMap(Folder contextFolder, Map<String,
       List<Folder>> packageMap) {
     currentContextPackageMaps[contextFolder.path] = packageMap;
   }
 }