Chromium Code Reviews| Index: pkg/analyzer/lib/src/generated/source.dart |
| diff --git a/pkg/analyzer/lib/src/generated/source.dart b/pkg/analyzer/lib/src/generated/source.dart |
| index 3c25f11515a37258a001973ff0c6a2f71fedea9d..950f36e0abf325bacace6e47493e8f3f2bababef 100644 |
| --- a/pkg/analyzer/lib/src/generated/source.dart |
| +++ b/pkg/analyzer/lib/src/generated/source.dart |
| @@ -834,8 +834,13 @@ class SourceFactory { |
| // Check .packages and update target and actual URIs as appropriate. |
| if (_packages != null && containedUri.scheme == 'package') { |
| - Uri packageUri = |
| - _packages.resolve(containedUri, notFound: (Uri packageUri) => null); |
| + Uri packageUri = null; |
| + try { |
| + packageUri = |
| + _packages.resolve(containedUri, notFound: (Uri packageUri) => null); |
| + } on ArgumentError { |
| + // Fall through to try resolvers. |
| + } |
| if (packageUri != null) { |
|
Brian Wilkerson
2016/01/09 16:02:39
This 'if' ought to be inside the 'try' because pac
skybrian
2016/01/09 19:26:45
That's true but it seems like it would be less cle
Brian Wilkerson
2016/01/10 16:55:25
I disagree (hence the comment), but it's your call
|
| // Ensure scheme is set. |