Convert quick assist support to use AnalysisDriver

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.
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/plugin/edit/assist/assist_dart.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_dart.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/collections.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_abstract.dart';
 import 'package:analysis_server/src/plugin/plugin_manager.dart';
 import 'package:analysis_server/src/plugin/result_converter.dart';
 import 'package:analysis_server/src/protocol_server.dart' hide Element;
 import 'package:analysis_server/src/services/completion/statement/statement_completion.dart';
-import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/assist_internal.dart';
 import 'package:analysis_server/src/services/correction/fix_internal.dart';
 import 'package:analysis_server/src/services/correction/organize_directives.dart';
 import 'package:analysis_server/src/services/correction/sort_members.dart';
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart' as engine;
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/dart/analysis/ast_provider_driver.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/dart/element/ast_provider.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart' as engine;
 import 'package:analyzer/src/error/codes.dart' as engine;
 import 'package:analyzer/src/generated/engine.dart' as engine;
 import 'package:analyzer/src/generated/parser.dart' as engine;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/task/dart.dart';
 import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
 import 'package:analyzer_plugin/protocol/protocol_constants.dart' as plugin;
@@ skipping 98 matching lines @@
         .toResponse(request.id);
   }
 
   Future getAssists(Request request) async {
     EditGetAssistsParams params = new EditGetAssistsParams.fromRequest(request);
     String file = params.file;
     int offset = params.offset;
     int length = params.length;
 
     List<SourceChange> changes = <SourceChange>[];
-    if (server.options.enableNewAnalysisDriver) {
-      //
-      // Allow plugins to start computing assists.
-      //
-      Map<PluginInfo, Future<plugin.Response>> pluginFutures;
-      plugin.EditGetAssistsParams requestParams =
-          new plugin.EditGetAssistsParams(file, offset, length);
-      AnalysisDriver driver = server.getAnalysisDriver(file);
-      if (driver == null) {
-        pluginFutures = <PluginInfo, Future<plugin.Response>>{};
-      } else {
-        pluginFutures = server.pluginManager
-            .broadcastRequest(requestParams, contextRoot: driver.contextRoot);
-      }
-      //
-      // Compute fixes associated with server-generated errors.
-      //
-      AnalysisResult result = await server.getAnalysisResult(file);
-      if (result != null) {
-        CompilationUnit unit = result.unit;
-        CompilationUnitElement compilationUnitElement =
-            resolutionMap.elementDeclaredByCompilationUnit(unit);
-        DartAssistContext dartAssistContext = new _DartAssistContextForValues(
-            compilationUnitElement.source,
-            offset,
-            length,
-            compilationUnitElement.context,
-            server.getAstProvider(file),
-            unit);
-        try {
-          AssistProcessor processor = new AssistProcessor(dartAssistContext);
-          List<Assist> assists = await processor.compute();
-          for (Assist assist in assists) {
-            changes.add(assist.change);
-          }
-        } catch (_) {}
-      }
-      //
-      // Add the fixes produced by plugins to the server-generated fixes.
-      //
-      List<plugin.Response> responses = await waitForResponses(pluginFutures,
-          requestParameters: requestParams);
-      ResultConverter converter = new ResultConverter();
-      List<plugin.PrioritizedSourceChange> pluginChanges =
-          <plugin.PrioritizedSourceChange>[];
-      for (plugin.Response response in responses) {
-        plugin.EditGetAssistsResult result =
-            new plugin.EditGetAssistsResult.fromResponse(response);
-        pluginChanges.addAll(result.assists);
-      }
-      pluginChanges
-          .sort((first, second) => first.priority.compareTo(second.priority));
-      changes
-          .addAll(pluginChanges.map(converter.convertPrioritizedSourceChange));
+    //
+    // Allow plugins to start computing assists.
+    //
+    Map<PluginInfo, Future<plugin.Response>> pluginFutures;
+    plugin.EditGetAssistsParams requestParams =
+        new plugin.EditGetAssistsParams(file, offset, length);
+    AnalysisDriver driver = server.getAnalysisDriver(file);
+    if (driver == null) {
+      pluginFutures = <PluginInfo, Future<plugin.Response>>{};
     } else {
-      ContextSourcePair pair = server.getContextSourcePair(file);
-      engine.AnalysisContext context = pair.context;
-      Source source = pair.source;
-      if (context != null && source != null) {
-        List<Assist> assists = await computeAssists(
-            server.serverPlugin, context, source, offset, length);
+      pluginFutures = server.pluginManager
+          .broadcastRequest(requestParams, contextRoot: driver.contextRoot);
+    }
+    //
+    // Compute fixes associated with server-generated errors.
+    //
+    AnalysisResult result = await server.getAnalysisResult(file);
+    if (result != null) {
+      CompilationUnit unit = result.unit;
+      CompilationUnitElement compilationUnitElement =
+          resolutionMap.elementDeclaredByCompilationUnit(unit);
+      DartAssistContext dartAssistContext = new _DartAssistContextForValues(
+          compilationUnitElement.source,
+          offset,
+          length,
+          driver,
+          new AstProviderForDriver(driver),
+          unit);
+      try {
+        AssistProcessor processor = new AssistProcessor(dartAssistContext);
+        List<Assist> assists = await processor.compute();
         for (Assist assist in assists) {
           changes.add(assist.change);
         }
-      }
+      } catch (_) {}
     }
     //
+    // Add the fixes produced by plugins to the server-generated fixes.
+    //
+    List<plugin.Response> responses =
+        await waitForResponses(pluginFutures, requestParameters: requestParams);
+    ResultConverter converter = new ResultConverter();
+    List<plugin.PrioritizedSourceChange> pluginChanges =
+        <plugin.PrioritizedSourceChange>[];
+    for (plugin.Response response in responses) {
+      plugin.EditGetAssistsResult result =
+          new plugin.EditGetAssistsResult.fromResponse(response);
+      pluginChanges.addAll(result.assists);
+    }
+    pluginChanges
+        .sort((first, second) => first.priority.compareTo(second.priority));
+    changes.addAll(pluginChanges.map(converter.convertPrioritizedSourceChange));
+    //
     // Send the response.
     //
     server
         .sendResponse(new EditGetAssistsResult(changes).toResponse(request.id));
   }
 
   Future getFixes(Request request) async {
     var params = new EditGetFixesParams.fromRequest(request);
     String file = params.file;
     int offset = params.offset;
@@ skipping 17 matching lines @@
     //
     AnalysisResult result = await server.getAnalysisResult(file);
     if (result != null) {
       CompilationUnit unit = result.unit;
       LineInfo lineInfo = result.lineInfo;
       int requestLine = lineInfo.getLocation(offset).lineNumber;
       for (engine.AnalysisError error in result.errors) {
         int errorLine = lineInfo.getLocation(error.offset).lineNumber;
         if (errorLine == requestLine) {
           var context = new _DartFixContextImpl(server.resourceProvider,
-              result.driver, server.getAstProvider(file), unit, error);
+              result.driver, new AstProviderForDriver(driver), unit, error);
           List<Fix> fixes =
               await new DefaultFixContributor().internalComputeFixes(context);
           if (fixes.isNotEmpty) {
             fixes.sort(Fix.SORT_BY_RELEVANCE);
             AnalysisError serverError =
                 newAnalysisError_fromEngine(lineInfo, error);
             AnalysisErrorFixes errorFixes = new AnalysisErrorFixes(serverError);
             errorFixesList.add(errorFixes);
             fixes.forEach((fix) {
               errorFixes.fixes.add(fix.change);
@@ skipping 283 matching lines @@
   @override
   final Source source;
 
   @override
   final int selectionOffset;
 
   @override
   final int selectionLength;
 
   @override
-  final engine.AnalysisContext analysisContext;
+  final AnalysisDriver analysisDriver;
 
   @override
   final AstProvider astProvider;
 
   @override
   final CompilationUnit unit;
 
   _DartAssistContextForValues(this.source, this.selectionOffset,
-      this.selectionLength, this.analysisContext, this.astProvider, this.unit);
+      this.selectionLength, this.analysisDriver, this.astProvider, this.unit);
 }
 
 /**
  * And implementation of [DartFixContext].
  */
 class _DartFixContextImpl implements DartFixContext {
   @override
   final ResourceProvider resourceProvider;
 
   @override
@@ skipping 463 matching lines @@
     }
     return new RefactoringStatus();
   }
 }
 
 /**
  * [_RefactoringManager] throws instances of this class internally to stop
  * processing in a manager that was reset.
  */
 class _ResetError {}