Libraries should know their original URI, not their translated URI.

dart/lib/compiler/implementation/apiimpl.dart

 // Copyright (c) 2012, 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('leg_apiimpl');
 
 #import('dart:uri');
 
 #import('../compiler.dart', prefix: 'api');
 #import('leg.dart', prefix: 'leg');
@@ skipping 25 matching lines @@
     Uri uri = libraryRoot.resolve(DART2JS_LIBRARY_MAP[path]);
     elements.LibraryElement library = scanner.loadLibrary(uri, null);
     return library;
   }
 
   void log(message) {
     handler(null, null, null, message, false);
   }
 
   leg.Script readScript(Uri uri, [tree.Node node]) {
-    if (uri.scheme == 'dart') {
-      uri = translateDartUri(uri, node);
-    } else if (uri.scheme == 'package') {
-      uri = translatePackageUri(uri, node);
-    }
+    var translated = translateUri(uri, node);
     String text = "";
     try {
       // TODO(ahe): We expect the future to be complete and call value
       // directly. In effect, we don't support truly asynchronous API.
-      text = provider(uri).value;
+      text = provider(translated).value;
     } catch (var exception) {
       if (node !== null) {
         cancel("$exception", node: node);
       } else {
         reportDiagnostic(const leg.SourceSpan(null, null, null),
                          "$exception", true);
         throw new leg.CompilerCancelledException("$exception");
       }
     }
     SourceFile sourceFile = new SourceFile(uri.toString(), text);
     return new leg.Script(uri, sourceFile);
   }
 
+  translateUri(Uri uri, tree.Node node) {

[ngeoffray, 2012/06/13 12:35:54]

Missing return type.

[ahe, 2012/06/13 14:20:26]

Done.

+    switch (uri.scheme) {
+      case 'dart': return translateDartUri(uri, node);
+      case 'package': return translatePackageUri(uri, node);
+      default: return uri;
+    }
+  }
+
   translateDartUri(Uri uri, tree.Node node) {

[ngeoffray, 2012/06/13 12:35:54]

ditto

[ahe, 2012/06/13 14:20:26]

Done.

     String path = DART2JS_LIBRARY_MAP[uri.path];
     if (path === null || uri.path.startsWith('_')) {
       reportError(node, 'library not found ${uri}');
       return null;
     }
     if (uri.path == 'dom_deprecated'
         || uri.path == 'html' || uri.path == 'io') {
       // TODO(ahe): Get rid of mockableLibraryUsed when test.dart
       // supports this use case better.
       mockableLibraryUsed = true;
     }
     return libraryRoot.resolve(path);
   }
 
   translatePackageUri(Uri uri, tree.Node node) => packageRoot.resolve(uri.path);
 
   bool run(Uri uri) {
     bool success = super.run(uri);
     for (final task in tasks) {
       log('${task.name} took ${task.timing}msec');
     }
     return success;
   }
 
   void reportDiagnostic(leg.SourceSpan span, String message, bool fatal) {
     if (span === null) {
       handler(null, null, null, message, fatal);
     } else {
-      handler(span.uri, span.begin, span.end, message, fatal);
+      handler(translateUri(span.uri, null), span.begin, span.end,
+              message, fatal);
     }
   }
 
   bool get isMockCompilation() {
     return mockableLibraryUsed
       && (options.indexOf('--allow-mock-compilation') !== -1);
   }
 }