Merge from head

Author: jcollins-g

.travis.yml

@@ -12,9 +12,14 @@ env:
 script: ./tool/travis.sh
 
 os:
-  - osx
   - linux
 
+matrix:
+  include:
+  - env: DARTDOC_BOT=main
+    os: osx
+    dart: "dev/raw/latest"
+
 install:
 - ./tool/install_travis.sh
 

CHANGELOG.md

@@ -1,3 +1,33 @@
+## 0.28.6
+* Support for 0.38.3 version of `package:analyzer`.
+* Support generating docs for extension methods (#2001).
+
+## 0.28.5
+* Support the latest version of `package:analyzer`.
+* Fix hyperlinks to overriden methods (#1994).
+* Option in dartdoc_options.yaml to exclude version in footer info (#1982).
+
+## 0.28.4
+* **Breaking change** Change the default for `allow-tools` command line flag to false.
+* Fix some lints.
+* Update to support a future version of analyzer.
+
+## 0.28.3+3
+* Fix code highlighting in Dart after string interpolation (#1946, #1948) by
+  updating the highlightjs dependency.
+* Fix indentation of inheritance info to match others
+
+## 0.28.3+2
+* Support the latest version of `package:html`.
+* Use latest version of the markdown package.
+
+## 0.28.3+1
+* Fix scroll physics and behavior for Safari on iOS.
+
+## 0.28.3
+* Support a new `{@youtube}` directive in documentation comments to embed
+  YouTube videos.
+
 ## 0.28.2
 * Add empty CSS classes in spans around the names of entities so Dashing can pick
   them up.  (flutter/flutter#27654, #1929)
@@ -133,7 +163,7 @@
 ## 0.22.0
 * Documentation updates. (#1760)
 * Fix incompatibility with head analyzer (endsWith exception). (#1768)
-* Added the ability to run external tools on a section of documentation and 
+* Added the ability to run external tools on a section of documentation and
   replace it with the output of the tool.
 
 ## 0.21.1
@@ -516,7 +546,7 @@ This is a prerelease only, features listed as added here don't carry forward.
 ## 0.9.7+1
 * change how we truncate long constant values on the summary page
 * show the full docs for enums on the summary page; just show the first line of
-  docs for other contants
+  docs for other constants
 
 ## 0.9.7
 * fix the display of long constants

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Yes!
 
 Start by [using the tool](README.md) and filing issues and requests.
 
-See the [dartdoc API](https://pub.dartlang.org/documentation/dartdoc/latest/) docs, generated by
+See the [dartdoc API](https://pub.dev/documentation/dartdoc/latest/) docs, generated by
 dartdoc.
 
 If you want to contribute, check out the [issue tracker][] and see if there's an

README.md

@@ -11,11 +11,11 @@ For information about contributing to the dartdoc project, see the
 [contributor docs][].
 
 For issues/details related to hosted Dart API docs, see
-[dart-lang/api.dartlang.org](https://github.com/dart-lang/api.dartlang.org/).
+[dart-lang/api.dart.dev](https://github.com/dart-lang/api.dart.dev/).
 
 ## Installing dartdoc
 
-- download the [Dart SDK](https://www.dartlang.org/downloads/)
+- download the [Dart SDK](https://dart.dev/get-dart)
 - add the SDK's `bin` directory to your `PATH`
 
 ## Generating docs
@@ -86,7 +86,7 @@ File names are _case-sensitive_.
 ## Writing docs
 
 Check out the
-[Effective Dart: Documentation guide](https://www.dartlang.org/effective-dart/documentation/).
+[Effective Dart: Documentation guide](https://dart.dev/guides/language/effective-dart/documentation).
 
 The guide covers formatting, linking, markup, and general best practices when
 authoring doc comments for Dart with `dartdoc`.
@@ -152,7 +152,7 @@ Unrecognized options will be ignored.  Supported options:
   * **includeExternal**:  Specify a list of library filenames to add to the list of documented libraries.
   * **linkTo**:  For other packages depending on this one, if this map is defined those packages
     will use the settings here to control how hyperlinks to the package are generated.
-    This will override the default for packages hosted on pub.dartlang.org.
+    This will override the default for packages hosted on pub.dev.
     * **url**:  A string indicating the base URL for documentation of this package.  Ordinarily
       you do not need to set this in the package: consider --link-to-hosted and
       --link-to-sdks instead of this option if you need to build your own website with

analysis_options.yaml

@@ -1,4 +1,9 @@
+include: package:pedantic/analysis_options.1.8.0.yaml
+
 analyzer:
+  # enable for analysis on test package sources.
+  enable-experiment:
+    - extension-methods
   exclude:
     - 'doc/**'
     - 'lib/src/third_party/pkg/**'
@@ -15,7 +20,8 @@ linter:
     - directives_ordering
     - no_adjacent_strings_in_list
     - package_api_docs
-    - slash_for_doc_comments
     - prefer_final_fields
+    - prefer_generic_function_type_aliases
+    - slash_for_doc_comments
     - unawaited_futures
 #    - unnecessary_brace_in_string_interps

bin/dartdoc.dart

@@ -27,16 +27,16 @@ class DartdocProgramOptionContext extends DartdocGeneratorOptionContext
 
 Future<List<DartdocOption>> createDartdocProgramOptions() async {
   return <DartdocOption>[
-    new DartdocOptionArgOnly<bool>('asyncStackTraces', false,
+    DartdocOptionArgOnly<bool>('asyncStackTraces', false,
         help: 'Display coordinated asynchronous stack traces (slow)',
         negatable: true),
-    new DartdocOptionArgOnly<bool>('generateDocs', true,
+    DartdocOptionArgOnly<bool>('generateDocs', true,
         help:
             'Generate docs into the output directory (or only display warnings if false).',
         negatable: true),
-    new DartdocOptionArgOnly<bool>('help', false,
+    DartdocOptionArgOnly<bool>('help', false,
         abbr: 'h', help: 'Show command help.', negatable: false),
-    new DartdocOptionArgOnly<bool>('version', false,
+    DartdocOptionArgOnly<bool>('version', false,
         help: 'Display the version for $name.', negatable: false),
   ];
 }
@@ -76,7 +76,7 @@ Future<void> main(List<String> arguments) async {
 
   DartdocProgramOptionContext config;
   try {
-    config = new DartdocProgramOptionContext(optionSet, null);
+    config = DartdocProgramOptionContext(optionSet, null);
   } on DartdocOptionError catch (e) {
     stderr.writeln(' fatal error: ${e.message}');
     stderr.writeln('');
@@ -94,7 +94,7 @@ Future<void> main(List<String> arguments) async {
   try {
     await Chain.capture(() async {
       await runZoned(dartdoc.generateDocs,
-          zoneSpecification: new ZoneSpecification(
+          zoneSpecification: ZoneSpecification(
               print: (Zone self, ZoneDelegate parent, Zone zone, String line) =>
                   logPrint(line)));
     }, onError: (e, Chain chain) {

dartdoc_options.yaml

@@ -1,4 +1,4 @@
 dartdoc:
   linkToSource:
     root: '.'
-    uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v0.28.2/%f%#L%l%'
+    uriTemplate: 'https://github.com/dart-lang/dartdoc/blob/v0.28.6/%f%#L%l%'