Update pkg/analyzer – now shows return types of function parameters

Fixes regression from 8ada9af
rkj · Dec 2, 2015 · 07da066 · 07da066
1 parent 5df3eff
commit 07da066
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/pubspec.lock b/pubspec.lock
@@ -4,7 +4,7 @@ packages:
   analyzer:
     description: analyzer
     source: hosted
-    version: "0.26.2"
+    version: "0.26.3"
   ansicolor:
     description: ansicolor
     source: hosted
@@ -116,7 +116,7 @@ packages:
   path:
     description: path
     source: hosted
-    version: "1.3.7"
+    version: "1.3.8"
   petitparser:
     description: petitparser
     source: hosted

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,7 +7,7 @@ homepage: https://github.com/dart-lang/dartdoc
 environment:
   sdk: '>=1.12.0 <2.0.0'
 dependencies:
-  analyzer: '>=0.26.0 <0.27.0'
+  analyzer: '>=0.26.3 <0.27.0'
   args: ^0.13.0
   cli_util: ^0.0.1
   collection: ^1.2.0

diff --git a/test/model_test.dart b/test/model_test.dart
@@ -879,8 +879,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('parameter is a function', () {
-      var element = m4.parameters[1].modelType.element as Typedef;
-      expect(element.linkedReturnType, 'String');
+      var functionArgParam = m4.parameters[1];
+      expect(functionArgParam.modelType.createLinkedReturnTypeName(), 'String');
     });
 
     test('doc for method with no return type', () {

diff --git a/test_package_docs/ex/B-class.html b/test_package_docs/ex/B-class.html
@@ -342,7 +342,7 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
         </dd>
         <dt id="writeMsg" class="callable">
-          <span class="name "><a href="ex/B/writeMsg.html">writeMsg</a></span><span class="signature">(<wbr><span class="parameter" id="writeMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>, [<span class="parameter" id="writeMsg-param-transformMsg"><span class="type-annotation"></span> <span class="parameter-name">transformMsg</span>(<span class="parameter" id="transformMsg-param-origMsg"><span class="type-annotation">String</span> <span class="parameter-name">origMsg</span></span>, <span class="parameter" id="transformMsg-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span></span>)</span>])
+          <span class="name "><a href="ex/B/writeMsg.html">writeMsg</a></span><span class="signature">(<wbr><span class="parameter" id="writeMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>, [<span class="parameter" id="writeMsg-param-transformMsg"><span class="type-annotation">String</span> <span class="parameter-name">transformMsg</span>(<span class="parameter" id="transformMsg-param-origMsg"><span class="type-annotation">String</span> <span class="parameter-name">origMsg</span></span>, <span class="parameter" id="transformMsg-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span></span>)</span>])
             <span class="returntype parameter">&#8594; void</span>
           </span>
         </dt>

diff --git a/test_package_docs/ex/B/writeMsg.html b/test_package_docs/ex/B/writeMsg.html
@@ -112,7 +112,7 @@ <h5><a href="ex/B-class.html">B</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 ">writeMsg</span>(<wbr><span class="parameter" id="writeMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>, [<span class="parameter" id="writeMsg-param-transformMsg"><span class="type-annotation"></span> <span class="parameter-name">transformMsg</span>(<span class="parameter" id="transformMsg-param-origMsg"><span class="type-annotation">String</span> <span class="parameter-name">origMsg</span></span>, <span class="parameter" id="transformMsg-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span></span>)</span>])
+      <span class="name ">writeMsg</span>(<wbr><span class="parameter" id="writeMsg-param-msg"><span class="type-annotation">String</span> <span class="parameter-name">msg</span></span>, [<span class="parameter" id="writeMsg-param-transformMsg"><span class="type-annotation">String</span> <span class="parameter-name">transformMsg</span>(<span class="parameter" id="transformMsg-param-origMsg"><span class="type-annotation">String</span> <span class="parameter-name">origMsg</span></span>, <span class="parameter" id="transformMsg-param-flag"><span class="type-annotation">bool</span> <span class="parameter-name">flag</span></span>)</span>])
     </section>