Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(571)

Unified Diff: pkg/analysis_server/lib/src/analysis_server.dart

Issue 922433002: Add packageUriResolver before ResourceUriResolver. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/analysis_server.dart
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index 5347e14c97a5ee2771e9a6c4a20f00b154a8550c..f5430ac3b9bd476c9657825d52d4f0c279dc5d11 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -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);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698