- Add getters for the current packageRoot or packageMap.

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';
@@ skipping 580 matching lines @@
    * 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,
       bool newTaskModel: false,
-      bool useAnalysisHighlight2: false}) {
+      bool useAnalysisHighlight2: false}) async {
     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}');
+    Uri packageRoot = await Platform.packageRoot;
+    if (packageRoot != null) {
+      arguments.add('--package-root=${packageRoot.toFilePath()}');
     }

[Lasse Reichstein Nielsen, 2015/09/22 09:48:25]

Add a TODO to support --packages as well.

     arguments.add('--checked');
     arguments.add(serverPath);
     if (diagnosticPort != null) {
       arguments.add('--port');
       arguments.add(diagnosticPort.toString());
     }
     if (useAnalysisHighlight2) {
       arguments.add('--useAnalysisHighlight2');
     }
     if (newTaskModel) {
       arguments.add('--${analysisServer.Driver.ENABLE_NEW_TASK_MODEL}');
     }
-    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();
-        }
-      });
+    _process = await Process.start(dartBinary, arguments);
+    _process.exitCode.then((int code) {

[Lasse Reichstein Nielsen, 2015/09/22 09:48:25]

Tricky. They should consider documenting that this is not waiting for the .then
call here.

+      _recordStdio('TERMINATED WITH EXIT CODE $code');
+      if (code != 0) {
+        _badDataFromServer();
+      }
     });
+    // Complete this function with no value, but signalling that the server
+    // process has started.
+    return null;
   }
 
   /**
    * Deal with bad data received from the server.
    */
   void _badDataFromServer() {
     if (_receivedBadDataFromServer) {
       // We're already dealing with it.
       return;
     }
@@ skipping 234 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);
       };
 }