Merge pull request #1109 from johnmccutchan/fix_embedder_yaml

Fix embedder yaml

Author: johnmccutchan

lib/dartdoc.dart

@@ -138,12 +138,13 @@ class DartDoc {
     PackageMapInfo packageMapInfo =
         pubPackageMapProvider.computePackageMap(cwd);
     Map<String, List<fileSystem.Folder>> packageMap = packageMapInfo.packageMap;
+    EmbedderUriResolver embedderUriResolver;
     if (packageMap != null) {
       resolvers.add(new SdkExtUriResolver(packageMap));
       resolvers.add(new PackageMapUriResolver(
           PhysicalResourceProvider.INSTANCE, packageMap));
 
-      EmbedderUriResolver embedderUriResolver = new EmbedderUriResolver(
+      embedderUriResolver = new EmbedderUriResolver(
           new EmbedderYamlLocator(packageMap).embedderYamls);
       if (embedderUriResolver.length == 0) {
         // The embedder uri resolver has no mappings. Use the default Dart SDK
@@ -175,7 +176,7 @@ class DartDoc {
 
     List<Source> sources = [];
 
-    files.forEach((String filePath) {
+    void processLibrary(String filePath) {
       String name = filePath;
       if (name.startsWith(Directory.current.path)) {
         name = name.substring(Directory.current.path.length);
@@ -193,7 +194,16 @@ class DartDoc {
         LibraryElement library = context.computeLibraryElement(source);
         libraries.add(library);
       }
-    });
+    }
+
+    files.forEach(processLibrary);
+
+    if ((embedderUriResolver != null) && (embedderUriResolver.length > 0)) {
+      embedderUriResolver.dartSdk.uris.forEach((String dartUri) {
+        Source source = embedderUriResolver.dartSdk.mapDartUri(dartUri);
+        processLibrary(source.fullName);
+      });
+    }
 
     // Ensure that the analysis engine performs all remaining work.
     AnalysisResult result = context.performAnalysisTask();

test/dartdoc_test.dart

@@ -114,7 +114,14 @@ void main() {
       expect(p.libraries, hasLength(3));
       expect(p.libraries.map((lib) => lib.name).contains('dart:core'), isTrue);
       expect(p.libraries.map((lib) => lib.name).contains('dart:async'), isTrue);
-      expect(p.libraries.map((lib) => lib.name).contains('grizzly'), isTrue);
+      expect(p.libraries.map((lib) => lib.name).contains('dart:bear'), isTrue);
+      // Ensure that we actually parsed some source by checking for
+      // the 'Bear' class.
+      Library dart_bear =
+          p.libraries.firstWhere((lib) => lib.name == 'dart:bear');
+      expect(dart_bear, isNotNull);
+      expect(dart_bear.allClasses.map((cls) => cls.name).contains('Bear'),
+             isTrue);
     });
   });
 }

test_package_embedder_yaml/lib/_embedder.yaml

@@ -1,4 +1,4 @@
 embedded_libs:
-  "dart:bear": "grizzly.dart"
-  "dart:core": "core.dart"
-  "dart:async": "async.dart"
+  "dart:bear": "../sdk/grizzly.dart"
+  "dart:core": "../sdk/core.dart"
+  "dart:async": "../sdk/async.dart"