Hook for overriding the ContextManager and some code clean-up (with more to follow)

pkg/analysis_server/lib/src/socket_server.dart

 // Copyright (c) 2014, 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 socket.server;
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel/channel.dart';
+import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/plugin/server_plugin.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_file_index.dart';
 import 'package:analysis_server/src/source/optimizing_pub_package_map_provider.dart';
 import 'package:analysis_server/uri/resolver_provider.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:plugin/plugin.dart';
 
 /**
  * Instances of the class [SocketServer] implement the common parts of
  * http-based and stdio-based analysis servers.  The primary responsibility of
  * the SocketServer is to manage the lifetime of the AnalysisServer and to
  * encode and decode the JSON messages exchanged with the client.
  */
 class SocketServer {
   final AnalysisServerOptions analysisServerOptions;
   final DirectoryBasedDartSdk defaultSdk;
   final InstrumentationService instrumentationService;
   final ServerPlugin serverPlugin;
+  final ContextManager contextManager;
   final ResolverProvider packageResolverProvider;
 
   /**
    * The analysis server that was created when a client established a
    * connection, or `null` if no such connection has yet been established.
    */
   AnalysisServer analysisServer;
 
   /**
    * The plugins that are defined outside the analysis_server package.
    */
   List<Plugin> userDefinedPlugins;
 
   SocketServer(this.analysisServerOptions, this.defaultSdk,
-      this.instrumentationService, this.serverPlugin,
+      this.instrumentationService, this.serverPlugin, this.contextManager,
       this.packageResolverProvider);
 
   /**
    * Create an analysis server which will communicate with the client using the
    * given serverChannel.
    */
   void createAnalysisServer(ServerCommunicationChannel serverChannel) {
     if (analysisServer != null) {
       RequestError error = new RequestError(
           RequestErrorCode.SERVER_ALREADY_STARTED, "Server already started");
@@ skipping 19 matching lines @@
     if (!analysisServerOptions.noIndex) {
       index = createLocalFileIndex();
       index.contributors = serverPlugin.indexContributors;
       index.run();
     }
 
     analysisServer = new AnalysisServer(serverChannel, resourceProvider,
         new OptimizingPubPackageMapProvider(resourceProvider, defaultSdk),
         index, serverPlugin, analysisServerOptions, defaultSdk,
         instrumentationService,
+        contextManager: contextManager,
         packageResolverProvider: packageResolverProvider,
         rethrowExceptions: false);
     analysisServer.userDefinedPlugins = userDefinedPlugins;
   }
 }