Make server use the common protocol classes

pkg/analysis_server/test/src/plugin/result_merger_test.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 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/plugin/result_merger.dart';
-import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
+import 'package:analyzer_plugin/protocol/protocol_common.dart';
 import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(ResultMergerTest);
   });
 }
 
 @reflectiveTest
 class ResultMergerTest {
   //
   // The tests in this class should always perform the merge operation twice
   // using the same input values in order to ensure that the input values are
   // not modified by the merge operation.
   //
 
   ResultMerger merger = new ResultMerger();
 
   void test_mergeAnalysisErrorFixes() {
-    plugin.AnalysisError createError(int offset) {
-      plugin.AnalysisErrorSeverity severity =
-          plugin.AnalysisErrorSeverity.ERROR;
-      plugin.AnalysisErrorType type = plugin.AnalysisErrorType.HINT;
-      plugin.Location location =
-          new plugin.Location('test.dart', offset, 2, 3, 4);
-      return new plugin.AnalysisError(severity, type, location, '', '');
+    AnalysisError createError(int offset) {
+      AnalysisErrorSeverity severity = AnalysisErrorSeverity.ERROR;
+      AnalysisErrorType type = AnalysisErrorType.HINT;
+      Location location = new Location('test.dart', offset, 2, 3, 4);
+      return new AnalysisError(severity, type, location, '', '');
     }
 
-    plugin.AnalysisError error1 = createError(10);
-    plugin.AnalysisError error2 = createError(20);
-    plugin.AnalysisError error3 = createError(30);
-    plugin.AnalysisError error4 = createError(40);
+    AnalysisError error1 = createError(10);
+    AnalysisError error2 = createError(20);
+    AnalysisError error3 = createError(30);
+    AnalysisError error4 = createError(40);
     plugin.PrioritizedSourceChange change1 =
-        new plugin.PrioritizedSourceChange(1, new plugin.SourceChange('a'));
+        new plugin.PrioritizedSourceChange(1, new SourceChange('a'));
     plugin.PrioritizedSourceChange change2 =
-        new plugin.PrioritizedSourceChange(2, new plugin.SourceChange('b'));
+        new plugin.PrioritizedSourceChange(2, new SourceChange('b'));
     plugin.PrioritizedSourceChange change3 =
-        new plugin.PrioritizedSourceChange(3, new plugin.SourceChange('c'));
+        new plugin.PrioritizedSourceChange(3, new SourceChange('c'));
     plugin.PrioritizedSourceChange change4 =
-        new plugin.PrioritizedSourceChange(4, new plugin.SourceChange('d'));
+        new plugin.PrioritizedSourceChange(4, new SourceChange('d'));
     plugin.PrioritizedSourceChange change5 =
-        new plugin.PrioritizedSourceChange(5, new plugin.SourceChange('e'));
+        new plugin.PrioritizedSourceChange(5, new SourceChange('e'));
     plugin.AnalysisErrorFixes fix1 =
         new plugin.AnalysisErrorFixes(error1, fixes: [change1]);
     plugin.AnalysisErrorFixes fix2 =
         new plugin.AnalysisErrorFixes(error2, fixes: [change2]);
     plugin.AnalysisErrorFixes fix3 =
         new plugin.AnalysisErrorFixes(error2, fixes: [change3]);
     plugin.AnalysisErrorFixes fix4 =
         new plugin.AnalysisErrorFixes(error3, fixes: [change4]);
     plugin.AnalysisErrorFixes fix5 =
         new plugin.AnalysisErrorFixes(error4, fixes: [change5]);
@@ skipping 279 matching lines @@
           ]),
           unorderedEquals([outline1, outline2and3, outline4]));
     }
 
     runTest();
     runTest();
   }
 
   void test_mergePrioritizedSourceChanges() {
     plugin.PrioritizedSourceChange kind1 =
-        new plugin.PrioritizedSourceChange(1, new plugin.SourceChange(''));
+        new plugin.PrioritizedSourceChange(1, new SourceChange(''));
     plugin.PrioritizedSourceChange kind2 =
-        new plugin.PrioritizedSourceChange(1, new plugin.SourceChange(''));
+        new plugin.PrioritizedSourceChange(1, new SourceChange(''));
     plugin.PrioritizedSourceChange kind3 =
-        new plugin.PrioritizedSourceChange(1, new plugin.SourceChange(''));
+        new plugin.PrioritizedSourceChange(1, new SourceChange(''));
     plugin.PrioritizedSourceChange kind4 =
-        new plugin.PrioritizedSourceChange(1, new plugin.SourceChange(''));
+        new plugin.PrioritizedSourceChange(1, new SourceChange(''));
 
     void runTest() {
       expect(
           merger.mergePrioritizedSourceChanges([
             [kind3, kind2],
             [],
             [kind4],
             [kind1]
           ]),
           unorderedEquals([kind1, kind2, kind3, kind4]));
@@ skipping 363 matching lines @@
   }
 
   void test_overlaps_true_onLeft() {
     expect(merger.overlaps(1, 5, 3, 7), isTrue);
   }
 
   void test_overlaps_true_onRight() {
     expect(merger.overlaps(3, 7, 1, 5), isTrue);
   }
 }