Add '--useAnalysisHighlight2' option to generate version 2 of semantic highlight.

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 'dart:collection';
 import 'dart:core' hide Resource;
 import 'dart:math' show max;
@@ skipping 65 matching lines @@
   static final String VERSION = '1.8.0';
 
   /**
    * The number of milliseconds to perform operations before inserting
    * a 1 millisecond delay so that the VM and dart:io can deliver content
    * to stdin. This should be removed once the underlying problem is fixed.
    */
   static int performOperationDelayFreqency = 25;
 
   /**
+   * The options of this server instance.
+   */
+  AnalysisServerOptions options;
+
+  /**
    * The channel from which requests are received and to which responses should
    * be sent.
    */
   final ServerCommunicationChannel channel;
 
   /**
    * The [ResourceProvider] using which paths are converted into [Resource]s.
    */
   final ResourceProvider resourceProvider;
 
@@ skipping 177 matching lines @@
    * If a [contextManager] is provided, then the [packageResolverProvider] will
    * be ignored.
    *
    * If [rethrowExceptions] is true, then any exceptions thrown by analysis are
    * propagated up the call stack.  The default is true to allow analysis
    * exceptions to show up in unit tests, but it should be set to false when
    * running a full analysis server.
    */
   AnalysisServer(this.channel, this.resourceProvider,
       OptimizingPubPackageMapProvider packageMapProvider, Index _index,
-      this.serverPlugin, AnalysisServerOptions analysisServerOptions,
-      this.defaultSdk, this.instrumentationService,
-      {ContextManager contextManager: null,
+      this.serverPlugin, this.options, this.defaultSdk,
+      this.instrumentationService, {ContextManager contextManager: null,
       ResolverProvider packageResolverProvider: null,
       this.rethrowExceptions: true})
       : index = _index,
         searchEngine = _index != null ? createSearchEngine(_index) : null {
     _performance = performanceDuringStartup;
     operationQueue = new ServerOperationQueue();
     if (contextManager == null) {
       contextManager = new ServerContextManager(this, resourceProvider,
           packageResolverProvider, packageMapProvider, instrumentationService);
-      AnalysisOptionsImpl options =
+      AnalysisOptionsImpl analysisOptions =
           (contextManager as ServerContextManager).defaultOptions;
-      options.incremental = true;
-      options.incrementalApi =
-          analysisServerOptions.enableIncrementalResolutionApi;
-      options.incrementalValidation =
-          analysisServerOptions.enableIncrementalResolutionValidation;
-      options.generateImplicitErrors = false;
+      analysisOptions.incremental = true;
+      analysisOptions.incrementalApi = options.enableIncrementalResolutionApi;
+      analysisOptions.incrementalValidation =
+          options.enableIncrementalResolutionValidation;
+      analysisOptions.generateImplicitErrors = false;
     } else if (contextManager is! ServerContextManager) {
       // TODO(brianwilkerson) Remove this when the interface is complete.
       throw new StateError(
           'The contextManager must be an instance of ServerContextManager');
     }
     this.contextManager = contextManager;
-    _noErrorNotification = analysisServerOptions.noErrorNotification;
+    _noErrorNotification = options.noErrorNotification;
     AnalysisEngine.instance.logger = new AnalysisLogger();
     _onAnalysisStartedController = new StreamController.broadcast();
     _onFileAnalyzedController = new StreamController.broadcast();
     _onPriorityChangeController =
         new StreamController<PriorityChangeEvent>.broadcast();
     running = true;
     onAnalysisStarted.first.then((_) {
       onAnalysisComplete.then((_) {
         performanceAfterStartup = new ServerPerformance();
         _performance = performanceAfterStartup;
@@ skipping 973 matching lines @@
     }
     performOperationPending = true;
   }
 }
 
 class AnalysisServerOptions {
   bool enableIncrementalResolutionApi = false;
   bool enableIncrementalResolutionValidation = false;
   bool noErrorNotification = false;
   bool noIndex = false;
+  bool useAnalysisHighlight2 = false;
   String fileReadMode = 'as-is';
 }
 
 /**
  * Information about a file - an [AnalysisContext] that analyses the file,
  * and the [Source] representing the file in this context.
  */
 class ContextSourcePair {
   /**
    * A context that analysis the file.
@@ skipping 43 matching lines @@
         new StreamController<ContextsChangedEvent>.broadcast();
   }
 
   /**
    * The stream that is notified when contexts are added or removed.
    */
   Stream<ContextsChangedEvent> get onContextsChanged =>
       _onContextsChangedController.stream;
 
   @override
-  AnalysisContext addContext(Folder folder, UriResolver packageUriResolver, Packages packages) {
+  AnalysisContext addContext(
+      Folder folder, UriResolver packageUriResolver, Packages packages) {
     InternalAnalysisContext context =
         AnalysisEngine.instance.createAnalysisContext();
     context.contentCache = analysisServer.overlayState;
     analysisServer.folderMap[folder] = context;
     context.sourceFactory = _createSourceFactory(packageUriResolver, packages);
     context.analysisOptions = new AnalysisOptionsImpl.from(defaultOptions);
     _onContextsChangedController
         .add(new ContextsChangedEvent(added: [context]));
     analysisServer.schedulePerformAnalysisOperation(context);
     return context;
@@ skipping 77 matching lines @@
       PubStatus pubStatus = new PubStatus(computing);
       ServerStatusParams params = new ServerStatusParams(pub: pubStatus);
       analysisServer.sendNotification(params.toNotification());
     }
   }
 
   /**
    * Set up a [SourceFactory] that resolves packages using the given
    * [packageUriResolver] and [packages] resolution strategy.
    */
-  SourceFactory _createSourceFactory(UriResolver packageUriResolver, Packages packages) {
+  SourceFactory _createSourceFactory(
+      UriResolver packageUriResolver, Packages packages) {
     UriResolver dartResolver = new DartUriResolver(analysisServer.defaultSdk);
     UriResolver resourceResolver = new ResourceUriResolver(resourceProvider);
     List<UriResolver> resolvers = [];
     resolvers.add(dartResolver);
     if (packageUriResolver is PackageMapUriResolver) {
       UriResolver sdkExtResolver =
           new SdkExtUriResolver(packageUriResolver.packageMap);
       resolvers.add(sdkExtResolver);
     }
     if (packageUriResolver != null) {
@@ skipping 99 matching lines @@
   /**
    * The [PerformanceTag] for time spent in server request handlers.
    */
   static PerformanceTag serverRequests = new PerformanceTag('serverRequests');
 
   /**
    * The [PerformanceTag] for time spent in split store microtasks.
    */
   static PerformanceTag splitStore = new PerformanceTag('splitStore');
 }