cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(transformers): show nice error message when an invalid uri is found

Browse Source 
Closes #4731
This commit is contained in:
Tobias Bosch 2015-10-14 08:08:28 -07:00
parent efddc9069c
commit 6436f96fd1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules_dart/transform/lib/src/transform/common/code/uri.dart
View File

@ -61,7 +61,7 @@ bool _canImportRelative(Uri importUri, {Uri from}) {
bool _canPackageImport(Uri assetImport) { bool _canPackageImport(Uri assetImport) {
if (assetImport == null) throw new ArgumentError.notNull('assetImport'); if (assetImport == null) throw new ArgumentError.notNull('assetImport');
if (!assetImport.isAbsolute || assetImport.scheme != 'asset') { if (!assetImport.isAbsolute || assetImport.scheme != 'asset') {
throw new ArgumentError.value(assetImport, 'assetImport', throw new ArgumentError.value(assetImport.toString(), 'assetImport',
'Must be an absolute uri using the asset: scheme'); 'Must be an absolute uri using the asset: scheme');
} }
return assetImport.pathSegments.length >= 2 && return assetImport.pathSegments.length >= 2 &&

6
modules_dart/transform/lib/src/transform/common/url_resolver.dart
View File

@ -46,7 +46,7 @@ Uri toAssetScheme(Uri absoluteUri) {
if (!absoluteUri.isAbsolute) { if (!absoluteUri.isAbsolute) {
throw new ArgumentError.value( throw new ArgumentError.value(
absoluteUri, 'absoluteUri', 'Value passed must be an absolute uri'); absoluteUri.toString(), 'absoluteUri', 'Value passed must be an absolute uri');
} }
if (absoluteUri.scheme == 'asset') { if (absoluteUri.scheme == 'asset') {
if (absoluteUri.pathSegments.length < 3) { if (absoluteUri.pathSegments.length < 3) {
@ -54,7 +54,7 @@ Uri toAssetScheme(Uri absoluteUri) {
'An asset: URI must have at least 3 path ' 'An asset: URI must have at least 3 path '
'segments, for example ' 'segments, for example '
'asset:<package-name>/<first-level-dir>/<path-to-dart-file>.', 'asset:<package-name>/<first-level-dir>/<path-to-dart-file>.',
absoluteUri); absoluteUri.toString());
} }
return absoluteUri; return absoluteUri;
} }
@ -68,7 +68,7 @@ Uri toAssetScheme(Uri absoluteUri) {
'A package: URI must have at least 2 path ' 'A package: URI must have at least 2 path '
'segments, for example ' 'segments, for example '
'package:<package-name>/<path-to-dart-file>', 'package:<package-name>/<path-to-dart-file>',
absoluteUri); absoluteUri.toString());
} }
var pathSegments = absoluteUri.pathSegments.toList()..insert(1, 'lib'); var pathSegments = absoluteUri.pathSegments.toList()..insert(1, 'lib');