Fix notifications for nested packages

pkg/analysis_server/test/analysis_server_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.analysis_server;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
@@ skipping 118 matching lines @@
     server.setAnalysisRoots('0', ['/foo'], [], {});
     AnalysisContext context;
     return pumpEventQueue().then((_) {
       context = server.getAnalysisContext('/foo/bar.dart');
       server.setAnalysisRoots('1', [], [], {});
     }).then((_) => pumpEventQueue()).then((_) {
       expect(context.isDisposed, isTrue);
     });
   }
 
+  test_getAnalysisContext_nested() {
+    String dir1Path = '/dir1';
+    String dir2Path = dir1Path + '/dir2';
+    String filePath = dir2Path + '/file.dart';
+    Folder dir1 = resourceProvider.newFolder(dir1Path);
+    Folder dir2 = resourceProvider.newFolder(dir2Path);
+    resourceProvider.newFile(filePath, 'library lib;');
+
+    AnalysisContext context1 = AnalysisEngine.instance.createAnalysisContext();
+    AnalysisContext context2 = AnalysisEngine.instance.createAnalysisContext();
+    server.folderMap[dir1] = context1;
+    server.folderMap[dir2] = context2;
+
+    expect(server.getAnalysisContext(filePath), context2);
+  }
+
+  test_getAnalysisContext_simple() {
+    String dirPath = '/dir';
+    String filePath = dirPath + '/file.dart';
+    Folder dir = resourceProvider.newFolder(dirPath);
+    resourceProvider.newFile(filePath, 'library lib;');
+
+    AnalysisContext context = AnalysisEngine.instance.createAnalysisContext();
+    server.folderMap[dir] = context;
+
+    expect(server.getAnalysisContext(filePath), context);
+  }
+
   Future test_contextsChangedEvent() {
     resourceProvider.newFolder('/foo');
 
     bool wasAdded = false;
     bool wasChanged = false;
     bool wasRemoved = false;
     server.onContextsChanged.listen((ContextsChangedEvent event) {
       wasAdded = event.added.length == 1;
       if (wasAdded) {
         expect(event.added[0], isNotNull);
@@ skipping 232 matching lines @@
   @override
   Response handleRequest(Request request) {
     if (request.method == 'echo') {
       return new Response(request.id, result: {
         'echo': true
       });
     }
     return null;
   }
 }