Unify the server and plugin versions of the generators

R=devoncarew@google.com

Review-Url: https://codereview.chromium.org/2844273003 .

pkg/analysis_server/benchmark/integration/driver.dart

@@ -9,8 +9,8 @@ import 'dart:math' show max, sqrt;
 
 import 'package:logging/logging.dart';
 
-import '../../test/integration/integration_test_methods.dart';
-import '../../test/integration/integration_tests.dart';
+import '../../test/integration/support/integration_test_methods.dart';
+import '../../test/integration/support/integration_tests.dart';
 import 'operation.dart';
 
 final SPACE = ' '.codeUnitAt(0);

pkg/analysis_server/benchmark/integration/input_converter.dart

@@ -8,7 +8,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as path;

pkg/analysis_server/benchmark/integration/operation.dart

@@ -6,7 +6,7 @@ library server.operation;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:logging/logging.dart';
 
 import 'driver.dart';

pkg/analysis_server/benchmark/perf/analysis_timing_tests.dart

@@ -7,7 +7,7 @@ library server.performance.analysis.timing;
 import 'dart:async';
 import 'dart:io';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:args/args.dart';
 import 'package:test/test.dart';
 

pkg/analysis_server/benchmark/perf/benchmark_flutter.dart

@@ -6,7 +6,7 @@ library server.performance.local;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 
 import 'benchmark_scenario.dart';
 import 'memory_tests.dart';

pkg/analysis_server/benchmark/perf/benchmark_scenario.dart

@@ -8,10 +8,10 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:test/test.dart';
 
-import '../../test/integration/integration_tests.dart';
+import '../../test/integration/support/integration_tests.dart';
 import 'performance_tests.dart';
 
 void printBenchmarkResults(String id, String description, List<int> times) {

pkg/analysis_server/benchmark/perf/memory_tests.dart

@@ -7,10 +7,10 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:test/test.dart';
 
-import '../../test/integration/integration_tests.dart';
+import '../../test/integration/support/integration_tests.dart';
 
 void printMemoryResults(String id, String description, List<int> sizes) {
   int minMemory = sizes.fold(sizes.first, min);

pkg/analysis_server/benchmark/perf/performance_tests.dart

@@ -7,10 +7,10 @@ library server.performance;
 import 'dart:async';
 import 'dart:io';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:test/test.dart';
 
-import '../../test/integration/integration_tests.dart';
+import '../../test/integration/support/integration_tests.dart';
 
 /**
  * Base class for analysis server performance tests.

pkg/analysis_server/lib/plugin/analysis/analysis_domain.dart

@@ -29,7 +29,7 @@ library analysis_server.plugin.analysis.analysis_domain;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     show AnalysisService;
 import 'package:analysis_server/src/plugin/server_plugin.dart';
 import 'package:analyzer/src/generated/engine.dart'

pkg/analysis_server/lib/plugin/analysis/navigation/navigation_core.dart

@@ -4,7 +4,7 @@
 
 library analysis_server.plugin.analysis.navigation.navigation_core;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     show ElementKind, Location;
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
 import 'package:analyzer/src/generated/source.dart' show Source;

pkg/analysis_server/lib/plugin/analysis/occurrences/occurrences_core.dart

@@ -4,7 +4,8 @@
 
 library analysis_server.plugin.analysis.occurrences.occurrences_core;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' show Occurrences;
+import 'package:analysis_server/protocol/protocol_generated.dart'
+    show Occurrences;
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
 import 'package:analyzer/src/generated/source.dart' show Source;
 

pkg/analysis_server/lib/plugin/edit/assist/assist_core.dart

@@ -6,7 +6,7 @@ library analysis_server.plugin.edit.assist.assist_core;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     show SourceChange;
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';

pkg/analysis_server/lib/plugin/edit/fix/fix_core.dart

@@ -6,7 +6,7 @@ library analysis_server.plugin.edit.fix.fix_core;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     show SourceChange;
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';

pkg/analysis_server/lib/plugin/protocol/protocol_dart.dart

@@ -8,7 +8,7 @@
  */
 library analysis_server.plugin.protocol.protocol_dart;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analyzer/dart/element/element.dart' as engine;
 import 'package:analyzer/src/generated/utilities_dart.dart' as engine;

pkg/analysis_server/lib/protocol/protocol.dart

@@ -11,10 +11,9 @@ library analysis_server.plugin.protocol.protocol;
 import 'dart:collection';
 import 'dart:convert' hide JsonDecoder;
 
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/protocol/protocol_internal.dart';
 
-part 'generated_protocol.dart';
-
 /**
  * A [RequestHandler] that supports [startup] and [shutdown] methods.
  *
@@ -74,14 +73,14 @@ class Notification {
    * A table mapping the names of notification parameters to their values, or
    * `null` if there are no notification parameters.
    */
-  Map<String, Object> _params;
+  final Map<String, Object> params;
 
   /**
    * Initialize a newly created [Notification] to have the given [event] name.
    * If [_params] is provided, it will be used as the params; otherwise no
    * params will be used.
    */
-  Notification(this.event, [this._params]);
+  Notification(this.event, [this.params]);
 
   /**
    * Initialize a newly created instance based on the given JSON data.
@@ -98,8 +97,8 @@ class Notification {
   Map<String, Object> toJson() {
     Map<String, Object> jsonObject = {};
     jsonObject[EVENT] = event;
-    if (_params != null) {
-      jsonObject[PARAMS] = _params;
+    if (params != null) {
+      jsonObject[PARAMS] = params;
     }
     return jsonObject;
   }
@@ -145,7 +144,7 @@ class Request {
   /**
    * A table mapping the names of request parameters to their values.
    */
-  final Map<String, Object> _params;
+  final Map<String, Object> params;
 
   /**
    * The time (milliseconds since epoch) at which the client made the request
@@ -160,7 +159,7 @@ class Request {
    */
   Request(this.id, this.method,
       [Map<String, Object> params, this.clientRequestTime])
-      : _params = params ?? new HashMap<String, Object>();
+      : params = params ?? new HashMap<String, Object>();
 
   /**
    * Return a request parsed from the given json, or `null` if the [data] is
@@ -240,8 +239,8 @@ class Request {
     Map<String, Object> jsonObject = new HashMap<String, Object>();
     jsonObject[ID] = id;
     jsonObject[METHOD] = method;
-    if (_params.isNotEmpty) {
-      jsonObject[PARAMS] = _params;
+    if (params.isNotEmpty) {
+      jsonObject[PARAMS] = params;
     }
     if (clientRequestTime != null) {
       jsonObject[CLIENT_REQUEST_TIME] = clientRequestTime;

pkg/analysis_server/lib/src/analysis_manager.dart

@@ -6,7 +6,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/channel/channel.dart';
 import 'package:analysis_server/src/channel/web_socket_channel.dart';
 

pkg/analysis_server/lib/src/analysis_server.dart

@@ -10,7 +10,8 @@ import 'dart:core';
 import 'dart:io' as io;
 import 'dart:math' show max;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart'
     hide AnalysisOptions, Element;
 import 'package:analysis_server/src/analysis_logger.dart';
 import 'package:analysis_server/src/channel/channel.dart';

pkg/analysis_server/lib/src/channel/byte_stream_channel.dart

@@ -8,7 +8,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel/channel.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';

pkg/analysis_server/lib/src/channel/channel.dart

@@ -7,7 +7,7 @@ library channel;
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
 
 /**
  * Instances of the class [ChannelChunkSink] uses a [Converter] to translate

pkg/analysis_server/lib/src/channel/web_socket_channel.dart

@@ -8,7 +8,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel/channel.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';

pkg/analysis_server/lib/src/computer/computer_highlights.dart

@@ -4,7 +4,7 @@
 
 library computer.highlights;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' hide Element;
+import 'package:analysis_server/protocol/protocol_generated.dart' hide Element;
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';

pkg/analysis_server/lib/src/computer/computer_highlights2.dart

@@ -4,7 +4,7 @@
 
 library computer.highlights2;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' hide Element;
+import 'package:analysis_server/protocol/protocol_generated.dart' hide Element;
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/token.dart';

pkg/analysis_server/lib/src/computer/computer_hover.dart

@@ -4,7 +4,7 @@
 
 library computer.hover;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     show HoverInformation;
 import 'package:analysis_server/src/computer/computer_overrides.dart';
 import 'package:analysis_server/src/utilities/documentation.dart';

pkg/analysis_server/lib/src/computer/computer_outline.dart

@@ -4,7 +4,7 @@
 
 library computer.outline;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/collections.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';

pkg/analysis_server/lib/src/computer/new_notifications.dart

@@ -2,7 +2,7 @@
 // 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/plugin/protocol/protocol.dart' as protocol;
+import 'package:analysis_server/protocol/protocol_generated.dart' as protocol;
 import 'package:analysis_server/src/analysis_server.dart' show AnalysisServer;
 import 'package:analysis_server/src/domains/analysis/navigation.dart';
 import 'package:analysis_server/src/domains/analysis/navigation_dart.dart';

pkg/analysis_server/lib/src/domain_completion.dart

@@ -6,7 +6,8 @@ library domain.completion;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_abstract.dart';

pkg/analysis_server/lib/src/domain_diagnostic.dart

@@ -8,7 +8,8 @@ import 'dart:async';
 import 'dart:collection';
 import 'dart:core';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analyzer/src/context/cache.dart';
@@ -96,6 +97,19 @@ class DiagnosticDomainHandler implements RequestHandler {
         knownFileCount - explicitFileCount, driver.numberOfFilesToAnalyze, []);
   }
 
+  /// Answer the `diagnostic.getServerPort` request.
+  Future handleGetServerPort(Request request) async {
+    try {
+      // Open a port (or return the existing one).
+      int port = await server.diagnosticServer.getServerPort();
+      server.sendResponse(
+          new DiagnosticGetServerPortResult(port).toResponse(request.id));
+    } catch (error) {
+      server
+          .sendResponse(new Response.debugPortCouldNotBeOpened(request, error));
+    }
+  }
+
   @override
   Response handleRequest(Request request) {
     try {
@@ -111,17 +125,4 @@ class DiagnosticDomainHandler implements RequestHandler {
     }
     return null;
   }
-
-  /// Answer the `diagnostic.getServerPort` request.
-  Future handleGetServerPort(Request request) async {
-    try {
-      // Open a port (or return the existing one).
-      int port = await server.diagnosticServer.getServerPort();
-      server.sendResponse(
-          new DiagnosticGetServerPortResult(port).toResponse(request.id));
-    } catch (error) {
-      server
-          .sendResponse(new Response.debugPortCouldNotBeOpened(request, error));
-    }
-  }
 }

pkg/analysis_server/lib/src/domain_execution.dart

@@ -8,7 +8,8 @@ import 'dart:async';
 import 'dart:collection';
 import 'dart:core';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analyzer/file_system/file_system.dart';

pkg/analysis_server/lib/src/domain_server.dart

@@ -4,7 +4,8 @@
 
 library domain.server;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 

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

@@ -4,7 +4,7 @@
 
 import 'dart:collection';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' as server;
+import 'package:analysis_server/protocol/protocol_generated.dart' as server;
 import 'package:analysis_server/src/channel/channel.dart';
 import 'package:analysis_server/src/plugin/result_collector.dart';
 import 'package:analysis_server/src/plugin/result_converter.dart';

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

@@ -2,7 +2,7 @@
 // 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/plugin/protocol/protocol.dart' as server;
+import 'package:analysis_server/protocol/protocol_generated.dart' as server;
 import 'package:analysis_server/src/protocol/protocol_internal.dart' as server;
 import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 

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

@@ -2,7 +2,7 @@
 // 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/plugin/protocol/protocol.dart' as server;
+import 'package:analysis_server/protocol/protocol_generated.dart' as server;
 import 'package:analysis_server/src/protocol/protocol_internal.dart' as server;
 import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 

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

@@ -4,7 +4,7 @@
 
 import 'dart:collection';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     hide AnalysisErrorFixes;
 import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 import 'package:meta/meta.dart';

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

@@ -14,7 +14,7 @@ import 'package:analysis_server/plugin/edit/assist/assist.dart';
 import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/plugin/edit/fix/fix.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analysis_server/src/domain_completion.dart';

pkg/analysis_server/lib/src/protocol/protocol_internal.dart

@@ -7,7 +7,8 @@ library analysis_server.src.protocol.protocol_internal;
 import 'dart:collection';
 import 'dart:convert' hide JsonDecoder;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 
 final Map<String, RefactoringKind> REQUEST_ID_REFACTORING_KINDS =
     new HashMap<String, RefactoringKind>();
@@ -243,31 +244,6 @@ abstract class HasToJson {
   Map<String, Object> toJson();
 }
 
-/**
- * Jenkins hash function, optimized for small integers.  Borrowed from
- * sdk/lib/math/jenkins_smi_hash.dart.
- *
- * TODO(paulberry): Move to somewhere that can be shared with other code.
- */
-class JenkinsSmiHash {
-  static int combine(int hash, int value) {
-    hash = 0x1fffffff & (hash + value);
-    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
-    return hash ^ (hash >> 6);
-  }
-
-  static int finish(int hash) {
-    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
-    hash = hash ^ (hash >> 11);
-    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
-  }
-
-  static int hash2(a, b) => finish(combine(combine(0, a), b));
-
-  static int hash4(a, b, c, d) =>
-      finish(combine(combine(combine(combine(0, a), b), c), d));
-}
-
 /**
  * Base class for decoding JSON objects.  The derived class must implement
  * error reporting logic.
@@ -446,6 +422,14 @@ class RequestDecoder extends JsonDecoder {
   }
 }
 
+abstract class RequestParams implements HasToJson {
+  /**
+   * Return a request whose parameters are taken from this object and that has
+   * the given [id].
+   */
+  Request toRequest(String id);
+}
+
 /**
  * JsonDecoder for decoding responses from the server.  This is intended to be
  * used only for testing.  Errors are reported using bare [Exception] objects.
@@ -475,3 +459,14 @@ class ResponseDecoder extends JsonDecoder {
     return new Exception('Missing key $key at $jsonPath');
   }
 }
+
+/**
+ * The result data associated with a response.
+ */
+abstract class ResponseResult implements HasToJson {
+  /**
+   * Return a response whose result data is this object for the request with the
+   * given [id].
+   */
+  Response toResponse(String id);
+}

pkg/analysis_server/lib/src/protocol_server.dart

@@ -4,8 +4,8 @@
 
 library protocol.server;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/plugin/protocol/protocol_dart.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart'
     as engine;
@@ -22,8 +22,9 @@ import 'package:analyzer/src/generated/engine.dart' as engine;
 import 'package:analyzer/src/generated/source.dart' as engine;
 import 'package:analyzer/src/generated/utilities_dart.dart' as engine;
 
-export 'package:analysis_server/plugin/protocol/protocol.dart';
 export 'package:analysis_server/plugin/protocol/protocol_dart.dart';
+export 'package:analysis_server/protocol/protocol.dart';
+export 'package:analysis_server/protocol/protocol_generated.dart';
 
 /**
  * Returns a list of AnalysisErrors corresponding to the given list of Engine

pkg/analysis_server/lib/src/provisional/completion/completion_core.dart

@@ -6,7 +6,7 @@ library analysis_server.src.provisional.completion.completion_core;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/ide_options.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/file_system/file_system.dart';

pkg/analysis_server/lib/src/provisional/completion/dart/completion_dart.dart

@@ -6,7 +6,7 @@ library analysis_server.src.provisional.completion.completion_dart;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/services/completion/dart/optype.dart';

pkg/analysis_server/lib/src/provisional/edit/utilities/change_builder_core.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/utilities/change_builder_core.dart';
 import 'package:meta/meta.dart';
 

pkg/analysis_server/lib/src/provisional/refactoring/refactoring_core.dart

@@ -6,7 +6,7 @@ library analysis_server.edit.refactoring.refactoring_core;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 

pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

@@ -6,7 +6,7 @@ library services.completion.dart.manager;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/ide_options.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart'
     show CompletionContributor, CompletionRequest;

pkg/analysis_server/lib/src/services/completion/dart/contribution_sorter.dart

@@ -6,7 +6,7 @@ library services.completion.dart.sorter;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
 
 /**

pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart

@@ -7,7 +7,7 @@ library services.completion.dart.keyword;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
 import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
 import 'package:analysis_server/src/services/completion/dart/optype.dart';

pkg/analysis_server/lib/src/services/completion/dart/label_contributor.dart

@@ -6,7 +6,7 @@ library services.completion.contributor.dart.label;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' as protocol
+import 'package:analysis_server/protocol/protocol_generated.dart' as protocol
     show ElementKind;
 import 'package:analysis_server/src/protocol_server.dart'
     show CompletionSuggestion, CompletionSuggestionKind;

pkg/analysis_server/lib/src/services/completion/dart/local_constructor_contributor.dart

@@ -6,7 +6,7 @@ library services.completion.contributor.dart.constructor;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' as protocol
+import 'package:analysis_server/protocol/protocol_generated.dart' as protocol
     show Element, ElementKind;
 import 'package:analysis_server/src/protocol_server.dart'
     show CompletionSuggestion, CompletionSuggestionKind;

pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.dart

@@ -6,7 +6,7 @@ library services.completion.contributor.dart.local_ref;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' as protocol
+import 'package:analysis_server/protocol/protocol_generated.dart' as protocol
     show Element, ElementKind;
 import 'package:analysis_server/src/protocol_server.dart'
     show CompletionSuggestion, CompletionSuggestionKind, Location;

pkg/analysis_server/lib/src/services/completion/dart/named_constructor_contributor.dart

@@ -6,7 +6,7 @@ library services.completion.contributor.dart.named_constructor;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' hide Element;
+import 'package:analysis_server/protocol/protocol_generated.dart' hide Element;
 import 'package:analysis_server/src/ide_options.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
 import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';

pkg/analysis_server/lib/src/services/completion/dart/utilities.dart

@@ -5,7 +5,7 @@
 /**
  * A collection of utility methods used by completion contributors.
  */
-import 'package:analysis_server/plugin/protocol/protocol.dart' as protocol
+import 'package:analysis_server/protocol/protocol_generated.dart' as protocol
     show Element, ElementKind;
 import 'package:analysis_server/src/ide_options.dart';
 import 'package:analysis_server/src/protocol_server.dart'

pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart

@@ -6,7 +6,7 @@ library services.src.completion.statement;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/protocol_server.dart' hide Element;
 import 'package:analysis_server/src/services/correction/source_buffer.dart';
 import 'package:analysis_server/src/services/correction/source_range.dart';

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -10,7 +10,7 @@ import 'dart:core';
 
 import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_dart.dart';
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     hide AnalysisError, Element, ElementKind;
 import 'package:analysis_server/src/protocol_server.dart'
     show doSourceChange_addElementEdit, doSourceChange_addSourceEdit;

pkg/analysis_server/lib/src/services/correction/organize_directives.dart

@@ -4,7 +4,7 @@
 
 library services.src.refactoring.organize_directives;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     hide AnalysisError, Element;
 import 'package:analysis_server/src/services/correction/strings.dart';
 import 'package:analyzer/dart/ast/ast.dart';

pkg/analysis_server/lib/src/services/correction/sort_members.dart

@@ -4,7 +4,7 @@
 
 library services.src.refactoring.sort_members;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' hide Element;
+import 'package:analysis_server/protocol/protocol_generated.dart' hide Element;
 import 'package:analysis_server/src/services/correction/strings.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 

pkg/analysis_server/lib/src/services/correction/source_buffer.dart

@@ -4,7 +4,7 @@
 
 library services.src.correction.source_buffer;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**

pkg/analysis_server/lib/src/services/correction/status.dart

@@ -4,7 +4,7 @@
 
 library services.status;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 
 /**
  * An outcome of a condition checking operation.

pkg/analysis_server/lib/src/services/correction/util.dart

@@ -6,7 +6,7 @@ library services.src.correction.util;
 
 import 'dart:math';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     show SourceChange, SourceEdit;
 import 'package:analysis_server/src/protocol_server.dart'
     show doSourceChange_addElementEdit;

pkg/analysis_server/lib/src/services/refactoring/refactoring.dart

@@ -6,7 +6,7 @@ library services.refactoring;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     show RefactoringMethodParameter, SourceChange;
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/refactoring/convert_getter_to_method.dart';

pkg/analysis_server/lib/src/socket_server.dart

@@ -4,7 +4,8 @@
 
 library socket.server;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel/channel.dart';
 import 'package:analysis_server/src/plugin/server_plugin.dart';

pkg/analysis_server/lib/src/status/get_handler.dart

@@ -9,7 +9,8 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' hide Element;
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart' hide Element;
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/domain_completion.dart';
 import 'package:analysis_server/src/domain_diagnostic.dart';

pkg/analysis_server/lib/src/status/get_handler2.dart

@@ -6,7 +6,8 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart' hide Element;
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart' hide Element;
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/domain_completion.dart';
 import 'package:analysis_server/src/domain_diagnostic.dart';
@@ -31,6 +32,18 @@ import 'package:analyzer/task/model.dart';
 import 'package:path/path.dart' as path;
 import 'package:plugin/plugin.dart';
 
+String _writeWithSeparators(int value) {
+  // TODO(devoncarew): Replace with the implementation from package:intl.
+  String str = value.toString();
+  int pos = 3;
+  while (str.length > pos) {
+    int len = str.length;
+    str = '${str.substring(0, len - pos)},${str.substring(len - pos)}';
+    pos += 4;
+  }
+  return str;
+}
+
 /**
  * A function that can be used to generate HTML output into the given [buffer].
  * The HTML that is generated must be valid (special characters must already be
@@ -590,6 +603,11 @@ class GetHandler2 implements AbstractGetHandler {
     });
   }
 
+  void _returnRedirect(HttpRequest request, String pathFragment) {
+    HttpResponse response = request.response;
+    response.redirect(request.uri.resolve(pathFragment));
+  }
+
   /**
    * Return a response indicating the status of the analysis server.
    */
@@ -607,11 +625,6 @@ class GetHandler2 implements AbstractGetHandler {
     });
   }
 
-  void _returnRedirect(HttpRequest request, String pathFragment) {
-    HttpResponse response = request.response;
-    response.redirect(request.uri.resolve(pathFragment));
-  }
-
   /**
    * Return an error in response to an unrecognized request received by the HTTP
    * server.
@@ -1244,15 +1257,3 @@ class GetHandler2 implements AbstractGetHandler {
     return '<a href="$href" $classAttribute>$innerHtml</a>';
   }
 }
-
-String _writeWithSeparators(int value) {
-  // TODO(devoncarew): Replace with the implementation from package:intl.
-  String str = value.toString();
-  int pos = 3;
-  while (str.length > pos) {
-    int len = str.length;
-    str = '${str.substring(0, len - pos)},${str.substring(len - pos)}';
-    pos += 4;
-  }
-  return str;
-}

pkg/analysis_server/lib/src/utilities/change_builder_core.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/provisional/edit/utilities/change_builder_core.dart';
 
 /**

pkg/analysis_server/lib/src/utilities/change_builder_dart.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol_generated.dart'
     hide Element, ElementKind;
 import 'package:analysis_server/src/provisional/edit/utilities/change_builder_core.dart';
 import 'package:analysis_server/src/provisional/edit/utilities/change_builder_dart.dart';

pkg/analysis_server/test/analysis/get_errors_test.dart

@@ -6,7 +6,8 @@ library test.analysis.get_errors;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/get_hover_test.dart

@@ -6,7 +6,8 @@ library test.domain.analysis.hover;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 

pkg/analysis_server/test/analysis/get_navigation_test.dart

@@ -4,7 +4,8 @@
 
 library test.analysis.get_navigation;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/analysis/navigation_collector_test.dart

@@ -4,7 +4,7 @@
 
 library test.analysis.navigation_collector;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/domains/analysis/navigation.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/notification_analysis_options_test.dart

@@ -4,7 +4,8 @@
 
 library test.analysis.notification_analysis_options_test;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart'
     hide AnalysisOptions;
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_analysis.dart';

pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart

@@ -6,7 +6,8 @@ library test.analysis.notification.analyzedDirectories;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/notification_errors_test.dart

@@ -4,7 +4,8 @@
 
 library test.analysis.notification_errors;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/domain_analysis.dart';

pkg/analysis_server/test/analysis/notification_highlights_test.dart

@@ -6,7 +6,8 @@ library test.analysis.notification.highlights;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/notification_highlights_test2.dart

@@ -6,7 +6,8 @@ library test.analysis.notification.highlights2;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/notification_implemented_test.dart

@@ -6,7 +6,8 @@ library test.analysis.notification.implemented;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/analysis/notification_navigation_test.dart

@@ -6,7 +6,8 @@ library test.analysis.notification.navigation;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/notification_occurrences_test.dart

@@ -6,7 +6,8 @@ library test.analysis.notification.occurrences;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/notification_outline_test.dart

@@ -6,7 +6,8 @@ library test.analysis.notification.outline;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/notification_overrides_test.dart

@@ -6,7 +6,8 @@ library test.analysis.notification.overrides;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/analysis/reanalyze_test.dart

@@ -4,7 +4,8 @@
 
 library test.analysis.reanalyze;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/analysis/set_priority_files_test.dart

@@ -4,7 +4,8 @@
 
 library test.analysis.set_priority_files;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analyzer/src/generated/engine.dart'
     show InternalAnalysisContext;

pkg/analysis_server/test/analysis/update_content_test.dart

@@ -4,7 +4,8 @@
 
 library test.analysis.updateContent;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/services/index/index.dart';

pkg/analysis_server/test/analysis_abstract.dart

@@ -4,7 +4,8 @@
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart'
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart'
     hide AnalysisOptions;
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';

pkg/analysis_server/test/analysis_server_test.dart

@@ -2,11 +2,10 @@
 // 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 test.analysis_server;
-
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/context_manager.dart';

pkg/analysis_server/test/channel/byte_stream_channel_test.dart

@@ -8,7 +8,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/src/channel/byte_stream_channel.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/channel/web_socket_channel_test.dart

@@ -6,7 +6,7 @@ library test.channel.web_socket;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/src/channel/web_socket_channel.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/completion_test_support.dart

@@ -2,12 +2,10 @@
 // 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 test.completion.support;
-
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:test/test.dart';
 
 import 'domain_completion_test.dart';

pkg/analysis_server/test/domain_analysis_test.dart

@@ -2,11 +2,10 @@
 // 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 test.domain.analysis;
-
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_analysis.dart';

pkg/analysis_server/test/domain_completion_test.dart

@@ -6,7 +6,8 @@ library test.domain.completion;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/domain_completion.dart';
 import 'package:analysis_server/src/plugin/plugin_manager.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart';

pkg/analysis_server/test/domain_completion_util.dart

@@ -2,11 +2,10 @@
 // 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 test.domain.completion;
-
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_completion.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';

pkg/analysis_server/test/domain_diagnostic_test.dart

@@ -2,9 +2,7 @@
 // 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 test.domain.diagnostic;
-
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/domain_diagnostic.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analysis_server/test/domain_execution_test.dart

@@ -2,9 +2,8 @@
 // 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 test.domain.execution;
-
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_execution.dart';

pkg/analysis_server/test/domain_server_test.dart

@@ -2,9 +2,8 @@
 // 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 test.domain.server;
-
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_server.dart';

pkg/analysis_server/test/edit/assists_test.dart

@@ -4,7 +4,8 @@
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/edit/edit_domain.dart';
 import 'package:analysis_server/src/plugin/plugin_manager.dart';
 import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;

pkg/analysis_server/test/edit/fixes_test.dart

@@ -4,7 +4,8 @@
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/edit/edit_domain.dart';
 import 'package:analysis_server/src/plugin/plugin_manager.dart';
 import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;

pkg/analysis_server/test/edit/format_test.dart

@@ -6,7 +6,8 @@ library test.edit.format;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/edit/edit_domain.dart';
 import 'package:plugin/manager.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/edit/organize_directives_test.dart

@@ -6,7 +6,8 @@ library test.edit.organize_directives;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/edit/edit_domain.dart';
 import 'package:plugin/manager.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/edit/refactoring_test.dart

@@ -6,7 +6,8 @@ library test.edit.refactoring;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/edit/edit_domain.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analyzer/task/dart.dart';

pkg/analysis_server/test/edit/sort_members_test.dart

@@ -6,7 +6,8 @@ library test.edit.sort_members;
 
 import 'dart:async';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/edit/edit_domain.dart';
 import 'package:plugin/manager.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/edit/statement_completion_test.dart

@@ -4,7 +4,8 @@
 
 library test.edit.statement_completion;
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/edit/edit_domain.dart';
 import 'package:plugin/manager.dart';
 import 'package:test/test.dart';

pkg/analysis_server/test/integration/analysis/analysis_options_test.dart

@@ -2,12 +2,12 @@
 // 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/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../integration_tests.dart';
+import '../support/integration_tests.dart';
 
 main() {
   defineReflectiveSuite(() {

pkg/analysis_server/test/integration/analysis/error_test.dart

@@ -2,11 +2,11 @@
 // 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/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../integration_tests.dart';
+import '../support/integration_tests.dart';
 
 main() {
   defineReflectiveSuite(() {

pkg/analysis_server/test/integration/analysis/get_errors_nonStandard_sdk.dart

@@ -5,14 +5,14 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:analysis_server/plugin/protocol/protocol.dart';
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../../mock_sdk.dart';
-import '../integration_tests.dart';
+import '../support/integration_tests.dart';
 
 main() {
   defineReflectiveSuite(() {