Invalidate resolution of analysisOptions/sourceFactory changes.

pkg/analysis_server/test/domain_analysis_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.domain.analysis;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
@@ skipping 269 matching lines @@
 class AnalysisDomainTest extends AbstractAnalysisTest {
   Map<String, List<AnalysisError>> filesErrors = {};
 
   void processNotification(Notification notification) {
     if (notification.event == ANALYSIS_ERRORS) {
       var decoded = new AnalysisErrorsParams.fromNotification(notification);
       filesErrors[decoded.file] = decoded.errors;
     }
   }
 
-  test_packageMapDependencies() {
+  test_packageMapDependencies() async {
     // Prepare a source file that has errors because it refers to an unknown
     // package.
     String pkgFile = '/packages/pkgA/libA.dart';
     resourceProvider.newFile(pkgFile, '''
 library lib_a;
 class A {}
 ''');
     addTestFile('''
 import 'package:pkgA/libA.dart';
 f(A a) {
 }
 ''');
     String pkgDependency = posix.join(projectPath, 'package_dep');
     resourceProvider.newFile(pkgDependency, 'contents');
     packageMapProvider.dependencies.add(pkgDependency);
     // Create project and wait for analysis
     createProject();
-    return waitForTasksFinished().then((_) {
-      expect(filesErrors[testFile], isNotEmpty);
-      // Add the package to the package map and tickle the package dependency.
-      packageMapProvider.packageMap = {
-        'pkgA': [resourceProvider.getResource('/packages/pkgA')]
-      };
-      resourceProvider.modifyFile(pkgDependency, 'new contents');
-      // Give the server time to notice the file has changed, then let
-      // analysis complete. There should now be no error.
-      return pumpEventQueue().then((_) => waitForTasksFinished()).then((_) {
-        expect(filesErrors[testFile], isEmpty);
-      });
-    });
+    await waitForTasksFinished();
+    expect(filesErrors[testFile], isNotEmpty);
+    // Add the package to the package map and tickle the package dependency.
+    packageMapProvider.packageMap = {
+      'pkgA': [resourceProvider.getResource('/packages/pkgA')]
+    };
+    resourceProvider.modifyFile(pkgDependency, 'new contents');
+    // Give the server time to notice the file has changed, then let
+    // analysis complete. There should now be no error.
+    await pumpEventQueue();
+    await waitForTasksFinished();
+    expect(filesErrors[testFile], isEmpty);
   }
 
   test_setRoots_packages() {
     // prepare package
     String pkgFile = '/packages/pkgA/libA.dart';
     resourceProvider.newFile(pkgFile, '''
 library lib_a;
 class A {}
 ''');
     packageMapProvider.packageMap['pkgA'] =
@@ skipping 366 matching lines @@
   test_beforeAnalysis() async {
     addTestFile('int V = 42;');
     createProject();
     // subscribe
     addAnalysisSubscription(AnalysisService.HIGHLIGHTS, testFile);
     // wait for analysis
     await waitForTasksFinished();
     expect(filesHighlights[testFile], isNotEmpty);
   }
 }