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

pkg/analysis_server/test/integration/integration_tests.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 test.integration.analysis;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:path/path.dart';
 import 'package:unittest/unittest.dart';
 
 import 'integration_test_methods.dart';
 import 'protocol_matchers.dart';
 
 const Matcher isBool = const isInstanceOf<bool>('bool');
 
 const Matcher isInt = const isInstanceOf<int>('int');
 
-const Matcher isNotification = const MatchesJsonObject('notification', const {
-  'event': isString
-}, optionalFields: const {'params': isMap});
+const Matcher isNotification = const MatchesJsonObject(
+    'notification', const {'event': isString},
+    optionalFields: const {'params': isMap});
 
 const Matcher isObject = isMap;
 
 final Matcher isResponse = new MatchesJsonObject('response', {'id': isString},
     optionalFields: {'result': anything, 'error': isRequestError});
 
 const Matcher isString = const isInstanceOf<String>('String');
 
 Matcher isListOf(Matcher elementMatcher) => new _ListOf(elementMatcher);
 
@@ skipping 110 matching lines @@
     });
     Completer serverConnected = new Completer();
     onServerConnected.listen((_) {
       expect(serverConnected.isCompleted, isFalse);
       serverConnected.complete();
     });
     onServerError.listen((ServerErrorParams params) {
       // A server error should never happen during an integration test.
       fail('${params.message}\n${params.stackTrace}');
     });
-    return server.start().then((_) {
+    return startServer().then((_) {
       server.listenToOutput(dispatchNotification);
       server.exitCode.then((_) {
         skipShutdown = true;
       });
       return serverConnected.future;
     });
   }
 
   /**
    * Convert the given [relativePath] to an absolute path, by interpreting it
@@ skipping 13 matching lines @@
   Future standardAnalysisSetup({bool subscribeStatus: true}) {
     List<Future> futures = <Future>[];
     if (subscribeStatus) {
       futures.add(sendServerSetSubscriptions([ServerService.STATUS]));
     }
     futures.add(sendAnalysisSetAnalysisRoots([sourceDirectory.path], []));
     return Future.wait(futures);
   }
 
   /**
+   * Start [server].
+   */
+  Future startServer() => server.start();
+
+  /**
    * After every test, the server is stopped and [sourceDirectory] is deleted.
    */
   Future tearDown() {
     return _shutdownIfNeeded().then((_) {
       sourceDirectory.deleteSync(recursive: true);
     });
   }
 
   /**
    * Write a source file with the given absolute [pathname] and [contents].
@@ skipping 376 matching lines @@
     _process.stdin.add(UTF8.encoder.convert("${line}\n"));
     return completer.future;
   }
 
   /**
    * Start the server.  If [debugServer] is `true`, the server will be started
    * with "--debug", allowing a debugger to be attached. If [profileServer] is
    * `true`, the server will be started with "--observe" and
    * "--pause-isolates-on-exit", allowing the observatory to be used.
    */
-  Future start({bool debugServer: false, int diagnosticPort, bool profileServer: false}) {
+  Future start({bool debugServer: false, int diagnosticPort,
+      bool profileServer: false, bool useAnalysisHighlight2: false}) {
     if (_process != null) {
       throw new Exception('Process already started');
     }
     _time.start();
     String dartBinary = Platform.executable;
     String rootDir =
         findRoot(Platform.script.toFilePath(windows: Platform.isWindows));
     String serverPath = normalize(join(rootDir, 'bin', 'server.dart'));
     List<String> arguments = [];
     if (debugServer) {
       arguments.add('--debug');
     }
     if (profileServer) {
       arguments.add('--observe');
       arguments.add('--pause-isolates-on-exit');
     }
     if (Platform.packageRoot.isNotEmpty) {
       arguments.add('--package-root=${Platform.packageRoot}');
     }
     arguments.add('--checked');
     arguments.add(serverPath);
     if (diagnosticPort != null) {
       arguments.add('--port');
       arguments.add(diagnosticPort.toString());
     }
+    if (useAnalysisHighlight2) {
+      arguments.add('--useAnalysisHighlight2');
+    }
     return Process.start(dartBinary, arguments).then((Process process) {
       _process = process;
       process.exitCode.then((int code) {
         _recordStdio('TERMINATED WITH EXIT CODE $code');
         if (code != 0) {
           _badDataFromServer();
         }
       });
     });
   }
@@ skipping 237 matching lines @@
   void populateMismatches(item, List<MismatchDescriber> mismatches);
 
   /**
    * Create a [MismatchDescriber] describing a mismatch with a simple string.
    */
   MismatchDescriber simpleDescription(String description) =>
       (Description mismatchDescription) {
     mismatchDescription.add(description);
   };
 }