Revert "Tweaks to the analyzer_cli."

pkg/analysis_server/lib/src/domain_execution.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 domain.execution;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:core';
 
@@ skipping 141 matching lines @@
       return new ExecutionMapUriResult(file: file).toResponse(request.id);
     }
     return new Response.invalidParameter(
         request, 'file', 'Either file or uri must be provided');
   }
 
   /**
    * Implement the 'execution.setSubscriptions' request.
    */
   Response setSubscriptions(Request request) {
-    if (server.options.enableNewAnalysisDriver) {
-      return new ExecutionSetSubscriptionsResult().toResponse(request.id);
+    List<ExecutionService> subscriptions =
+        new ExecutionSetSubscriptionsParams.fromRequest(request).subscriptions;
+    if (subscriptions.contains(ExecutionService.LAUNCH_DATA)) {
+      if (onFileAnalyzed == null) {
+        onFileAnalyzed = server.onFileAnalyzed.listen(_fileAnalyzed);
+        _reportCurrentFileStatus();
+      }
     } else {
-      List<ExecutionService> subscriptions =
-          new ExecutionSetSubscriptionsParams.fromRequest(request).subscriptions;
-      if (subscriptions.contains(ExecutionService.LAUNCH_DATA)) {
-        if (onFileAnalyzed == null) {
-          onFileAnalyzed = server.onFileAnalyzed.listen(_fileAnalyzed);
-          _reportCurrentFileStatus();
-        }
-      } else {
-        if (onFileAnalyzed != null) {
-          onFileAnalyzed.cancel();
-          onFileAnalyzed = null;
-        }
+      if (onFileAnalyzed != null) {
+        onFileAnalyzed.cancel();
+        onFileAnalyzed = null;
       }
-      return new ExecutionSetSubscriptionsResult().toResponse(request.id);
     }
+    return new ExecutionSetSubscriptionsResult().toResponse(request.id);
   }
 
   void _fileAnalyzed(ChangeNotice notice) {
     ServerPerformanceStatistics.executionNotifications.makeCurrentWhile(() {
       Source source = notice.source;
       String filePath = source.fullName;
       // check files
       bool isDartFile = notice.resolvedDartUnit != null;
       if (!isDartFile) {
         return;
@@ skipping 69 matching lines @@
     if (_isInAnalysisRoot(filePath)) {
       server.sendNotification(
           new ExecutionLaunchDataParams(filePath, kind: kind).toNotification());
     }
   }
 
   static List<String> _getFullNames(List<Source> sources) {
     return sources.map((Source source) => source.fullName).toList();
   }
 }