Translate package URIs to resource URIs for diagnostics.

tests/compiler/dart2js/memory_compiler.dart

 // Copyright (c) 2013, 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 dart2js.test.memory_compiler;
 
 import 'memory_source_file_helper.dart';
 
 import 'package:compiler/src/compile_time_constants.dart';
 
 import 'package:compiler/src/dart2jslib.dart'
        show NullSink;
 
-import 'package:compiler/compiler.dart'
-    show Diagnostic, DiagnosticHandler, CompilerOutputProvider;
+import 'package:compiler/compiler.dart' show
+    CompilerOutputProvider,
+    Diagnostic,
+    DiagnosticHandler,
+    PackagesDiscoveryProvider;
 
 import 'dart:async';
 
 import 'package:compiler/src/mirrors/source_mirrors.dart';
 import 'package:compiler/src/mirrors/analyze.dart';
 
 import 'package:compiler/src/library_loader.dart'
     show LoadedLibraries;
 
 export 'output_collector.dart';
@@ skipping 56 matching lines @@
     }
   } else if (diagnosticHandler == null) {
     handler = (Uri uri, int begin, int end, String message, Diagnostic kind) {};
   }
   return handler;
 }
 
 Expando<MemorySourceFileProvider> expando =
     new Expando<MemorySourceFileProvider>();
 
-Compiler compilerFor(Map<String,String> memorySourceFiles,
-                     {DiagnosticHandler diagnosticHandler,
-                      CompilerOutputProvider outputProvider,
-                      List<String> options: const [],
-                      Compiler cachedCompiler,
-                      bool showDiagnostics: true,
-                      Uri packageRoot}) {
+Compiler compilerFor(
+    Map<String, String> memorySourceFiles,
+    {DiagnosticHandler diagnosticHandler,
+     CompilerOutputProvider outputProvider,
+     List<String> options: const [],
+     Compiler cachedCompiler,
+     bool showDiagnostics: true,
+     Uri packageRoot,
+     Uri packageConfig,
+     PackagesDiscoveryProvider packagesDiscoveryProvider}) {
   Uri libraryRoot = Uri.base.resolve('sdk/');
-  if (packageRoot == null) {
+  if (packageRoot == null &&
+      packageConfig == null &&
+      packagesDiscoveryProvider == null) {
     packageRoot = Uri.base.resolveUri(new Uri.file('${Platform.packageRoot}/'));
   }
 
   MemorySourceFileProvider provider;
   var readStringFromUri;
   if (cachedCompiler == null) {
     provider = new MemorySourceFileProvider(memorySourceFiles);
     readStringFromUri = provider.readStringFromUri;
     // Saving the provider in case we need it later for a cached compiler.
     expando[readStringFromUri] = provider;
   } else {
     // When using a cached compiler, it has read a number of files from disk
     // already (and will not attempt to read them again due to caching). These
     // files must be available to the new diagnostic handler.
     provider = expando[cachedCompiler.provider];
     readStringFromUri = cachedCompiler.provider;
     provider.memorySourceFiles = memorySourceFiles;
   }
   var handler =
       createDiagnosticHandler(diagnosticHandler, provider, showDiagnostics);
 
   EventSink<String> noOutputProvider(String name, String extension) {
     if (name != '') throw 'Attempt to output file "$name.$extension"';
     return new NullSink('$name.$extension');
   }
   if (outputProvider == null) {
     outputProvider = noOutputProvider;
   }
 
-  Compiler compiler = new Compiler(readStringFromUri,
-                                   outputProvider,
-                                   handler,
-                                   libraryRoot,
-                                   packageRoot,
-                                   options,
-                                   {});
+  Compiler compiler = new Compiler(
+      readStringFromUri,
+      outputProvider,
+      handler,
+      libraryRoot,
+      packageRoot,
+      options,
+      {},
+      packageConfig,
+      packagesDiscoveryProvider);
+
   if (cachedCompiler != null) {
     compiler.coreLibrary =
         cachedCompiler.libraryLoader.lookupLibrary(Uri.parse('dart:core'));
     compiler.types = cachedCompiler.types.copy(compiler);
     Map copiedLibraries = {};
     cachedCompiler.libraryLoader.libraries.forEach((library) {
       if (library.isPlatformLibrary) {
         var libraryLoader = compiler.libraryLoader;
         libraryLoader.mapLibrary(library);
         compiler.onLibraryCreated(library);
@@ skipping 90 matching lines @@
       createDiagnosticHandler(diagnosticHandler, provider, showDiagnostics);
 
   List<Uri> libraries = <Uri>[];
   memorySourceFiles.forEach((String path, _) {
     libraries.add(new Uri(scheme: 'memory', path: path));
   });
 
   return analyze(libraries, libraryRoot, packageRoot,
                  provider, handler, options);
 }