From e49a57660d1d264d99a9ca5b95e175c15f68c97d Mon Sep 17 00:00:00 2001 From: Michael Goderbauer Date: Fri, 7 Aug 2020 20:41:04 -0700 Subject: [PATCH] Bump dartdoc to 0.32.3 and tighten doc quality checker (#63111) --- dev/bots/docs.sh | 2 +- dev/tools/dartdoc_checker.dart | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dev/bots/docs.sh b/dev/bots/docs.sh index 64175bc8101..52e1d1c85d7 100755 --- a/dev/bots/docs.sh +++ b/dev/bots/docs.sh @@ -37,7 +37,7 @@ function script_location() { function generate_docs() { # Install and activate dartdoc. - "$PUB" global activate dartdoc 0.32.1 + "$PUB" global activate dartdoc 0.32.3 # This script generates a unified doc set, and creates # a custom index.html, placing everything into dev/docs/doc. diff --git a/dev/tools/dartdoc_checker.dart b/dev/tools/dartdoc_checker.dart index 9340b40f1a2..686e9182492 100644 --- a/dev/tools/dartdoc_checker.dart +++ b/dev/tools/dartdoc_checker.dart @@ -85,14 +85,9 @@ void checkForUnresolvedDirectives(String htmlOutputPath) { int _scanFile(File file) { assert(path.extension(file.path) == 'html'); - Iterable matches = _pattern.allMatches(file.readAsStringSync()) + final Iterable matches = _pattern.allMatches(file.readAsStringSync()) .map((RegExpMatch m ) => m.group(0)); - // TODO(goderbauer): Remove this exception when https://github.com/dart-lang/dartdoc/issues/1945 is fixed. - matches = matches - .where((String m) => m != '{@inject-html}') - .where((String m) => m != '{@end-inject-html}'); - if (matches.isNotEmpty) { stderr.writeln('Found unresolved dartdoc directives in ${file.path}:'); for (final String match in matches) {