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

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

Issue 2076743002: Deprecate EmbedderUriResolver (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 6 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 | pkg/analysis_server/lib/src/context_manager.dart » ('j') | 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 5859a63103818eb38f29be3a8eb80cb0247e0814..c5f196d5d2e64403816580061761d1a696e2e221 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -1624,17 +1624,16 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
disposition.createPackageUriResolvers(resourceProvider);
// If no embedded URI resolver was provided, defer to a locator-backed one.
- EmbedderUriResolver embedderUriResolver =
- new EmbedderUriResolver(context.embedderYamlLocator.embedderYamls);
- if (embedderUriResolver.length == 0) {
- // The embedder uri resolver has no mappings. Use the default Dart SDK
- // uri resolver.
+ EmbedderSdk sdk =
+ new EmbedderSdk(context.embedderYamlLocator.embedderYamls);
+ if (sdk.libraryMap.size() == 0) {
+ // The embedder file has no mappings, so use the default Dart SDK.
resolvers.add(new DartUriResolver(
analysisServer.sdkManager.getSdkForOptions(options)));
} else {
// The embedder uri resolver has mappings, use it instead of the default
// Dart SDK uri resolver.
- resolvers.add(embedderUriResolver);
+ resolvers.add(new DartUriResolver(sdk));
}
resolvers.addAll(packageUriResolvers);
« no previous file with comments | « no previous file | pkg/analysis_server/lib/src/context_manager.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698