Skip to content

Commit f25a591

Browse files
jcollins-gjcollins-g
authored
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
1 parent 8fccf5b commit f25a591

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1826
-78
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: dart
22
sudo: false
33
dart:
4-
- "dev/release/2.0.0-dev.16.0"
4+
- "dev/release/2.0.0-dev.22.0"
55
env:
66
- DARTDOC_BOT=main
77
# TODO(devoncarew): add angulardart support

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.16.0
2+
* Cherrypick test changes from 0.15.1 and a fix for (#1603), updating
3+
dartdoc to the latest analyzer.
4+
15
## 0.15.1
26
* Add SDK warning comparison to grind script (#1572)
37
* Improve rendering of inline `<code>` (#1573)

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# BSD-style license that can be found in the LICENSE file.
44

55
install:
6-
- 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
6+
- 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
77
- cmd: echo "Unzipping dart-sdk..."
88
- cmd: 7z x dart-sdk.zip -o"C:\tools" -y > nul
99
- set PATH=%PATH%;C:\tools\dart-sdk\bin

‎lib/dartdoc.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export 'src/sdk.dart';
3636

3737
const String name = 'dartdoc';
3838
// Update when pubspec version changes.
39-
const String version = '0.15.1';
39+
const String version = '0.16.0';
4040

4141
final String defaultOutDir = path.join('doc', 'api');
4242

‎lib/src/model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import 'package:analyzer/src/dart/element/member.dart'
3737
import 'package:analyzer/src/dart/analysis/driver.dart';
3838
import 'package:collection/collection.dart';
3939
import 'package:dartdoc/src/io_utils.dart';
40-
import 'package:front_end/byte_store.dart';
40+
import 'package:front_end/src/byte_store/byte_store.dart';
4141
import 'package:front_end/src/base/performance_logger.dart';
4242
import 'package:path/path.dart' as p;
4343
import 'package:tuple/tuple.dart';

‎pubspec.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: analyzer
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "0.31.0-alpha.2"
10+
version: "0.31.1"
1111
args:
1212
dependency: "direct main"
1313
description:
@@ -91,7 +91,7 @@ packages:
9191
name: front_end
9292
url: "https://pub.dartlang.org"
9393
source: hosted
94-
version: "0.1.0-alpha.7"
94+
version: "0.1.0-alpha.9"
9595
glob:
9696
dependency: transitive
9797
description:
@@ -161,7 +161,7 @@ packages:
161161
name: kernel
162162
url: "https://pub.dartlang.org"
163163
source: hosted
164-
version: "0.3.0-alpha.4"
164+
version: "0.3.0-alpha.9"
165165
logging:
166166
dependency: "direct main"
167167
description:
@@ -371,7 +371,7 @@ packages:
371371
name: test
372372
url: "https://pub.dartlang.org"
373373
source: hosted
374-
version: "0.12.29"
374+
version: "0.12.30+2"
375375
tuple:
376376
dependency: "direct main"
377377
description:
@@ -415,4 +415,4 @@ packages:
415415
source: hosted
416416
version: "2.1.13"
417417
sdks:
418-
dart: ">=1.23.0 <=2.0.0-dev.20.0"
418+
dart: ">=2.0.0-dev <=2.0.0-dev.22.0"

‎pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: dartdoc
22
# Also update the `version` field in lib/dartdoc.dart.
3-
version: 0.15.1
3+
version: 0.16.0
44
author: Dart Team <[email protected]>
55
description: A documentation generator for Dart.
66
homepage: https://github.com/dart-lang/dartdoc
@@ -9,10 +9,10 @@ homepage: https://github.com/dart-lang/dartdoc
99
environment:
1010
sdk: '>=1.23.0-dev.11.5 <2.0.0'
1111
dependencies:
12-
analyzer: 0.31.0-alpha.2
12+
analyzer: 0.31.1
1313
args: '>=0.13.0 <2.0.0'
1414
collection: ^1.2.0
15-
front_end: ^0.1.0-alpha.7
15+
front_end: ^0.1.0-alpha.9
1616
html: '>=0.12.1 <0.14.0'
1717
# We don't use http_parser directly; this dep exists to ensure that we get at
1818
# least version 3.0.3 to work around an issue with 3.0.2.

‎test/model_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ void main() {
924924
});
925925

926926
test('SpecialList has many inherited methods', () {
927-
expect(SpecialList.publicInheritedMethods, hasLength(44));
927+
expect(SpecialList.publicInheritedMethods, hasLength(50));
928928
expect(SpecialList.publicInheritedMethods.first.name, equals('add'));
929929
expect(SpecialList.publicInheritedMethods.toList()[1].name,
930930
equals('addAll'));

‎testing/test_package_docs/ex/Animal-class.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -199,21 +199,21 @@ <h2>Properties</h2>
199199
</dl>
200200
</section>
201201

202-
<section class="summary offset-anchor inherited" id="instance-methods">
202+
<section class="summary offset-anchor" id="instance-methods">
203203
<h2>Methods</h2>
204204
<dl class="callables">
205-
<dt id="noSuchMethod" class="callable inherited">
206-
<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>)
207-
<span class="returntype parameter">&#8594; dynamic</span>
205+
<dt id="toString" class="callable">
206+
<span class="name"><a href="ex/Animal/toString.html">toString</a></span><span class="signature">(<wbr>)
207+
<span class="returntype parameter">&#8594; String</span>
208208
</span>
209209
</dt>
210-
<dd class="inherited">
210+
<dd>
211+
211212

212-
<div class="features">inherited</div>
213213
</dd>
214-
<dt id="toString" class="callable inherited">
215-
<span class="name"><a href="ex/Animal/toString.html">toString</a></span><span class="signature">(<wbr>)
216-
<span class="returntype parameter">&#8594; String</span>
214+
<dt id="noSuchMethod" class="callable inherited">
215+
<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>)
216+
<span class="returntype parameter">&#8594; dynamic</span>
217217
</span>
218218
</dt>
219219
<dd class="inherited">
@@ -258,9 +258,9 @@ <h2>Operators</h2>
258258
<li class="inherited"><a href="ex/Animal/hashCode.html">hashCode</a></li>
259259
<li class="inherited"><a href="ex/Animal/runtimeType.html">runtimeType</a></li>
260260

261-
<li class="section-title inherited"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
261+
<li class="section-title"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
262+
<li><a href="ex/Animal/toString.html">toString</a></li>
262263
<li class="inherited"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></li>
263-
<li class="inherited"><a href="ex/Animal/toString.html">toString</a></li>
264264

265265
<li class="section-title inherited"><a href="ex/Animal-class.html#operators">Operators</a></li>
266266
<li class="inherited"><a href="ex/Animal/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/ex/Animal/hashCode.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Animal enum</h5>
4747
<li class="inherited"><a href="ex/Animal/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="ex/Animal/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
51+
<li><a href="ex/Animal/toString.html">toString</a></li>
5152
<li class="inherited"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="ex/Animal/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="ex/Animal-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="ex/Animal/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/ex/Animal/noSuchMethod.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Animal enum</h5>
4747
<li class="inherited"><a href="ex/Animal/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="ex/Animal/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
51+
<li><a href="ex/Animal/toString.html">toString</a></li>
5152
<li class="inherited"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="ex/Animal/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="ex/Animal-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="ex/Animal/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/ex/Animal/operator_equals.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Animal enum</h5>
4747
<li class="inherited"><a href="ex/Animal/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="ex/Animal/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
51+
<li><a href="ex/Animal/toString.html">toString</a></li>
5152
<li class="inherited"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="ex/Animal/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="ex/Animal-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="ex/Animal/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/ex/Animal/runtimeType.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Animal enum</h5>
4747
<li class="inherited"><a href="ex/Animal/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="ex/Animal/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
51+
<li><a href="ex/Animal/toString.html">toString</a></li>
5152
<li class="inherited"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="ex/Animal/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="ex/Animal-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="ex/Animal/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/ex/Animal/toString.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Animal enum</h5>
4747
<li class="inherited"><a href="ex/Animal/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="ex/Animal/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="ex/Animal-class.html#instance-methods">Methods</a></li>
51+
<li><a href="ex/Animal/toString.html">toString</a></li>
5152
<li class="inherited"><a href="ex/Animal/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="ex/Animal/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="ex/Animal-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="ex/Animal/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/fake/Color-class.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -265,21 +265,21 @@ <h2>Properties</h2>
265265
</dl>
266266
</section>
267267

268-
<section class="summary offset-anchor inherited" id="instance-methods">
268+
<section class="summary offset-anchor" id="instance-methods">
269269
<h2>Methods</h2>
270270
<dl class="callables">
271-
<dt id="noSuchMethod" class="callable inherited">
272-
<span class="name"><a href="fake/Color/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>)
273-
<span class="returntype parameter">&#8594; dynamic</span>
271+
<dt id="toString" class="callable">
272+
<span class="name"><a href="fake/Color/toString.html">toString</a></span><span class="signature">(<wbr>)
273+
<span class="returntype parameter">&#8594; String</span>
274274
</span>
275275
</dt>
276-
<dd class="inherited">
276+
<dd>
277+
277278

278-
<div class="features">inherited</div>
279279
</dd>
280-
<dt id="toString" class="callable inherited">
281-
<span class="name"><a href="fake/Color/toString.html">toString</a></span><span class="signature">(<wbr>)
282-
<span class="returntype parameter">&#8594; String</span>
280+
<dt id="noSuchMethod" class="callable inherited">
281+
<span class="name"><a href="fake/Color/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>)
282+
<span class="returntype parameter">&#8594; dynamic</span>
283283
</span>
284284
</dt>
285285
<dd class="inherited">
@@ -328,9 +328,9 @@ <h2>Operators</h2>
328328
<li class="inherited"><a href="fake/Color/hashCode.html">hashCode</a></li>
329329
<li class="inherited"><a href="fake/Color/runtimeType.html">runtimeType</a></li>
330330

331-
<li class="section-title inherited"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
331+
<li class="section-title"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
332+
<li><a href="fake/Color/toString.html">toString</a></li>
332333
<li class="inherited"><a href="fake/Color/noSuchMethod.html">noSuchMethod</a></li>
333-
<li class="inherited"><a href="fake/Color/toString.html">toString</a></li>
334334

335335
<li class="section-title inherited"><a href="fake/Color-class.html#operators">Operators</a></li>
336336
<li class="inherited"><a href="fake/Color/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/fake/Color/hashCode.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Color enum</h5>
4747
<li class="inherited"><a href="fake/Color/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="fake/Color/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
51+
<li><a href="fake/Color/toString.html">toString</a></li>
5152
<li class="inherited"><a href="fake/Color/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="fake/Color/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="fake/Color-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="fake/Color/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/fake/Color/noSuchMethod.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Color enum</h5>
4747
<li class="inherited"><a href="fake/Color/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="fake/Color/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
51+
<li><a href="fake/Color/toString.html">toString</a></li>
5152
<li class="inherited"><a href="fake/Color/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="fake/Color/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="fake/Color-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="fake/Color/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/fake/Color/operator_equals.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Color enum</h5>
4747
<li class="inherited"><a href="fake/Color/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="fake/Color/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
51+
<li><a href="fake/Color/toString.html">toString</a></li>
5152
<li class="inherited"><a href="fake/Color/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="fake/Color/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="fake/Color-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="fake/Color/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/fake/Color/runtimeType.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Color enum</h5>
4747
<li class="inherited"><a href="fake/Color/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="fake/Color/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
51+
<li><a href="fake/Color/toString.html">toString</a></li>
5152
<li class="inherited"><a href="fake/Color/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="fake/Color/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="fake/Color-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="fake/Color/operator_equals.html">operator ==</a></li>

‎testing/test_package_docs/fake/Color/toString.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ <h5>Color enum</h5>
4747
<li class="inherited"><a href="fake/Color/hashCode.html">hashCode</a></li>
4848
<li class="inherited"><a href="fake/Color/runtimeType.html">runtimeType</a></li>
4949

50-
<li class="section-title inherited"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
50+
<li class="section-title"><a href="fake/Color-class.html#instance-methods">Methods</a></li>
51+
<li><a href="fake/Color/toString.html">toString</a></li>
5152
<li class="inherited"><a href="fake/Color/noSuchMethod.html">noSuchMethod</a></li>
52-
<li class="inherited"><a href="fake/Color/toString.html">toString</a></li>
5353

5454
<li class="section-title inherited"><a href="fake/Color-class.html#operators">Operators</a></li>
5555
<li class="inherited"><a href="fake/Color/operator_equals.html">operator ==</a></li>

0 commit comments

Comments
 (0)