Add _embedder.yaml support to analyzer and analysis_server

pkg/analysis_server/lib/src/analysis_server.dart

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 ede78db050ae2b470799a1a87d646b44c92bea34..1aebcf48e12282c3e5312f0e37fde85bbff21c8c 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -23,6 +23,7 @@ import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
+import 'package:analyzer/source/embedder.dart';
 import 'package:analyzer/source/pub_package_map_provider.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
@@ -1448,7 +1449,8 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
         AnalysisEngine.instance.createAnalysisContext();
     context.contentCache = analysisServer.overlayState;
     analysisServer.folderMap[folder] = context;
-    context.sourceFactory = _createSourceFactory(disposition);
+    _locateEmbedderYamls(context, disposition);
+    context.sourceFactory = _createSourceFactory(context, disposition);
     context.analysisOptions =
         new AnalysisOptionsImpl.from(analysisServer.defaultContextOptions);
     analysisServer._onContextsChangedController
@@ -1517,7 +1519,7 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
   void updateContextPackageUriResolver(
       Folder contextFolder, FolderDisposition disposition) {
     AnalysisContext context = analysisServer.folderMap[contextFolder];
-    context.sourceFactory = _createSourceFactory(disposition);
+    context.sourceFactory = _createSourceFactory(context, disposition);
     analysisServer._onContextsChangedController
         .add(new ContextsChangedEvent(changed: [context]));
     analysisServer.schedulePerformAnalysisOperation(context);
@@ -1531,17 +1533,41 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
     }
   }
 
+  /// If [disposition] has a package map, attempt to locate `_embedder.yaml`
+  /// files.

[scheglov, 2015/11/17 04:05:53]

Please use the same style of documentation comments as the file already uses.

+  void _locateEmbedderYamls(InternalAnalysisContext context,
+                            FolderDisposition disposition) {
+    Map<String, List<Folder>> packageMap;
+    if (disposition is PackageMapDisposition) {
+      packageMap = disposition.packageMap;
+    } else if (disposition is PackagesFileDisposition) {
+      packageMap = disposition.buildPackageMap(resourceProvider);
+    }
+    context.embedderYamlLocator.refresh(packageMap);
+  }
+
   /**
    * Set up a [SourceFactory] that resolves packages as appropriate for the
    * given [disposition].
    */
-  SourceFactory _createSourceFactory(FolderDisposition disposition) {
-    UriResolver dartResolver = new DartUriResolver(analysisServer.defaultSdk);
-    UriResolver resourceResolver = new ResourceUriResolver(resourceProvider);
+  SourceFactory _createSourceFactory(InternalAnalysisContext context,
+                                     FolderDisposition disposition) {
     List<UriResolver> resolvers = [];
-    resolvers.add(dartResolver);
-    resolvers.addAll(disposition.createPackageUriResolvers(resourceProvider));
-    resolvers.add(resourceResolver);
+    List<UriResolver> packageUriResolvers =
+        disposition.createPackageUriResolvers(resourceProvider);
+    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.
+      resolvers.add(new DartUriResolver(analysisServer.defaultSdk));
+    } else {
+      // The embedder uri resolver has mappings, use it instead of the default
+      // Dart SDK uri resolver.
+      resolvers.add(embedderUriResolver);
+    }
+    resolvers.addAll(packageUriResolvers);
+    resolvers.add(new ResourceUriResolver(resourceProvider));
     return new SourceFactory(resolvers, disposition.packages);
   }
 }