Make server use the common protocol classes

pkg/analysis_server/test/src/plugin/request_converter_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' as server;
 import 'package:analysis_server/src/plugin/request_converter.dart';
 import 'package:analysis_server/src/protocol/protocol_internal.dart' as server;
-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';
 
 import 'protocol_test_utilities.dart';
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(RequestConverterTest);
   });
@@ skipping 41 matching lines @@
     Map<plugin.AnalysisService, List<String>> pluginSubscriptions =
         result.subscriptions;
     expect(pluginSubscriptions, hasLength(2));
     expect(
         pluginSubscriptions[plugin.AnalysisService.HIGHLIGHTS], hasLength(2));
     expect(pluginSubscriptions[plugin.AnalysisService.OUTLINE], hasLength(1));
   }
 
   void test_convertAnalysisUpdateContentParams() {
     Map<String, dynamic> serverFiles = <String, dynamic>{
-      'file1': new server.AddContentOverlay('content1'),
-      'file2': new server.AddContentOverlay('content2'),
+      'file1': new AddContentOverlay('content1'),
+      'file2': new AddContentOverlay('content2'),
     };
     plugin.AnalysisUpdateContentParams result =
         converter.convertAnalysisUpdateContentParams(
             new server.AnalysisUpdateContentParams(serverFiles));
     expect(result, isNotNull);
     Map<String, dynamic> pluginFiles = result.files;
     expect(pluginFiles, hasLength(2));
-    expect(pluginFiles['file1'], new isInstanceOf<plugin.AddContentOverlay>());
-    expect(pluginFiles['file2'], new isInstanceOf<plugin.AddContentOverlay>());
-  }
-
-  void test_convertFileOverlay_add() {
-    String content = 'content';
-    plugin.AddContentOverlay result =
-        converter.convertFileOverlay(new server.AddContentOverlay(content));
-    expect(result, isNotNull);
-    expect(result.content, content);
-  }
-
-  void test_convertFileOverlay_change() {
-    List<server.SourceEdit> serverEdits = <server.SourceEdit>[
-      new server.SourceEdit(10, 5, 'a'),
-      new server.SourceEdit(20, 6, 'b'),
-      new server.SourceEdit(30, 7, 'c'),
-    ];
-    plugin.ChangeContentOverlay result = converter
-        .convertFileOverlay(new server.ChangeContentOverlay(serverEdits));
-    expect(result, isNotNull);
-    List<plugin.SourceEdit> pluginEdits = result.edits;
-    int editCount = serverEdits.length;
-    expect(pluginEdits, hasLength(editCount));
-    for (int i = 0; i < editCount; i++) {
-      server.SourceEdit serverEdit = serverEdits[i];
-      plugin.SourceEdit pluginEdit = pluginEdits[i];
-      expect(pluginEdit.offset, serverEdit.offset);
-      expect(pluginEdit.length, serverEdit.length);
-      expect(pluginEdit.replacement, serverEdit.replacement);
-    }
-  }
-
-  void test_convertFileOverlay_remove() {
-    plugin.RemoveContentOverlay result =
-        converter.convertFileOverlay(new server.RemoveContentOverlay());
-    expect(result, isNotNull);
-  }
-
-  void test_convertSourceEdit() {
-    int offset = 5;
-    int length = 3;
-    String replacement = 'x';
-    plugin.SourceEdit result = converter
-        .convertSourceEdit(new server.SourceEdit(offset, length, replacement));
-    expect(result, isNotNull);
-    expect(result.offset, offset);
-    expect(result.length, length);
-    expect(result.replacement, replacement);
+    expect(pluginFiles['file1'], new isInstanceOf<AddContentOverlay>());
+    expect(pluginFiles['file2'], new isInstanceOf<AddContentOverlay>());
   }
 }