Make "server.shutdown" exit the analysis server.

pkg/analysis_server/lib/src/channel.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 channel;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
@@ skipping 45 matching lines @@
 
   /**
    * Send the given [notification] to the client.
    */
   void sendNotification(Notification notification);
 
   /**
    * Send the given [response] to the client.
    */
   void sendResponse(Response response);
+
+  /**
+   * Close the communication channel.
+   */
+  void close();
 }
 
 /**
  * Instances of the class [WebSocketClientChannel] implement a
  * [ClientCommunicationChannel] that uses a [WebSocket] to communicate with
  * servers.
  */
 class WebSocketClientChannel implements ClientCommunicationChannel {
   /**
    * The socket being wrapped.
@@ skipping 84 matching lines @@
         return;
       }
       onRequest(request);
     } else if (data is List<int>) {
       // TODO(brianwilkerson) Implement a more efficient protocol.
       sendResponse(new Response.invalidRequestFormat());
     } else {
       sendResponse(new Response.invalidRequestFormat());
     }
   }
+
+  @override
+  void close() {
+    socket.close(WebSocketStatus.NORMAL_CLOSURE);
+  }
 }
 
 /**
  * Instances of the class [ByteStreamClientChannel] implement a
  * [ClientCommunicationChannel] that uses a stream and a sink (typically,
  * standard input and standard output) to communicate with servers.
  */
 class ByteStreamClientChannel implements ClientCommunicationChannel {
   final Stream input;
   final IOSink output;
@@ skipping 55 matching lines @@
   Future get closed {
     return _closed.future;
   }
 
   @override
   void listen(void onRequest(Request request), {Function onError, void
       onDone()}) {
     input.transform((new Utf8Codec()).decoder).transform(new LineSplitter()
         ).listen((String data) => _readRequest(data, onRequest), onError: onError,
         onDone: () {
-      _closed.complete();
+      close();
       onDone();
     });
   }
 
   @override
   void sendNotification(Notification notification) {
+    // Don't send any further notifications after the communication channel is
+    // closed.
+    if (_closed.isCompleted) {
+      return;
+    }
     output.writeln(JSON.encode(notification.toJson()));
   }
 
   @override
   void sendResponse(Response response) {
+    // Don't send any further responses after the communication channel is
+    // closed.
+    if (_closed.isCompleted) {
+      return;
+    }
     output.writeln(JSON.encode(response.toJson()));
   }
 
   /**
    * Read a request from the given [data] and use the given function to handle
    * the request.
    */
   void _readRequest(Object data, void onRequest(Request request)) {
+    // Ignore any further requests after the communication channel is closed.
+    if (_closed.isCompleted) {
+      return;
+    }
     // Parse the string as a JSON descriptor and process the resulting
     // structure as a request.
     Request request = new Request.fromString(data);
     if (request == null) {
       sendResponse(new Response.invalidRequestFormat());
       return;
     }
     onRequest(request);
   }
+
+  @override
+  void close() {
+    if (!_closed.isCompleted) {
+      _closed.complete();
+    }
+  }
 }
 
 /**
  * Instances of the class [JsonStreamDecoder] convert JSON strings to JSON
  * maps.
  */
 class JsonStreamDecoder extends Converter<String, Map> {
   @override
   Map convert(String text) => JSON.decode(text);
 
@@ skipping 62 matching lines @@
       }
     }
   }
 
   @override
   void close() {
     closed = true;
     sink.close();
   }
 }