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

tbosch · tbosch · commit 6436f96fd164 · 2015-10-14T10:20:29.000-07:00
Closes #4731
diff --git a/modules_dart/transform/lib/src/transform/common/code/uri.dart b/modules_dart/transform/lib/src/transform/common/code/uri.dart
@@ -61,7 +61,7 @@ bool _canImportRelative(Uri importUri, {Uri from}) {
 bool _canPackageImport(Uri assetImport) {
   if (assetImport == null) throw new ArgumentError.notNull('assetImport');
   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');
   }
   return assetImport.pathSegments.length >= 2 &&
diff --git a/modules_dart/transform/lib/src/transform/common/url_resolver.dart b/modules_dart/transform/lib/src/transform/common/url_resolver.dart
@@ -46,15 +46,15 @@ Uri toAssetScheme(Uri absoluteUri) {
 
   if (!absoluteUri.isAbsolute) {
     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.pathSegments.length < 3) {
       throw new FormatException(
           'An asset: URI must have at least 3 path '
           'segments, for example '
           'asset:<package-name>/<first-level-dir>/<path-to-dart-file>.',
-          absoluteUri);
+          absoluteUri.toString());
     }
     return absoluteUri;
   }
@@ -68,7 +68,7 @@ Uri toAssetScheme(Uri absoluteUri) {
         'A package: URI must have at least 2 path '
         'segments, for example '
         'package:<package-name>/<path-to-dart-file>',
-        absoluteUri);
+        absoluteUri.toString());
   }
 
   var pathSegments = absoluteUri.pathSegments.toList()..insert(1, 'lib');

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ bool _canImportRelative(Uri importUri, {Uri from}) {`
`61`	`61`	`bool _canPackageImport(Uri assetImport) {`
`62`	`62`	`if (assetImport == null) throw new ArgumentError.notNull('assetImport');`
`63`	`63`	`if (!assetImport.isAbsolute \|\| assetImport.scheme != 'asset') {`
`64`		`- throw new ArgumentError.value(assetImport, 'assetImport',`
	`64`	`+ throw new ArgumentError.value(assetImport.toString(), 'assetImport',`
`65`	`65`	`'Must be an absolute uri using the asset: scheme');`
`66`	`66`	`}`
`67`	`67`	`return assetImport.pathSegments.length >= 2 &&`
Original file line number	Diff line number	Diff line change
`@@ -46,15 +46,15 @@ Uri toAssetScheme(Uri absoluteUri) {`
`46`	`46`
`47`	`47`	`if (!absoluteUri.isAbsolute) {`
`48`	`48`	`throw new ArgumentError.value(`
`49`		`- absoluteUri, 'absoluteUri', 'Value passed must be an absolute uri');`
	`49`	`+ absoluteUri.toString(), 'absoluteUri', 'Value passed must be an absolute uri');`
`50`	`50`	`}`
`51`	`51`	`if (absoluteUri.scheme == 'asset') {`
`52`	`52`	`if (absoluteUri.pathSegments.length < 3) {`
`53`	`53`	`throw new FormatException(`
`54`	`54`	`'An asset: URI must have at least 3 path '`
`55`	`55`	`'segments, for example '`
`56`	`56`	`'asset:<package-name>/<first-level-dir>/<path-to-dart-file>.',`
`57`		`- absoluteUri);`
	`57`	`+ absoluteUri.toString());`
`58`	`58`	`}`
`59`	`59`	`return absoluteUri;`
`60`	`60`	`}`
`@@ -68,7 +68,7 @@ Uri toAssetScheme(Uri absoluteUri) {`
`68`	`68`	`'A package: URI must have at least 2 path '`
`69`	`69`	`'segments, for example '`
`70`	`70`	`'package:<package-name>/<path-to-dart-file>',`
`71`		`- absoluteUri);`
	`71`	`+ absoluteUri.toString());`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`var pathSegments = absoluteUri.pathSegments.toList()..insert(1, 'lib');`