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); |