analyzer update and 0.16.0 release (#1604)

* merge cherry pick of grinder changes

* resolve conflicts

* 0.16.0 and new analyzer

* Add changelog

* regenerate test package docs

* Fix merge problem

* dart:cli means increment expected lib count

Author: jcollins-g

.travis.yml

@@ -1,7 +1,7 @@
 language: dart
 sudo: false
 dart:
-  - "dev/release/2.0.0-dev.16.0"
+  - "dev/release/2.0.0-dev.22.0"
 env:
   - DARTDOC_BOT=main
   # TODO(devoncarew): add angulardart support

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.16.0
+* Cherrypick test changes from 0.15.1 and a fix for (#1603), updating
+  dartdoc to the latest analyzer.
+
 ## 0.15.1
 * Add SDK warning comparison to grind script (#1572)
 * Improve rendering of inline `<code>` (#1573)

appveyor.yml

@@ -3,7 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 install:
-  - ps: wget https://gsdview.appspot.com/dart-archive/channels/dev/raw/2.0.0-dev.16.0/sdk/dartsdk-windows-x64-release.zip -OutFile dart-sdk.zip
+  - ps: wget https://gsdview.appspot.com/dart-archive/channels/dev/raw/2.0.0-dev.22.0/sdk/dartsdk-windows-x64-release.zip -OutFile dart-sdk.zip
   - cmd: echo "Unzipping dart-sdk..."
   - cmd: 7z x dart-sdk.zip -o"C:\tools" -y > nul
   - set PATH=%PATH%;C:\tools\dart-sdk\bin

lib/dartdoc.dart

@@ -36,7 +36,7 @@ export 'src/sdk.dart';
 
 const String name = 'dartdoc';
 // Update when pubspec version changes.
-const String version = '0.15.1';
+const String version = '0.16.0';
 
 final String defaultOutDir = path.join('doc', 'api');
 

lib/src/model.dart

@@ -37,7 +37,7 @@ import 'package:analyzer/src/dart/element/member.dart'
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:collection/collection.dart';
 import 'package:dartdoc/src/io_utils.dart';
-import 'package:front_end/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
 import 'package:path/path.dart' as p;
 import 'package:tuple/tuple.dart';

pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.31.0-alpha.2"
+    version: "0.31.1"
   args:
     dependency: "direct main"
     description:
@@ -91,7 +91,7 @@ packages:
       name: front_end
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0-alpha.7"
+    version: "0.1.0-alpha.9"
   glob:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: kernel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0-alpha.4"
+    version: "0.3.0-alpha.9"
   logging:
     dependency: "direct main"
     description:
@@ -371,7 +371,7 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.29"
+    version: "0.12.30+2"
   tuple:
     dependency: "direct main"
     description:
@@ -415,4 +415,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=1.23.0 <=2.0.0-dev.20.0"
+  dart: ">=2.0.0-dev <=2.0.0-dev.22.0"

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dartdoc
 # Also update the `version` field in lib/dartdoc.dart.
-version: 0.15.1
+version: 0.16.0
 author: Dart Team <[email protected]>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc
@@ -9,10 +9,10 @@ homepage: https://github.com/dart-lang/dartdoc
 environment:
   sdk: '>=1.23.0-dev.11.5 <2.0.0'
 dependencies:
-  analyzer: 0.31.0-alpha.2
+  analyzer: 0.31.1
   args: '>=0.13.0 <2.0.0'
   collection: ^1.2.0
-  front_end: ^0.1.0-alpha.7
+  front_end: ^0.1.0-alpha.9
   html: '>=0.12.1 <0.14.0'
   # We don't use http_parser directly; this dep exists to ensure that we get at
   # least version 3.0.3 to work around an issue with 3.0.2.

test/model_test.dart

@@ -924,7 +924,7 @@ void main() {
     });
 
     test('SpecialList has many inherited methods', () {
-      expect(SpecialList.publicInheritedMethods, hasLength(44));
+      expect(SpecialList.publicInheritedMethods, hasLength(50));
       expect(SpecialList.publicInheritedMethods.first.name, equals('add'));
       expect(SpecialList.publicInheritedMethods.toList()[1].name,
           equals('addAll'));

testing/test_package_docs/ex/Animal-class.html

@@ -199,21 +199,21 @@ <h2>Properties</h2>
       </dl>
     </section>
 
-    <section class="summary offset-anchor inherited" id="instance-methods">
+    <section class="summary offset-anchor" id="instance-methods">
       <h2>Methods</h2>
       <dl class="callables">
-        <dt id="noSuchMethod" class="callable inherited">
-          <span class="name"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
-            <span class="returntype parameter">&#8594; dynamic</span>
+        <dt id="toString" class="callable">
+          <span class="name"><a href="ex/Animal/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
           </span>
         </dt>
-        <dd class="inherited">
+        <dd>
+          
 
-          <div class="features">inherited</div>
 </dd>
-        <dt id="toString" class="callable inherited">
-          <span class="name"><a href="ex/Animal/toString.html">toString</a></span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; String</span>
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
           </span>
         </dt>
         <dd class="inherited">
@@ -258,9 +258,9 @@ <h2>Operators</h2>
       <li class="inherited"><a href="ex/Animal/hashCode.html">hashCode</a></li>
       <li class="inherited"><a href="ex/Animal/runtimeType.html">runtimeType</a></li>
 
-      <li class="section-title inherited"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
+      <li class="section-title"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
+      <li><a href="ex/Animal/toString.html">toString</a></li>
       <li class="inherited"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></li>
-      <li class="inherited"><a href="ex/Animal/toString.html">toString</a></li>
 
       <li class="section-title inherited"><a href="ex/Animal-class.html#operators">Operators</a></li>
       <li class="inherited"><a href="ex/Animal/operator_equals.html">operator ==</a></li>

testing/test_package_docs/ex/Animal/hashCode.html

@@ -47,9 +47,9 @@ <h5>Animal enum</h5>
       <li class="inherited"><a href="ex/Animal/hashCode.html">hashCode</a></li>
       <li class="inherited"><a href="ex/Animal/runtimeType.html">runtimeType</a></li>
 
-      <li class="section-title inherited"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
+      <li class="section-title"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
+      <li><a href="ex/Animal/toString.html">toString</a></li>
       <li class="inherited"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></li>
-      <li class="inherited"><a href="ex/Animal/toString.html">toString</a></li>
 
       <li class="section-title inherited"><a href="ex/Animal-class.html#operators">Operators</a></li>
       <li class="inherited"><a href="ex/Animal/operator_equals.html">operator ==</a></li>