Clean-up and progress on analysis server

pkg/analysis_server/lib/src/analysis_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 analysis.server;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_logger.dart';
 import 'package:analysis_server/src/channel.dart';
@@ skipping 48 matching lines @@
    */
   final List<AnalysisContext> contextWorkQueue = new List<AnalysisContext>();
 
   /**
    * Initialize a newly created server to receive requests from and send
    * responses to the given [channel].
    */
   AnalysisServer(this.channel) {
     AnalysisEngine.instance.logger = new AnalysisLogger();
     running = true;
-    // TODO set running=false on done or error
-    channel.listen(handleRequest);
+    channel.listen(handleRequest, onDone: done, onError: error);
   }
 
   /**
    * Add the given [context] to the list of analysis contexts for which analysis
    * work needs to be performed. Ensure that the work will be performed.
    */
   void addContextToWorkQueue(AnalysisContext context) {
     if (!contextWorkQueue.contains(context)) {
       contextWorkQueue.add(context);
       run();
     }
   }
 
   /**
    * The socket from which requests are being read has been closed.
    */
   void done() {
     running = false;
   }
 
   /**
    * There was an error related to the socket from which requests are being
    * read.
    */
-  void error() {
+  void error(argument) {
     running = false;
   }
 
   /**
    * Handle a [request] that was read from the communication channel.
    */
   void handleRequest(Request request) {
     int count = handlers.length;
     for (int i = 0; i < count; i++) {
-      Response response = handlers[i].handleRequest(request);
-      if (response != null) {
-        channel.sendResponse(response);
+      try {
+        Response response = handlers[i].handleRequest(request);
+        if (response != null) {
+          channel.sendResponse(response);
+          return;
+        }
+      } on RequestFailure catch (exception) {
+        channel.sendResponse(exception.response);
         return;
       }
     }
     channel.sendResponse(new Response.unknownRequest(request));
   }
 
   /**
    * Perform the next available task. If a request was received that has not yet
    * been performed, perform it next. Otherwise, look for some analysis that
    * needs to be done and do that. Otherwise, do nothing.
@@ skipping 50 matching lines @@
     }
   }
 
   /**
    * Send the given [notification] to the client.
    */
   void sendNotification(Notification notification) {
     channel.sendNotification(notification);
   }
 }