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

pkg/analysis_server/lib/src/edit/edit_domain.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 edit.domain;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/collections.dart';
@@ skipping 339 matching lines @@
       });
     }, onError: (exception, stackTrace) {
       server.instrumentationService.logException(exception, stackTrace);
       server.sendResponse(
           new Response.serverError(request, exception, stackTrace));
       _reset();
     });
   }
 
   /**
+   * Awaits for analysis to complete and then calls [_init2] to actually
+   * initialize the resfactoring.
+   */
+  Future<RefactoringStatus> _init(RefactoringKind kind, String file, int offset,
+      int length) {
+    return server.onAnalysisComplete.then((_) {

[Paul Berry, 2015/01/26 22:32:11]

As we discussed in person, it would be nice in a future CL to only do this for
non-local refactorings.  Can we have a TODO comment to remind us about that?

+      return _init2(kind, file, offset, length);
+    });
+  }
+
+  /**
    * Initializes this context to perform a refactoring with the specified
    * parameters. The existing [Refactoring] is reused or created as needed.
    */
-  Future<RefactoringStatus> _init(RefactoringKind kind, String file, int offset,
-      int length) {
+  Future<RefactoringStatus> _init2(RefactoringKind kind, String file,
+      int offset, int length) {
     // check if we can continue with the existing Refactoring instance
     if (this.kind == kind &&
         this.file == file &&
         this.offset == offset &&
         this.length == length) {
       return new Future.value(initStatus);
     }
     _reset();
     this.kind = kind;
     this.file = file;
@@ skipping 197 matching lines @@
     }
     if (refactoring is RenameRefactoring) {
       RenameRefactoring renameRefactoring = refactoring;
       RenameOptions renameOptions = params.options;
       renameRefactoring.newName = renameOptions.newName;
       return renameRefactoring.checkNewName();
     }
     return new RefactoringStatus();
   }
 }