Make server use the common protocol classes

pkg/analysis_server/lib/src/plugin/result_merger.dart

 // Copyright (c) 2017, 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:collection';
 
-import 'package:analysis_server/protocol/protocol_generated.dart'
-    hide AnalysisErrorFixes;
-import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
+import 'package:analysis_server/protocol/protocol_generated.dart';
+import 'package:analyzer_plugin/protocol/protocol_common.dart';
 import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 import 'package:meta/meta.dart';
 
 /**
  * An object used to merge partial lists of results that were contributed by
  * plugins.
  *
  * All of the methods in this class assume that the contributions from the
  * analysis server are the first partial result in the list of partial results
  * to be merged.
  */
 class ResultMerger {
   /**
    * Return a list of fixes composed by merging the lists of fixes in the
    * [partialResultList].
    *
    * The resulting list of fixes will contain exactly one fix for every analysis
    * error for which there are fixes. If two or more plugins contribute the same
    * fix for a given error, the resulting list will contain duplications.
    */
   List<plugin.AnalysisErrorFixes> mergeAnalysisErrorFixes(
       List<List<plugin.AnalysisErrorFixes>> partialResultList) {
     /**
      * Return a key encoding the unique attributes of the given [error].
      */
-    String computeKey(plugin.AnalysisError error) {
+    String computeKey(AnalysisError error) {
       StringBuffer buffer = new StringBuffer();
       buffer.write(error.location.offset);
       buffer.write(';');
       buffer.write(error.code);
       buffer.write(';');
       buffer.write(error.message);
       buffer.write(';');
       buffer.write(error.correction);
       return buffer.toString();
     }
@@ skipping 773 matching lines @@
     if (leftEnd < rightStart || leftStart > rightEnd) {
       return false;
     }
     if (!allowNesting) {
       return true;
     }
     return !((leftStart <= rightStart && rightEnd <= leftEnd) ||
         (rightStart <= leftStart && leftEnd <= rightEnd));
   }
 }