- Include original, loaded URI in error message.

- Update error string comparison in pub.

BUG=

Review URL: https://codereview.chromium.org//1156983003
This commit is contained in:
Ivan Posva 2015-05-28 00:14:39 -07:00
parent 8a544b0754
commit 0358f722ba
2 changed files with 6 additions and 5 deletions

View file

@ -91,9 +91,10 @@ bool _isWindows = false;
// A class wrapping the load error message in an Error object.
class _LoadError extends Error {
final String message;
_LoadError(this.message);
final String uri;
_LoadError(this.uri, this.message);
String toString() => 'Load Error: $message';
String toString() => 'Load Error for "$uri": $message';
}
// Class collecting all of the information about a particular load request.
@ -280,13 +281,13 @@ void _handleLoaderReply(msg) {
_loadScript(req, dataOrError);
} else {
assert(dataOrError is String);
var error = new _LoadError(dataOrError.toString());
var error = new _LoadError(req._uri, dataOrError.toString());
_asyncLoadError(req, error);
}
} catch(e, s) {
// Wrap inside a _LoadError unless we are already propagating a
// previous _LoadError.
var error = (e is _LoadError) ? e : new _LoadError(e.toString());
var error = (e is _LoadError) ? e : new _LoadError(req._uri, e.toString());
assert(req != null);
_asyncLoadError(req, error);
}

View file

@ -94,7 +94,7 @@ class TransformerIsolate {
// error message.
var missingTransformer = idsToUrls.keys.firstWhere((id) =>
firstErrorLine.startsWith(
"Uncaught Error: Load Error: Failure getting ") &&
"Load Error for") &&
firstErrorLine.contains(idsToUrls[id].path),
orElse: () => throw error);
var packageUri = idToPackageUri(idsToAssetIds[missingTransformer]);