Add an option to enable the new task model

pkg/analysis_server/lib/src/server/driver.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 driver;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 
@@ skipping 186 matching lines @@
   static const String CLIENT_VERSION = "client-version";
 
   /**
    * The name of the option used to enable incremental resolution of API
    * changes.
    */
   static const String ENABLE_INCREMENTAL_RESOLUTION_API =
       "enable-incremental-resolution-api";
 
   /**
+   * The name of the option used to enable instrumentation.
+   */
+  static const String ENABLE_INSTRUMENTATION_OPTION = "enable-instrumentation";
+
+  /**
+   * The name of the option used to enable the use of the new task model.
+   */
+  static const String ENABLE_NEW_TASK_MODEL = "enable-new-task-model";
+
+  /**
+   * The name of the option used to set the file read mode.
+   */
+  static const String FILE_READ_MODE = "file-read-mode";
+
+  /**
+   * The name of the option used to print usage information.
+   */
+  static const String HELP_OPTION = "help";
+
+  /**
    * The name of the option used to describe the incremental resolution logger.
    */
   static const String INCREMENTAL_RESOLUTION_LOG = "incremental-resolution-log";
 
   /**
    * The name of the option used to enable validation of incremental resolution
    * results.
    */
   static const String INCREMENTAL_RESOLUTION_VALIDATION =
       "incremental-resolution-validation";
 
   /**
    * The name of the option used to cause instrumentation to also be written to
    * a local file.
    */
   static const String INSTRUMENTATION_LOG_FILE = "instrumentation-log-file";
 
   /**
-   * The name of the option used to enable instrumentation.
+   * The name of the option used to specify if [print] should print to the
+   * console instead of being intercepted.
    */
-  static const String ENABLE_INSTRUMENTATION_OPTION = "enable-instrumentation";
-
-  /**
-   * The name of the option used to print usage information.
-   */
-  static const String HELP_OPTION = "help";
+  static const String INTERNAL_DELAY_FREQUENCY = 'internal-delay-frequency';
 
   /**
    * The name of the option used to specify if [print] should print to the
    * console instead of being intercepted.
    */
   static const String INTERNAL_PRINT_TO_CONSOLE = "internal-print-to-console";
 
   /**
-   * The name of the option used to specify if [print] should print to the
-   * console instead of being intercepted.
+   * The name of the flag used to disable error notifications.
    */
-  static const String INTERNAL_DELAY_FREQUENCY = 'internal-delay-frequency';
+  static const String NO_ERROR_NOTIFICATION = "no-error-notification";
+
+  /**
+   * The name of the flag used to disable the index.
+   */
+  static const String NO_INDEX = "no-index";
 
   /**
    * The option for specifying the http diagnostic port.
    * If specified, users can review server status and performance information
    * by opening a web browser on http://localhost:<port>
    */
   static const String PORT_OPTION = "port";
 
   /**
    * The path to the SDK.
    * TODO(paulberry): get rid of this once the 'analysis.updateSdks' request is
    * operational.
    */
   static const String SDK_OPTION = "sdk";
 
   /**
-   * The name of the flag used to disable error notifications.
-   */
-  static const String NO_ERROR_NOTIFICATION = "no-error-notification";
-
-  /**
-   * The name of the flag used to disable the index.
-   */
-  static const String NO_INDEX = "no-index";
-
-  /**
-   * The name of the option used to set the file read mode.
-   */
-  static const String FILE_READ_MODE = "file-read-mode";
-
-  /**
    * The instrumentation server that is to be used by the analysis server.
    */
   InstrumentationServer instrumentationServer;
 
   /**
    * The plugins that are defined outside the analysis_server package.
    */
   List<Plugin> _userDefinedPlugins = <Plugin>[];
 
   SocketServer socketServer;
@@ skipping 15 matching lines @@
    * Use the given command-line [arguments] to start this server.
    */
   void start(List<String> arguments) {
     CommandLineParser parser = _createArgParser();
     ArgResults results = parser.parse(arguments, <String, String>{});
     if (results[HELP_OPTION]) {
       _printUsage(parser.parser);
       return;
     }
 
-    // TODO(brianwilkerson) Enable this after it is possible for an
-    // instrumentation server to be provided.
-//    if (results[ENABLE_INSTRUMENTATION_OPTION]) {
-//      if (instrumentationServer == null) {
-//        print('Exiting server: enabled instrumentation without providing an instrumentation server');
-//        print('');
-//        _printUsage(parser);
-//        return;
-//      }
-//    } else {
-//      if (instrumentationServer != null) {
-//        print('Exiting server: providing an instrumentation server without enabling instrumentation');
-//        print('');
-//        _printUsage(parser);
-//        return;
-//      }
-//    }
-
     // TODO (danrubel) Remove this workaround
     // once the underlying VM and dart:io issue has been fixed.
     if (results[INTERNAL_DELAY_FREQUENCY] != null) {
       AnalysisServer.performOperationDelayFreqency =
           int.parse(results[INTERNAL_DELAY_FREQUENCY], onError: (_) => 0);
     }
 
     int port;
     bool serve_http = false;
     if (results[PORT_OPTION] != null) {
@@ skipping 21 matching lines @@
     _initIncrementalLogger(results[INCREMENTAL_RESOLUTION_LOG]);
 
     DartSdk defaultSdk;
     if (results[SDK_OPTION] != null) {
       defaultSdk = new DirectoryBasedDartSdk(new JavaFile(results[SDK_OPTION]));
     } else {
       // No path to the SDK provided; use DirectoryBasedDartSdk.defaultSdk,
       // which will make a guess.
       defaultSdk = DirectoryBasedDartSdk.defaultSdk;
     }
-
+    //
+    // Initialize the instrumentation service.
+    //
     if (instrumentationServer != null) {
       String filePath = results[INSTRUMENTATION_LOG_FILE];
       if (filePath != null) {
         instrumentationServer = new MulticastInstrumentationServer(
             [instrumentationServer, new FileInstrumentationServer(filePath)]);
       }
     }
     InstrumentationService service =
         new InstrumentationService(instrumentationServer);
     service.logVersion(_readUuid(service), results[CLIENT_ID],
         results[CLIENT_VERSION], AnalysisServer.VERSION, defaultSdk.sdkVersion);
     AnalysisEngine.instance.instrumentationService = service;
     //
+    // Enable the new task model, if appropriate.
+    //
+    if (results[ENABLE_NEW_TASK_MODEL]) {
+      AnalysisEngine.instance.useTaskModel = true;
+    }
+    //
     // Process all of the plugins so that extensions are registered.
     //
     ServerPlugin serverPlugin = new ServerPlugin();
     List<Plugin> plugins = <Plugin>[];
     plugins.add(AnalysisEngine.instance.enginePlugin);
     plugins.add(serverPlugin);
     plugins.addAll(_userDefinedPlugins);
     ExtensionManager manager = new ExtensionManager();
     manager.processPlugins(plugins);
-
+    //
+    // Create the sockets and start listening for requests.
+    //
     socketServer = new SocketServer(
         analysisServerOptions, defaultSdk, service, serverPlugin);
     httpServer = new HttpAnalysisServer(socketServer);
     stdioServer = new StdioAnalysisServer(socketServer);
     socketServer.userDefinedPlugins = _userDefinedPlugins;
 
     if (serve_http) {
       httpServer.serveHttp(port);
     }
 
@@ skipping 48 matching lines @@
         help: "an identifier used to identify the client");
     parser.addOption(CLIENT_VERSION, help: "the version of the client");
     parser.addFlag(ENABLE_INCREMENTAL_RESOLUTION_API,
         help: "enable using incremental resolution for API changes",
         defaultsTo: false,
         negatable: false);
     parser.addFlag(ENABLE_INSTRUMENTATION_OPTION,
         help: "enable sending instrumentation information to a server",
         defaultsTo: false,
         negatable: false);
+    parser.addFlag(ENABLE_NEW_TASK_MODEL,
+        help: "enable the use of the new task model",
+        defaultsTo: false,
+        hide: true,
+        negatable: false);
     parser.addFlag(HELP_OPTION,
         help: "print this help message without starting a server",
         defaultsTo: false,
         negatable: false);
     parser.addOption(INCREMENTAL_RESOLUTION_LOG,
         help: "the description of the incremental resolution log");
     parser.addFlag(INCREMENTAL_RESOLUTION_VALIDATION,
         help: "enable validation of incremental resolution results (slow)",
         defaultsTo: false,
         negatable: false);
@@ skipping 63 matching lines @@
       uuidFile.parent.createSync(recursive: true);
       uuidFile.writeAsStringSync(uuid);
     } catch (exception, stackTrace) {
       service.logPriorityException(exception, stackTrace);
       // Slightly alter the uuid to indicate it was not persisted
       uuid = 'temp-$uuid';
     }
     return uuid;
   }
 }