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

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

Issue 2260593003: Allow file resolver provider to return null, just like package resolver provider (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 4 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 307ed65796f708da99f6bad321da7c2389253d63..72aff0bbe88d34d101fd7d4a0629b639085d0189 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -1713,11 +1713,11 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
}
resolvers.addAll(packageUriResolvers);
- if (context.fileResolverProvider == null) {
- resolvers.add(new ResourceUriResolver(resourceProvider));
- } else {
- resolvers.add(context.fileResolverProvider(folder));
+ UriResolver fileResolver;
+ if (context.fileResolverProvider != null) {
+ fileResolver = context.fileResolverProvider(folder);
}
+ resolvers.add(fileResolver ?? new ResourceUriResolver(resourceProvider));
return new SourceFactory(resolvers, disposition.packages);
}
}
« 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