Add package name for resolved names in packages.

pkg/docgen/lib/docgen.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 /// **docgen** is a tool for creating machine readable representations of Dart
 /// code metadata, including: classes, members, comments and annotations.
 ///
 /// docgen is run on a `.dart` file or a directory containing `.dart` files.
 ///
 ///      $ dart docgen.dart [OPTIONS] [FILE/DIR]
@@ skipping 119 matching lines @@
           (each) => librariesWeGotByPath.putIfAbsent(each,
               () => throw "Missing library $each")).toList();
       librariesToDocument.addAll((includeSdk || parseSdk) ? _sdkLibraries : []);
       _documentLibraries(librariesToDocument, includeSdk: includeSdk,
           outputToYaml: outputToYaml, append: append, parseSdk: parseSdk,
           introduction: introduction);
       return true;
     });
 }
 
-/// For a [library] and its corresponding [mirror] that we believe come
-/// from a package (because it has a file
-/// URI) look for the package name and set it on [library].
-void _findPackage(Library library, LibraryMirror mirror) {
-    if (mirror.uri.scheme != 'file') return;
-    var filePath = mirror.uri.toFilePath();
-    // We assume that we are documenting only libraries under package/lib
-    var rootdir = path.dirname((path.dirname(filePath)));
-    var pubspec = path.join(rootdir, 'pubspec.yaml');
-    library.packageName = _packageName(pubspec);
+/// For a library's [mirror], determine the name of the package (if any) we
+/// believe it came from (because of its file URI).
+///
+/// If [library] is specified, we set the packageName field. If no package could
+/// be determined, we return an empty string.
+String _findPackage(LibraryMirror mirror, [Library library]) {
+  if (mirror.uri.scheme != 'file') return '';
+  var filePath = mirror.uri.toFilePath();
+  // We assume that we are documenting only libraries under package/lib
+  var rootdir = path.dirname((path.dirname(filePath)));
+  var pubspec = path.join(rootdir, 'pubspec.yaml');
+  var packageName = _packageName(pubspec);
+  if (library != null) {
+    library.packageName = packageName;
     // If we are the main library in a package, associate the package readme
     // with us.
     // TODO(alanknight): We can't really rely on all packages having a library
     // that matches the package name. Need a better way to store this.
     if (library.packageName == library.name) {
       library.packageIntro = _packageIntro(rootdir);
     }
+  }
+  return packageName + '/';
 }
 
 String _packageIntro(packageDir) {
   var dir = new Directory(packageDir);
   var files = dir.listSync();
   var readmes = files.where((FileSystemEntity each) => (each is File &&
       each.path.substring(packageDir.length + 1, each.path.length)
           .startsWith('README'))).toList();
   if (readmes.isEmpty) return '';
   // If there are multiples, pick the shortest name.
@@ skipping 210 matching lines @@
   _writeToFile(JSON.encode(index), 'index.json');
 }
 
 Library generateLibrary(dart2js.Dart2JsLibraryMirror library) {
   _currentLibrary = library;
   var result = new Library(docName(library), _commentToHtml(library),
       _classes(library.classes),
       _methods(library.functions),
       _variables(library.variables),
       _isHidden(library));
-  _findPackage(result, library);
+  _findPackage(library, result);
   logger.fine('Generated library for ${result.name}');
   return result;
 }
 
 void _writeIndexableToFile(Indexable result, bool outputToYaml) {
   var outputFile = result.fileName;
   var output;
   if (outputToYaml) {
     output = getYamlString(result.toMap());
     outputFile = outputFile + '.yaml';
@@ skipping 134 matching lines @@
 
 String _htmlMdn(String content, String url) {
   return '<div class="mdn">' + content.trim() + '<p class="mdn-note">'
       '<a href="' + url.trim() + '">from Mdn</a></p></div>';
 }
 
 /// Look for the specified name starting with the current member, and
 /// progressively working outward to the current library scope.
 String findElementInScope(String name, LibraryMirror currentLibrary,
     ClassMirror currentClass, MemberMirror currentMember) {
+  var packagePrefix = _findPackage(currentLibrary);
+
   determineLookupFunc(name) => name.contains('.') ?
       dart2js_util.lookupQualifiedInScope :
       (mirror, name) => mirror.lookupInScope(name);
   var lookupFunc = determineLookupFunc(name);
 
   var memberScope = currentMember == null ?
       null : lookupFunc(currentMember, name);
-  if (memberScope != null) return docName(memberScope);
+  if (memberScope != null) return packagePrefix + docName(memberScope);
 
   var classScope = currentClass;
   while (classScope != null) {
     var classFunc = lookupFunc(currentClass, name);
-    if (classFunc != null) return docName(classFunc);
+    if (classFunc != null) return packagePrefix + docName(classFunc);
     classScope = classScope.superclass;
   }
 
   var libraryScope = currentLibrary == null ?
       null : lookupFunc(currentLibrary, name);
-  if (libraryScope != null) return docName(libraryScope);
+  if (libraryScope != null) return packagePrefix + docName(libraryScope);
 
   // Look in the dart core library scope.
   var coreScope = _coreLibrary == null? null : lookupFunc(_coreLibrary, name);
-  if (coreScope != null) return docName(_coreLibrary);
+  if (coreScope != null) return packagePrefix + docName(_coreLibrary);
 
   // If it's a reference that starts with a another library name, then it
   // looks for a match of that library name in the other sdk libraries.
   if(name.contains('.')) {
     var index = name.indexOf('.');
     var libraryName = name.substring(0, index);
     var remainingName = name.substring(index + 1);
     foundLibraryName(library) => library.uri.pathSegments[0] == libraryName;
 
     if (_sdkLibraries.any(foundLibraryName)) {
       var library = _sdkLibraries.singleWhere(foundLibraryName);
       // Look to see if it's a fully qualified library name.
       var scope = determineLookupFunc(remainingName)(library, remainingName);
-      if (scope != null) return docName(scope);
+      if (scope != null) return packagePrefix + docName(scope);
     }
   }
   return null;
 }
 
 // HTML escaped version of '<' character.
 final _LESS_THAN = '&lt;';
 
 /// Chunk the provided name into individual parts to be resolved. We take a
 /// simplistic approach to chunking, though, we break at " ", ",", "&lt;"
@@ skipping 795 matching lines @@
 /// Remove statics from the map of inherited items before adding them.
 Map _filterStatics(Map items) {
   var result = {};
   items.forEach((name, item) {
     if (!item.isStatic) {
       result[name] = item;
     }
   });
   return result;
 }