Fix for 'execution.mapUri' with the new analysis driver.

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 79 matching lines @@
    */
   Response mapUri(Request request) {
     ExecutionMapUriParams params =
         new ExecutionMapUriParams.fromRequest(request);
     String contextId = params.id;
     String path = contextMap[contextId];
     if (path == null) {
       return new Response.invalidParameter(request, 'id',
           'There is no execution context with an id of $contextId');
     }
-    AnalysisContext context = server.getContainingContext(path);
-    if (context == null) {
-      return new Response.invalidExecutionContext(request, contextId);
+
+    SourceFactory sourceFactory;
+    if (server.options.enableNewAnalysisDriver) {
+      var driver = server.getAnalysisDriver(path);
+      if (driver == null) {
+        return new Response.invalidExecutionContext(request, contextId);
+      }
+      sourceFactory = driver.sourceFactory;
+    } else {
+      AnalysisContext context = server.getContainingContext(path);
+      if (context == null) {
+        return new Response.invalidExecutionContext(request, contextId);
+      }
+      sourceFactory = context.sourceFactory;
     }
+
     String file = params.file;
     String uri = params.uri;
     if (file != null) {
       if (uri != null) {
         return new Response.invalidParameter(request, 'file',
             'Either file or uri must be provided, but not both');
       }
       Resource resource = server.resourceProvider.getResource(file);
       if (!resource.exists) {
         return new Response.invalidParameter(request, 'file', 'Must exist');
       } else if (resource is! File) {
         return new Response.invalidParameter(
             request, 'file', 'Must not refer to a directory');
       }
       ContextSourcePair contextSource = server.getContextSourcePair(file);
       Source source = contextSource.source;
       if (source.uriKind != UriKind.FILE_URI) {
         uri = source.uri.toString();
       } else {
-        uri = context.sourceFactory.restoreUri(source).toString();
+        uri = sourceFactory.restoreUri(source).toString();
       }
       return new ExecutionMapUriResult(uri: uri).toResponse(request.id);
     } else if (uri != null) {
-      Source source = context.sourceFactory.forUri(uri);
+      Source source = sourceFactory.forUri(uri);
       if (source == null) {
         return new Response.invalidParameter(request, 'uri', 'Invalid URI');
       }
       file = source.fullName;
       return new ExecutionMapUriResult(file: file).toResponse(request.id);
     }
     return new Response.invalidParameter(
         request, 'file', 'Either file or uri must be provided');
   }
 
@@ skipping 97 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();
   }
 }