Make AnalysisServer.onAnalysisComplete a Future and wait for it before refactoring.

pkg/analysis_server/lib/src/analysis_server.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 analysis.server;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analysis_server/src/analysis_logger.dart';
@@ skipping 154 matching lines @@
    */
   Map<AnalysisContext, Completer<AnalysisDoneReason>> contextAnalysisDoneCompleters =
       new HashMap<AnalysisContext, Completer<AnalysisDoneReason>>();
 
   /**
    * The option possibly set from the server initialization which disables error notifications.
    */
   bool _noErrorNotification;
 
   /**
+   * The [Completer] that completes when analysis is complete.
+   */
+  Completer _onAnalysisCompleteCompleter;
+
+  /**
    * The controller that is notified when analysis is started.
    */
   StreamController<AnalysisContext> _onAnalysisStartedController;
 
   /**
-   * The controller that is notified when analysis is complete.
-   */
-  StreamController _onAnalysisCompleteController;
-
-  /**
    * The controller that is notified when a single file has been analyzed.
    */
   StreamController<ChangeNotice> _onFileAnalyzedController;
 
   /**
    * The controller used to notify others when priority sources change.
    */
   StreamController<PriorityChangeEvent> _onPriorityChangeController;
 
   /**
@@ skipping 29 matching lines @@
     contextDirectoryManager =
         new ServerContextManager(this, resourceProvider, packageMapProvider);
     contextDirectoryManager.defaultOptions.incremental = true;
     contextDirectoryManager.defaultOptions.incrementalApi =
         analysisServerOptions.enableIncrementalResolutionApi;
     contextDirectoryManager.defaultOptions.incrementalValidation =
         analysisServerOptions.enableIncrementalResolutionValidation;
     _noErrorNotification = analysisServerOptions.noErrorNotification;
     AnalysisEngine.instance.logger = new AnalysisLogger();
     _onAnalysisStartedController = new StreamController.broadcast();
-    _onAnalysisCompleteController = new StreamController.broadcast();
     _onFileAnalyzedController = new StreamController.broadcast();
     _onPriorityChangeController =
         new StreamController<PriorityChangeEvent>.broadcast();
     running = true;
     Notification notification = new ServerConnectedParams().toNotification();
     channel.sendNotification(notification);
     channel.listen(handleRequest, onDone: done, onError: error);
   }
 
   /**
-   * The stream that is notified when analysis is complete.
+   * The [Future] that completes when analysis is complete.
    */
-  Stream get onAnalysisComplete => _onAnalysisCompleteController.stream;
+  Future get onAnalysisComplete {
+    if (isAnalysisComplete()) {
+      return new Future.value();
+    }
+    if (_onAnalysisCompleteCompleter == null) {
+      _onAnalysisCompleteCompleter = new Completer();
+    }
+    return _onAnalysisCompleteCompleter.future;
+  }
 
   /**
    * The stream that is notified when analysis of a context is started.
    */
   Stream<AnalysisContext> get onAnalysisStarted {
     return _onAnalysisStartedController.stream;
   }
 
   /**
    * The stream that is notified when contexts are added or removed.
@@ skipping 367 matching lines @@
             'Unexpected exception during analysis',
             new CaughtException(exception, stackTrace));
       }
       sendServerErrorNotification(exception, stackTrace, fatal: true);
       shutdown();
     } finally {
       if (!operationQueue.isEmpty) {
         _schedulePerformOperation();
       } else {
         sendStatusNotification(null);
-        _onAnalysisCompleteController.add(null);
+        if (_onAnalysisCompleteCompleter != null) {
+          _onAnalysisCompleteCompleter.complete();
+          _onAnalysisCompleteCompleter = null;
+        }
       }
     }
   }
 
   /**
    * Trigger reanalysis of all files from disk.
    */
   void reanalyze() {
     // Clear any operations that are pending.
     operationQueue.clear();
@@ skipping 463 matching lines @@
    * [packageUriResolver].
    */
   SourceFactory _createSourceFactory(UriResolver packageUriResolver) {
     List<UriResolver> resolvers = <UriResolver>[
         new DartUriResolver(analysisServer.defaultSdk),
         new ResourceUriResolver(resourceProvider),
         packageUriResolver];
     return new SourceFactory(resolvers);
   }
 }