Merge pull request #1211 from keertip/refs

keertip · web-flow · commit 604ab5dbd727 · 2016-07-21T11:54:22.000-07:00
Fix for issue with references in parameters and return type pointing …
diff --git a/lib/src/model.dart b/lib/src/model.dart
@@ -873,12 +873,12 @@ class Field extends ModelElement
   void _setModelType() {
     if (hasGetter) {
       var t = _field.getter.returnType;
-      _modelType = new ElementType(t,
-          new ModelElement.from(t.element, package._getLibraryFor(t.element)));
+      _modelType = new ElementType(
+          t, new ModelElement.from(t.element, _findLibraryFor(t.element)));
     } else {
       var s = _field.setter.parameters.first.type;
-      _modelType = new ElementType(s,
-          new ModelElement.from(s.element, package._getLibraryFor(s.element)));
+      _modelType = new ElementType(
+          s, new ModelElement.from(s.element, _findLibraryFor(s.element)));
     }
   }
 }
@@ -1653,6 +1653,19 @@ abstract class ModelElement implements Comparable, Nameable, Documentable {
     return '<a ${classContent}href="${href}">$name</a>';
   }
 
+  // TODO(keertip): consolidate all the find library methods
+  Library _findLibraryFor(Element e) {
+    var element = e.getAncestor((l) => l is LibraryElement);
+    var lib;
+    if (element != null) {
+      lib = package.findLibraryFor(element);
+    }
+    if (lib == null) {
+      lib = package._getLibraryFor(e);
+    }
+    return lib;
+  }
+
   // process the {@example ...} in comments and inject the example
   // code into the doc commment.
   // {@example core/ts/bootstrap/bootstrap.ts region='bootstrap'}
@@ -1902,12 +1915,13 @@ class Package implements Nameable, Documentable {
       return null;
     }
 
-    Library lib = elementLibaryMap['${e.kind}.${e.name}'];
+    Library lib = elementLibaryMap['${e.kind}.${e.name}.${e.enclosingElement}'];
     if (lib != null) return lib;
     lib =
         libraries.firstWhere((l) => l.hasInExportedNamespace(e), orElse: () {});
     if (lib != null) {
-      elementLibaryMap.putIfAbsent('${e.kind}.${e.name}', () => lib);
+      elementLibaryMap.putIfAbsent(
+          '${e.kind}.${e.name}.${e.enclosingElement}', () => lib);
       return lib;
     }
     return new Library(e.library, this);
@@ -1931,7 +1945,7 @@ class Parameter extends ModelElement implements EnclosedElement {
       : super(element, library) {
     var t = _parameter.type;
     _modelType = new ElementType(
-        t, new ModelElement.from(t.element, package._getLibraryFor(t.element)));
+        t, new ModelElement.from(t.element, _findLibraryFor(t.element)));
   }
 
   String get defaultValue {
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -408,7 +408,7 @@ <h2>Operators</h2>
       <h2>Methods</h2>
       <dl class="callables">
         <dt id="fly" class="callable inherited">
-          <span class="name"><a href="fake/SuperAwesomeClass/fly.html">fly</a></span><span class="signature">(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span></span>, <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="ex/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span></span>, {<span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>})
+          <span class="name"><a href="fake/SuperAwesomeClass/fly.html">fly</a></span><span class="signature">(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span></span>, <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span></span>, {<span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>})
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -248,7 +248,7 @@ <h2>Operators</h2>
       <h2>Methods</h2>
       <dl class="callables">
         <dt id="fly" class="callable">
-          <span class="name"><a href="fake/SuperAwesomeClass/fly.html">fly</a></span><span class="signature">(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span></span>, <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="ex/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span></span>, {<span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>})
+          <span class="name"><a href="fake/SuperAwesomeClass/fly.html">fly</a></span><span class="signature">(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span></span>, <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span></span>, {<span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>})
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/fly.html b/testing/test_package_docs/fake/SuperAwesomeClass/fly.html
@@ -101,7 +101,7 @@ <h5><a href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       <span class="returntype">void</span>
-      <span class="name ">fly</span>(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span></span>, <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="ex/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span></span>, {<span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>})
+      <span class="name ">fly</span>(<wbr><span class="parameter" id="fly-param-height"><span class="type-annotation">int</span> <span class="parameter-name">height</span></span>, <span class="parameter" id="fly-param-superCool"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">superCool</span></span>, {<span class="parameter" id="fly-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>})
     </section>
     <section class="desc markdown">
       <p>In the super class.</p>
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
@@ -434,7 +434,7 @@ <h2>Functions</h2>
           <p>An async function. It should look like I return a <code>Future</code>.</p>
         </dd>
         <dt id="topLevelFunction" class="callable">
-          <span class="name deprecated"><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></span><span class="signature">(<wbr><span class="parameter" id="topLevelFunction-param-param1"><span class="type-annotation">int</span> <span class="parameter-name">param1</span></span>, <span class="parameter" id="topLevelFunction-param-param2"><span class="type-annotation">bool</span> <span class="parameter-name">param2</span></span>, <span class="parameter" id="topLevelFunction-param-coolBeans"><span class="type-annotation"><a href="ex/Cool-class.html">Cool</a></span> <span class="parameter-name">coolBeans</span></span>, [<span class="parameter" id="topLevelFunction-param-optionalPositional"><span class="type-annotation">double</span> <span class="parameter-name">optionalPositional</span> = <span class="default-value">0.0</span></span>])
+          <span class="name deprecated"><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></span><span class="signature">(<wbr><span class="parameter" id="topLevelFunction-param-param1"><span class="type-annotation">int</span> <span class="parameter-name">param1</span></span>, <span class="parameter" id="topLevelFunction-param-param2"><span class="type-annotation">bool</span> <span class="parameter-name">param2</span></span>, <span class="parameter" id="topLevelFunction-param-coolBeans"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">coolBeans</span></span>, [<span class="parameter" id="topLevelFunction-param-optionalPositional"><span class="type-annotation">double</span> <span class="parameter-name">optionalPositional</span> = <span class="default-value">0.0</span></span>])
             <span class="returntype parameter">&#8594; String</span>
           </span>
         </dt>
diff --git a/testing/test_package_docs/fake/topLevelFunction.html b/testing/test_package_docs/fake/topLevelFunction.html
@@ -147,7 +147,7 @@ <h5><a href="fake/fake-library.html">fake</a></h5>
           </ol>
         </div>
         <span class="returntype">String</span>
-        <span class="name deprecated">topLevelFunction</span>(<wbr><span class="parameter" id="topLevelFunction-param-param1"><span class="type-annotation">int</span> <span class="parameter-name">param1</span></span>, <span class="parameter" id="topLevelFunction-param-param2"><span class="type-annotation">bool</span> <span class="parameter-name">param2</span></span>, <span class="parameter" id="topLevelFunction-param-coolBeans"><span class="type-annotation"><a href="ex/Cool-class.html">Cool</a></span> <span class="parameter-name">coolBeans</span></span>, [<span class="parameter" id="topLevelFunction-param-optionalPositional"><span class="type-annotation">double</span> <span class="parameter-name">optionalPositional</span> = <span class="default-value">0.0</span></span>])
+        <span class="name deprecated">topLevelFunction</span>(<wbr><span class="parameter" id="topLevelFunction-param-param1"><span class="type-annotation">int</span> <span class="parameter-name">param1</span></span>, <span class="parameter" id="topLevelFunction-param-param2"><span class="type-annotation">bool</span> <span class="parameter-name">param2</span></span>, <span class="parameter" id="topLevelFunction-param-coolBeans"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span> <span class="parameter-name">coolBeans</span></span>, [<span class="parameter" id="topLevelFunction-param-optionalPositional"><span class="type-annotation">double</span> <span class="parameter-name">optionalPositional</span> = <span class="default-value">0.0</span></span>])
     </section>
     <section class="desc markdown">
       <p>Top-level function 3 params and 1 optional positional param.</p>
