Add packageUriResolver before ResourceUriResolver.

Otherwise execution.mapUri always restores file:// URI.

R=brianwilkerson@google.com
BUG=

Review URL: https://codereview.chromium.org//922433002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@43705 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
scheglov@google.com 2015-02-11 23:06:48 +00:00
parent b1a31838f2
commit 3f5da18831

View file

@ -1233,12 +1233,11 @@ class ServerContextManager extends ContextManager {
* [packageUriResolver].
*/
SourceFactory _createSourceFactory(UriResolver packageUriResolver) {
List<UriResolver> resolvers = <UriResolver>[
new DartUriResolver(analysisServer.defaultSdk),
new ResourceUriResolver(resourceProvider)];
if (packageUriResolver != null) {
resolvers.add(packageUriResolver);
}
UriResolver dartResolver = new DartUriResolver(analysisServer.defaultSdk);
UriResolver resourceResolver = new ResourceUriResolver(resourceProvider);
List<UriResolver> resolvers = packageUriResolver != null ?
<UriResolver>[dartResolver, packageUriResolver, resourceResolver] :
<UriResolver>[dartResolver, resourceResolver];
return new SourceFactory(resolvers);
}
}