Translate package URIs to resource URIs for diagnostics.

pkg/compiler/lib/src/mirrors/dart2js_mirrors.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 dart2js.mirrors;
 
 import 'dart:collection' show UnmodifiableListView, UnmodifiableMapView;
 
 import '../constants/expressions.dart';
 import '../constants/values.dart';
@@ skipping 175 matching lines @@
     return getBeginToken();
   }
 
   Script getScript() => _element.compilationUnit.script;
 
   SourceLocation get location {
     Token beginToken = getFirstToken();
     Script script = getScript();
     SourceSpan span;
     if (beginToken == null) {
-      span = new SourceSpan(script.readableUri, 0, 0);
+      span = new SourceSpan(script.resourceUri, 0, 0);
     } else {
       Token endToken = getEndToken();
       span = mirrorSystem.compiler.spanFromTokens(
-          beginToken, endToken, script.readableUri);
+          beginToken, endToken, script.resourceUri);
     }
     return new Dart2JsSourceLocation(script, span);
   }
 
   String toString() => _element.toString();
 
   void _appendCommentTokens(Token commentToken) {
     while (commentToken != null && commentToken.kind == COMMENT_TOKEN) {
       _metadata.add(new Dart2JsCommentInstanceMirror(
           mirrorSystem, commentToken.value));
@@ skipping 263 matching lines @@
     if (!parameter.hasDefaultValue) return null;
     ParameterElement parameterElement = parameter._element;
     Compiler compiler = parameter.mirrorSystem.compiler;
     return compiler.constants.getConstantForVariable(parameterElement);
   }
 
   static Mirror getMirrorFromElement(Dart2JsMirror mirror, Element element) {
     return _convertElementToDeclarationMirror(mirror.mirrorSystem, element);
   }
 }