Update the plugin API

pkg/analyzer_plugin/lib/plugin/fix_mixin.dart

Index: pkg/analyzer_plugin/lib/plugin/fix_mixin.dart
diff --git a/pkg/analyzer_plugin/lib/plugin/fix_mixin.dart b/pkg/analyzer_plugin/lib/plugin/fix_mixin.dart
index 692ac128ce955d2ce7f510597a63a5d3625541cb..5c3032bdd8e8a426888f3fd83c47d33fcac18aa1 100644
--- a/pkg/analyzer_plugin/lib/plugin/fix_mixin.dart
+++ b/pkg/analyzer_plugin/lib/plugin/fix_mixin.dart
@@ -5,7 +5,9 @@
 import 'dart:async';
 
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/error/error.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer_plugin/plugin/plugin.dart';
 import 'package:analyzer_plugin/protocol/protocol.dart';
 import 'package:analyzer_plugin/protocol/protocol_generated.dart';
@@ -14,6 +16,35 @@ import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/generator.dart';
 
 /**
+ * A mixin that can be used when creating a subclass of [ServerPlugin] and
+ * mixing in [FixesMixin]. This implements the creation of the fixes request
+ * based on the assumption that the driver being created is an [AnalysisDriver].
+ *
+ * Clients may not extend or implement this class, but are allowed to use it as
+ * a mix-in when creating a subclass of [ServerPlugin] that also uses
+ * [FixesMixin] as a mix-in.
+ */
+abstract class DartFixesMixin implements FixesMixin {
+  @override
+  Future<FixesRequest> getFixesRequest(
+      EditGetFixesParams parameters, covariant AnalysisDriver driver) async {
+    int offset = parameters.offset;
+    ResolveResult result = await driver.getResult(parameters.file);
+    return new DartFixesRequestImpl(
+        resourceProvider, offset, _getErrors(offset, result), result);
+  }
+
+  List<AnalysisError> _getErrors(int offset, ResolveResult result) {
+    LineInfo lineInfo = result.lineInfo;
+    int offsetLine = lineInfo.getLocation(offset).lineNumber;
+    return result.errors.where((AnalysisError error) {
+      int errorLine = lineInfo.getLocation(error.offset).lineNumber;
+      return errorLine == offsetLine;
+    }).toList();
+  }
+}
+
+/**
  * A mixin that can be used when creating a subclass of [ServerPlugin] to
  * provide most of the implementation for handling fix requests.
  *
@@ -29,11 +60,11 @@ abstract class FixesMixin implements ServerPlugin {
       covariant AnalysisDriverGeneric driver);
 
   /**
-   * Return the result of using the given analysis [driver] to produce a fully
-   * resolved AST for the file with the given [path].
+   * Return the fixes request that should be passes to the contributors
+   * returned from [getFixContributors].
    */
-  Future<ResolveResult> getResolveResultForFixes(
-      covariant AnalysisDriverGeneric driver, String path);
+  Future<FixesRequest> getFixesRequest(
+      EditGetFixesParams parameters, covariant AnalysisDriverGeneric driver);
 
   @override
   Future<EditGetFixesResult> handleEditGetFixes(
@@ -46,9 +77,7 @@ abstract class FixesMixin implements ServerPlugin {
           RequestErrorFactory.pluginError('Failed to analyze $path', null));
     }
     AnalysisDriverGeneric driver = driverMap[contextRoot];
-    ResolveResult analysisResult = await getResolveResultForFixes(driver, path);
-    FixesRequestImpl request = new FixesRequestImpl(
-        resourceProvider, parameters.offset, analysisResult);
+    FixesRequest request = await getFixesRequest(parameters, driver);
     FixGenerator generator = new FixGenerator(getFixContributors(driver));
     GeneratorResult result = await generator.generateFixesResponse(request);
     result.sendNotifications(channel);