| Index: pkg/analysis_server/lib/src/edit/edit_domain.dart
 | 
| diff --git a/pkg/analysis_server/lib/src/edit/edit_domain.dart b/pkg/analysis_server/lib/src/edit/edit_domain.dart
 | 
| index 49d3879aa1cf9b39106fc4134a88cbf5d4465e72..b1a0a0c5129b2d552ff7366814726b346b8896b9 100644
 | 
| --- a/pkg/analysis_server/lib/src/edit/edit_domain.dart
 | 
| +++ b/pkg/analysis_server/lib/src/edit/edit_domain.dart
 | 
| @@ -636,6 +636,9 @@ class _RefactoringManager {
 | 
|     * [kind] in the given [file].
 | 
|     */
 | 
|    Future<Null> _analyzeForRefactoring(String file, RefactoringKind kind) async {
 | 
| +    if (server.options.enableNewAnalysisDriver) {
 | 
| +      return;
 | 
| +    }
 | 
|      // "Extract Local" and "Inline Local" refactorings need only local analysis.
 | 
|      if (kind == RefactoringKind.EXTRACT_LOCAL_VARIABLE ||
 | 
|          kind == RefactoringKind.INLINE_LOCAL_VARIABLE) {
 | 
| @@ -865,6 +868,9 @@ class _RefactoringManager {
 | 
|     * But when any other file is changed or analyzed, we can continue.
 | 
|     */
 | 
|    void _resetOnFileResolutionChanged(String file) {
 | 
| +    if (server.options.enableNewAnalysisDriver) {
 | 
| +      return;
 | 
| +    }
 | 
|      subscriptionToReset?.cancel();
 | 
|      subscriptionToReset = server
 | 
|          .getAnalysisContext(file)
 | 
| 
 |