Implement also 'execution.mapUri' for file to URI.

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';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
  * Instances of the class [ExecutionDomainHandler] implement a [RequestHandler]
  * that handles requests in the `execution` domain.
  */
 class ExecutionDomainHandler implements RequestHandler {
   /**
    * The analysis server that is using this handler to process requests.
@@ skipping 67 matching lines @@
     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');
     }
 
     SourceFactory sourceFactory;
+    AnalysisDriver driver;
     if (server.options.enableNewAnalysisDriver) {
-      var driver = server.getAnalysisDriver(path);
+      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;
+
+      Source source;
+      if (server.options.enableNewAnalysisDriver) {
+        source = driver.fsState.getFileForPath(file).source;
+      } else {
+        ContextSourcePair contextSource = server.getContextSourcePair(file);
+        source = contextSource.source;
+      }
       if (source.uriKind != UriKind.FILE_URI) {
         uri = source.uri.toString();
       } else {
         uri = sourceFactory.restoreUri(source).toString();
       }
       return new ExecutionMapUriResult(uri: uri).toResponse(request.id);
     } else if (uri != null) {
       Source source = sourceFactory.forUri(uri);
       if (source == null) {
         return new Response.invalidParameter(request, 'uri', 'Invalid URI');
@@ skipping 105 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();
   }
 }