Add _embedder.yaml support to analyzer and analysis_server

pkg/analyzer/test/source/embedder_test.dart

Index: pkg/analyzer/test/source/embedder_test.dart
diff --git a/pkg/analyzer/test/source/sdk_ext_test.dart b/pkg/analyzer/test/source/embedder_test.dart
similarity index 65%
copy from pkg/analyzer/test/source/sdk_ext_test.dart
copy to pkg/analyzer/test/source/embedder_test.dart
index 01416af8ed1db36f78c5a2900f565d0ede3473cb..ee50643df3fbd0079c99e112b80f4425e7b365cb 100644
--- a/pkg/analyzer/test/source/sdk_ext_test.dart
+++ b/pkg/analyzer/test/source/embedder_test.dart
@@ -2,37 +2,38 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.source.sdk_ext;
+library test.source.embedder;
 
 import 'package:analyzer/file_system/memory_file_system.dart';
-import 'package:analyzer/source/sdk_ext.dart';
+import 'package:analyzer/source/embedder.dart';
 import 'package:unittest/unittest.dart';
 
 import '../utils.dart';
 
 main() {
   initializeTestEnvironment();
-  group('SdkExtUriResolverTest', () {
+  group('EmbedderUriResolverTest', () {
     setUp(() {
       buildResourceProvider();
     });
     tearDown(() {
       clearResourceProvider();
     });
-    test('test_NullPackageMap', () {
-      var resolver = new SdkExtUriResolver(null);
+    test('test_NullEmbedderYamls', () {
+      var resolver = new EmbedderUriResolver(null);
       expect(resolver.length, equals(0));
     });
-    test('test_NoSdkExtPackageMap', () {
-      var resolver = new SdkExtUriResolver({
+    test('test_NoEmbedderYamls', () {
+      var locator = new EmbedderYamlLocator({
         'fox': [resourceProvider.getResource('/empty')]
       });
-      expect(resolver.length, equals(0));
+      expect(locator.embedderYamls.length, equals(0));
     });
-    test('test_SdkExtPackageMap', () {
-      var resolver = new SdkExtUriResolver({
+    test('test_EmbedderYaml', () {
+      var locator = new EmbedderYamlLocator({
         'fox': [resourceProvider.getResource('/tmp')]
       });
+      var resolver = new EmbedderUriResolver(locator.embedderYamls);
       // We have four mappings.
       expect(resolver.length, equals(4));
       // Check that they map to the correct paths.
@@ -41,15 +42,16 @@ main() {
       expect(resolver['dart:relative'], equals("/relative.dart"));
       expect(resolver['dart:deep'], equals("/tmp/deep/directory/file.dart"));
     });
-    test('test_BadJSON', () {
-      var resolver = new SdkExtUriResolver(null);
-      resolver.addSdkExt(r'''{{{,{{}}},}}''', null);
-      expect(resolver.length, equals(0));
+    test('test_BadYAML', () {
+      var locator = new EmbedderYamlLocator(null);
+      locator.addEmbedderYaml(null, r'''{{{,{{}}},}}''');
+      expect(locator.embedderYamls.length, equals(0));
     });
     test('test_restoreAbsolute', () {
-      var resolver = new SdkExtUriResolver({
+      var locator = new EmbedderYamlLocator({
         'fox': [resourceProvider.getResource('/tmp')]
       });
+      var resolver = new EmbedderUriResolver(locator.embedderYamls);
       var source = resolver.resolveAbsolute(Uri.parse('dart:fox'));
       expect(source, isNotNull);
       // Restore source's uri.
@@ -70,15 +72,15 @@ buildResourceProvider() {
   resourceProvider.newFolder('/empty');
   resourceProvider.newFolder('/tmp');
   resourceProvider.newFile(
-      '/tmp/_sdkext',
+      '/tmp/_embedder.yaml',
       r'''
-  {
-    "dart:fox": "slippy.dart",
-    "dart:bear": "grizzly.dart",
-    "dart:relative": "../relative.dart",
-    "dart:deep": "deep/directory/file.dart",
-    "fart:loudly": "nomatter.dart"
-  }''');
+embedder_libs:
+  "dart:fox": "slippy.dart"
+  "dart:bear": "grizzly.dart"
+  "dart:relative": "../relative.dart"
+  "dart:deep": "deep/directory/file.dart"
+  "fart:loudly": "nomatter.dart"

[pquitslund, 2015/11/14 00:32:53]

Just caught this. :)

[Cutch, 2015/11/14 00:36:44]

:)

+''');
 }
 
 clearResourceProvider() {