Unify the server and plugin versions of the generators

pkg/analysis_server/lib/src/domain_diagnostic.dart

 // Copyright (c) 2015, 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.
 
 library analysis_server.src.domain_diagnostic;
 
 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';
 import 'package:analyzer/src/context/context.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart' as nd;
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_collection.dart';
 import 'package:analyzer/src/task/driver.dart';
 import 'package:analyzer/task/model.dart';
@@ skipping 67 matching lines @@
   }
 
   /// Extract context data from the given [driver].
   ContextData extractDataFromDriver(nd.AnalysisDriver driver) {
     int explicitFileCount = driver.addedFiles.length;
     int knownFileCount = driver.knownFiles.length;
     return new ContextData(driver.name, explicitFileCount,
         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 {
       String requestName = request.method;
       if (requestName == DIAGNOSTIC_GET_DIAGNOSTICS) {
         return computeDiagnostics(request);
       } else if (requestName == DIAGNOSTIC_GET_SERVER_PORT) {
         handleGetServerPort(request);
         return Response.DELAYED_RESPONSE;
       }
     } on RequestFailure catch (exception) {
       return exception.response;
     }
     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));
-    }
-  }
 }