Initial support for getting fixes from plugins

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/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.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/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;
+import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 import 'package:dart_style/dart_style.dart';
 
 int test_resetCount = 0;
 
 bool test_simulateRefactoringException_change = false;
 bool test_simulateRefactoringException_final = false;
 bool test_simulateRefactoringException_init = false;
 
 bool test_simulateRefactoringReset_afterCreateChange = false;
 bool test_simulateRefactoringReset_afterFinalConditions = false;
 bool test_simulateRefactoringReset_afterInitialConditions = false;
 
 /**
  * Instances of the class [EditDomainHandler] implement a [RequestHandler]
  * that handles requests in the edit domain.
  */
-class EditDomainHandler implements RequestHandler {
-  /**
-   * The analysis server that is using this handler to process requests.
-   */
-  final AnalysisServer server;
-
+class EditDomainHandler extends AbstractRequestHandler {
   /**
    * The [SearchEngine] for this server.
    */
   SearchEngine searchEngine;
 
+  /**
+   * The object used to manage uncompleted refactorings.
+   */
   _RefactoringManager refactoringManager;
 
   /**
    * Initialize a newly created handler to handle requests for the given [server].
    */
-  EditDomainHandler(this.server) {
+  EditDomainHandler(AnalysisServer server) : super(server) {
     searchEngine = server.searchEngine;
     _newRefactoringManager();
   }
 
   Response format(Request request) {
     EditFormatParams params = new EditFormatParams.fromRequest(request);
     String file = params.file;
 
     String unformattedSource;
     try {
@@ skipping 95 matching lines @@
     server.sendResponse(response);
   }
 
   Future getFixes(Request request) async {
     var params = new EditGetFixesParams.fromRequest(request);
     String file = params.file;
     int offset = params.offset;
 
     List<AnalysisErrorFixes> errorFixesList = <AnalysisErrorFixes>[];
     if (server.options.enableNewAnalysisDriver) {
+      AnalysisDriver driver = server.getAnalysisDriver(file);
+      plugin.EditGetFixesParams pluginParams =
+          new plugin.EditGetFixesParams(file, offset);
+      Map<PluginInfo, Future<plugin.Response>> pluginFutures =
+          server.pluginManager.broadcast(driver.contextRoot, pluginParams);

[scheglov, 2017/04/19 20:19:04]

Could you instead an empty line here?

[Brian Wilkerson, 2017/04/19 20:52:48]

I'm adding comments instead.

       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,
@@ skipping 10 matching lines @@
                   newAnalysisError_fromEngine(lineInfo, error);
               AnalysisErrorFixes errorFixes =
                   new AnalysisErrorFixes(serverError);
               errorFixesList.add(errorFixes);
               fixes.forEach((fix) {
                 errorFixes.fixes.add(fix.change);
               });
             }
           }
         }
       }

[scheglov, 2017/04/19 20:19:04]

Could you instead an empty line here?

[Brian Wilkerson, 2017/04/19 20:52:48]

I'm adding comments instead.

+      List<plugin.Response> responses = await waitForResponses(pluginFutures);
+      ResultConverter converter = new ResultConverter();
+      for (plugin.Response response in responses) {
+        plugin.EditGetFixesResult result =
+            new plugin.EditGetFixesResult.fromResponse(response);
+        errorFixesList.addAll(result.fixes
+            .map((fixes) => converter.convertAnalysisErrorFixes(fixes)));

[scheglov, 2017/04/19 20:19:04]

You could just pass converter.convertAnalysisErrorFixes to map().

[Brian Wilkerson, 2017/04/19 20:52:48]

Done

+      }
     } else {
       CompilationUnit unit = await server.getResolvedCompilationUnit(file);
       engine.AnalysisErrorInfo errorInfo = server.getErrors(file);
       LineInfo lineInfo = errorInfo?.lineInfo;
       if (unit != null && errorInfo != null && lineInfo != null) {
         int requestLine = lineInfo.getLocation(offset).lineNumber;
         for (engine.AnalysisError error in errorInfo.errors) {
           int errorLine = lineInfo.getLocation(error.offset).lineNumber;
           if (errorLine == requestLine) {
             List<Fix> fixes = await computeFixes(
@@ skipping 778 matching lines @@
     }
     return new RefactoringStatus();
   }
 }
 
 /**
  * [_RefactoringManager] throws instances of this class internally to stop
  * processing in a manager that was reset.
  */
 class _ResetError {}