From f733321fce165bbd3fee92a24a5d474042dbc4ab Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Mon, 12 Mar 2018 15:09:58 -0700
Subject: [PATCH 1/9] Fix or disable miscellaneous lints in dartdoc

---
 bin/dartdoc.dart                   | 28 +++++++++++-----------------
 lib/src/html/resource_loader.dart  |  4 ++--
 lib/src/io_utils.dart              |  2 +-
 lib/src/markdown_processor.dart    | 12 ++++++------
 lib/src/model.dart                 |  6 +++---
 test/compare_output_test.dart      |  2 +-
 testing/test_package/lib/fake.dart | 16 ++++++++++++----
 tool/doc_packages.dart             | 14 +++++++-------
 8 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index 7fd31a94bf..bb7e9de144 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -144,7 +144,7 @@ main(List<String> arguments) async {
         output['message'] = record.message;
       }
 
-      print(JSON.encode(output));
+      print(json.encode(output));
     });
   } else {
     final stopwatch = new Stopwatch()..start();
@@ -311,29 +311,24 @@ ArgParser _createArgsParser() {
       help: 'Path to source directory.', defaultsTo: Directory.current.path);
   parser.addOption('output',
       help: 'Path to output directory.', defaultsTo: defaultOutDir);
-  parser.addOption('header',
-      allowMultiple: true,
+  parser.addMultiOption('header',
       splitCommas: true,
       help: 'paths to header files containing HTML text.');
-  parser.addOption('footer',
-      allowMultiple: true,
+  parser.addMultiOption('footer',
       splitCommas: true,
       help: 'paths to footer files containing HTML text.');
-  parser.addOption('footer-text',
-      allowMultiple: true,
+  parser.addMultiOption('footer-text',
       splitCommas: true,
       help: 'paths to footer-text files '
           '(optional text next to the package name and version).');
-  parser.addOption('exclude',
-      allowMultiple: true, splitCommas: true, help: 'Library names to ignore.');
-  parser.addOption('exclude-packages',
-      allowMultiple: true, splitCommas: true, help: 'Package names to ignore.');
-  parser.addOption('include',
-      allowMultiple: true,
+  parser.addMultiOption('exclude',
+      splitCommas: true, help: 'Library names to ignore.');
+  parser.addMultiOption('exclude-packages',
+      splitCommas: true, help: 'Package names to ignore.');
+  parser.addMultiOption('include',
       splitCommas: true,
       help: 'Library names to generate docs for.');
-  parser.addOption('include-external',
-      allowMultiple: true,
+  parser.addMultiOption('include-external',
       help: 'Additional (external) dart files to include; use "dir/fileName", '
           'as in lib/material.dart.');
   parser.addOption('hosted-url',
@@ -353,10 +348,9 @@ ArgParser _createArgsParser() {
       help: 'Group libraries from the same package into categories.',
       negatable: false,
       defaultsTo: false);
-  parser.addOption('category-order',
+  parser.addMultiOption('category-order',
       help: 'A list of category names to place first when --use-categories is '
           'set.  Unmentioned categories are sorted after these.',
-      allowMultiple: true,
       splitCommas: true);
   parser.addFlag('auto-include-dependencies',
       help:
diff --git a/lib/src/html/resource_loader.dart b/lib/src/html/resource_loader.dart
index 368665ce5d..2126e01cb2 100644
--- a/lib/src/html/resource_loader.dart
+++ b/lib/src/html/resource_loader.dart
@@ -11,7 +11,7 @@
 library dartdoc.resource_loader;
 
 import 'dart:async' show Future;
-import 'dart:convert' show UTF8;
+import 'dart:convert' show utf8;
 
 import 'package:resource/resource.dart';
 
@@ -19,7 +19,7 @@ import 'package:resource/resource.dart';
 Future<String> loadAsString(String path) async {
   var bytes = await loadAsBytes(path);
 
-  return UTF8.decode(bytes);
+  return utf8.decode(bytes);
 }
 
 /// Loads a `package:` resource as an [List<int>].
diff --git a/lib/src/io_utils.dart b/lib/src/io_utils.dart
index 6554c1b22b..f99a69df22 100644
--- a/lib/src/io_utils.dart
+++ b/lib/src/io_utils.dart
@@ -77,7 +77,7 @@ class SubprocessLauncher {
     assert(prefix != null);
     if (filter == null) filter = (line) => [line];
     stream
-        .transform(UTF8.decoder)
+        .transform(utf8.decoder)
         .transform(const LineSplitter())
         .expand(filter)
         .listen((String line) {
diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart
index 335de243a9..2be141840f 100644
--- a/lib/src/markdown_processor.dart
+++ b/lib/src/markdown_processor.dart
@@ -139,15 +139,15 @@ final RegExp notARealDocReference = new RegExp(r'''(^[^\w]|^[\d]|[,"'/]|^$)''');
 
 final RegExp operatorPrefix = new RegExp(r'^operator[ ]*');
 
-final HtmlEscape htmlEscape = const HtmlEscape(HtmlEscapeMode.ELEMENT);
+final HtmlEscape htmlEscape = const HtmlEscape(HtmlEscapeMode.element);
 
 final List<md.InlineSyntax> _markdown_syntaxes = [
   new _InlineCodeSyntax(),
   new _AutolinkWithoutScheme()
-]..addAll(md.ExtensionSet.gitHub.inlineSyntaxes);
+]..addAll(md.ExtensionSet.gitHubFlavored.inlineSyntaxes);
 
 final List<md.BlockSyntax> _markdown_block_syntaxes = []
-  ..addAll(md.ExtensionSet.gitHub.blockSyntaxes);
+  ..addAll(md.ExtensionSet.gitHubFlavored.blockSyntaxes);
 
 // Remove these schemas from the display text for hyperlinks.
 final RegExp _hide_schemes = new RegExp('^(http|https)://');
@@ -735,7 +735,7 @@ String _linkDocReference(
     // This would be linkedElement.linkedName, but link bodies are slightly
     // different for doc references.
     if (linkedElement.href == null) {
-      return '<code>${HTML_ESCAPE.convert(label)}</code>';
+      return '<code>${htmlEscape.convert(label)}</code>';
     } else {
       return '<a ${classContent}href="${linkedElement.href}">$label</a>';
     }
@@ -744,7 +744,7 @@ String _linkDocReference(
       warnable.warn(PackageWarning.unresolvedDocReference,
           message: codeRef, referredFrom: warnable.documentationFrom);
     }
-    return '<code>${HTML_ESCAPE.convert(label)}</code>';
+    return '<code>${htmlEscape.convert(label)}</code>';
   }
 }
 
@@ -992,7 +992,7 @@ class _InlineCodeSyntax extends md.InlineSyntax {
 
   @override
   bool onMatch(md.InlineParser parser, Match match) {
-    var element = new md.Element.text('code', HTML_ESCAPE.convert(match[1]));
+    var element = new md.Element.text('code', htmlEscape.convert(match[1]));
     parser.addNode(element);
     return true;
   }
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 1a47583f39..e5d204505f 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -61,7 +61,7 @@ Map<String, Map<String, List<Map<String, dynamic>>>> get _crossdartJson {
       var crossdartFile =
           new File(p.join(config.inputDir.path, "crossdart.json"));
       if (crossdartFile.existsSync()) {
-        __crossdartJson = JSON.decode(crossdartFile.readAsStringSync())
+        __crossdartJson = json.decode(crossdartFile.readAsStringSync())
             as Map<String, Map<String, List<Map<String, dynamic>>>>;
       } else {
         __crossdartJson = {};
@@ -1544,7 +1544,7 @@ abstract class GetterSetterCombo implements ModelElement {
 
   String _buildConstantValueBase() {
     String result = constantInitializer?.toString() ?? '';
-    return const HtmlEscape(HtmlEscapeMode.UNKNOWN).convert(result);
+    return const HtmlEscape(HtmlEscapeMode.unknown).convert(result);
   }
 
   String get constantValue => linkifyConstantValue(constantValueBase);
@@ -3444,7 +3444,7 @@ abstract class ModelElement extends Canonicalization
       if (isPublicAndPackageDocumented) {
         warn(PackageWarning.noCanonicalFound);
       }
-      return HTML_ESCAPE.convert(name);
+      return htmlEscape.convert(name);
     }
 
     var classContent = isDeprecated ? ' class="deprecated"' : '';
diff --git a/test/compare_output_test.dart b/test/compare_output_test.dart
index f682539b93..3a594d44e3 100644
--- a/test/compare_output_test.dart
+++ b/test/compare_output_test.dart
@@ -174,7 +174,7 @@ void main() {
 
       var jsonValues = LineSplitter
           .split(result.stdout)
-          .map((j) => JSON.decode(j) as Map<String, dynamic>)
+          .map((j) => json.decode(j) as Map<String, dynamic>)
           .toList();
 
       expect(jsonValues, isNotEmpty,
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index 8ebb76963b..02713f33ae 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -47,13 +47,10 @@
 library fake;
 
 import 'dart:async';
-
 import 'dart:collection';
 
-import 'example.dart';
-
 import 'css.dart' as css;
-
+import 'example.dart';
 import 'two_exports.dart' show BaseClass;
 
 abstract class ImplementingThingy implements BaseThingy {}
@@ -224,6 +221,7 @@ typedef int LotsAndLotsOfParameters(so, many, parameters, it, should, wrap,
 
 /// This class is cool!
 class Cool {
+  // ignore: missing_return
   Cool returnCool() {}
 }
 
@@ -258,7 +256,9 @@ class SuperAwesomeClass {
   ///
   /// Another comment line.
   void fly(int height, Cool superCool, {String msg}) {
+    // ignore: unused_local_variable, avoid_init_to_null
     var x = null;
+    // ignore: unused_local_variable
     int i, y;
     for (int z = 0; z < 100; z++) {
       print('hi');
@@ -372,6 +372,7 @@ class ClassWithUnusualProperties extends ImplicitProperties {
 ///
 /// The rest of this is not in the first paragraph.
 @Annotation('value')
+// ignore: deprecated_member_use
 class LongFirstLine extends SuperAwesomeClass
     with MixMeIn
     implements Interface, AnotherInterface {
@@ -621,14 +622,18 @@ class HasGenericWithExtends<T extends Foo2> {}
 
 /// Extends [ListBase]
 class SpecialList<E> extends ListBase<E> {
+  // ignore: annotate_overrides
   E operator [](int index) {
     return null;
   }
 
+  // ignore: annotate_overrides
   int get length => 0;
 
+  // ignore: annotate_overrides
   void set length(int length) {}
 
+  // ignore: annotate_overrides
   void operator []=(int index, E value) {}
 }
 
@@ -648,6 +653,7 @@ class BaseForDocComments {
   ///
   /// Reference to another method in this class [anotherMethod] xx
   ///
+  // ignore: deprecated_member_use
   /// Reference to a top-level function in this library [topLevelFunction] xx
   ///
   /// Reference to a top-level function in another library that is imported into this library (example lib) [function1] xx
@@ -743,6 +749,7 @@ class ReferringClass {
 abstract class MIEEMixinWithOverride<K, V> = MIEEBase<K, V> with _MIEEPrivateOverride<K, V>;
 
 abstract class _MIEEPrivateOverride<K, V> implements MIEEThing<K, V> {
+  // ignore: annotate_overrides
   void operator[]=(K key, V value) {
     throw new UnsupportedError("Never use this");
   }
@@ -751,6 +758,7 @@ abstract class _MIEEPrivateOverride<K, V> implements MIEEThing<K, V> {
 abstract class MIEEBase<K, V> extends MIEEMixin<K, V> {}
 
 abstract class MIEEMixin<K, V> implements MIEEThing<K, V> {
+  // ignore: annotate_overrides
   operator []=(K key, V value);
 }
 
diff --git a/tool/doc_packages.dart b/tool/doc_packages.dart
index 63d4066ffb..0c31e56c52 100644
--- a/tool/doc_packages.dart
+++ b/tool/doc_packages.dart
@@ -6,7 +6,7 @@
 library dartdoc.doc_packages;
 
 import 'dart:async';
-import 'dart:convert' show JSON, UTF8;
+import 'dart:convert' show json, utf8;
 import 'dart:io';
 
 import 'package:args/args.dart';
@@ -125,17 +125,17 @@ Future<List<String>> _packageUrls(int page) {
   return http
       .get('https://pub.dartlang.org/packages.json?page=${page}')
       .then((response) {
-    return new List<String>.from(JSON.decode(response.body)['packages']);
+    return new List<String>.from(json.decode(response.body)['packages']);
   });
 }
 
 Future<List<PackageInfo>> _getPackageInfos(List<String> packageUrls) {
   var futures = packageUrls.map((String p) {
     return http.get(p).then((response) {
-      var json = JSON.decode(response.body);
-      String name = json['name'];
+      var decodedJson = json.decode(response.body);
+      String name = decodedJson['name'];
       List<Version> versions = new List<Version>.from(
-          json['versions'].map((v) => new Version.parse(v)));
+          decodedJson['versions'].map((v) => new Version.parse(v)));
       return new PackageInfo(name, Version.primary(versions));
     });
   }).toList();
@@ -200,8 +200,8 @@ Future _exec(String command, List<String> args,
       .start(command, args, workingDirectory: cwd)
       .then((Process process) {
     if (!quiet) {
-      process.stdout.listen((bytes) => _log(UTF8.decode(bytes)));
-      process.stderr.listen((bytes) => _log(UTF8.decode(bytes)));
+      process.stdout.listen((bytes) => _log(utf8.decode(bytes)));
+      process.stderr.listen((bytes) => _log(utf8.decode(bytes)));
     }
 
     Future f = process.exitCode.then((code) {

From 6fedd10ee263f4e6cc90b173cc6e8658199cc447 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 12:55:50 -0700
Subject: [PATCH 2/9] Clean up a few more lints.

---
 test/model_test.dart | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/test/model_test.dart b/test/model_test.dart
index 60329f4ecc..5da284d534 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1172,11 +1172,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('typedef params have proper signature', () {
-      // typedef void VoidCallback();
-      // void addCallback(VoidCallback callback) { }
       ModelFunction function =
           fakeLibrary.functions.firstWhere((f) => f.name == 'addCallback');
-      ElementType t = function.parameters.first.modelType;
       String params = function.linkedParams();
       expect(
           params,
@@ -1184,8 +1181,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           '<span class="type-annotation"><a href="fake/VoidCallback.html">VoidCallback</a></span> '
           '<span class="parameter-name">callback</span></span>');
 
-      // typedef int Callback2(String);
-      // void addCallback2(Callback2 callback) { }
       function =
           fakeLibrary.functions.firstWhere((f) => f.name == 'addCallback2');
       params = function.linkedParams();
@@ -1216,7 +1211,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .singleWhere((f) => f.name == 'explicitSetter');
       // TODO(jcollins-g): really, these shouldn't be called "parameters" in
       // the span class.
-      ElementType t = explicitSetter.modelType;
       expect(explicitSetter.linkedReturnType,
           '<span class="parameter" id="explicitSetter=-param-f"><span class="type-annotation">dynamic</span> <span class="parameter-name">Function</span>(<span class="parameter" id="f-param-bar"><span class="type-annotation">int</span>, </span> <span class="parameter" id="f-param-baz"><span class="type-annotation"><a href="fake/Cool-class.html">Cool</a></span>, </span> <span class="parameter" id="f-param-macTruck"><span class="type-annotation">List<span class="signature">&lt;int&gt;</span></span></span>)</span>');
     });
@@ -1293,7 +1287,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       Method aTypedefReturningMethodInterface = TemplatedInterface
           .allInstanceMethods
           .singleWhere((m) => m.name == 'aTypedefReturningMethodInterface');
-      ElementType mt = aTypedefReturningMethodInterface.modelType;
       expect(aTypedefReturningMethodInterface.linkedReturnType,
           '<a href=\"ex/ParameterizedTypedef.html\">ParameterizedTypedef</a><span class="signature">&lt;List<span class="signature">&lt;String&gt;</span>&gt;</span>');
     });
@@ -2240,7 +2233,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('anonymous nested functions inside typedefs are handled', () {
-      ElementType t = aComplexTypedef.modelType;
       expect(aComplexTypedef, isNotNull);
       expect(aComplexTypedef.linkedReturnType, startsWith('Function'));
       expect(aComplexTypedef.nameWithGenerics,
@@ -2371,13 +2363,11 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('typedef param is linked and does not include types', () {
-      ElementType t = methodWithTypedefParam.parameters.first.modelType;
       var params = methodWithTypedefParam.linkedParams();
       expect(
           params,
           equals(
               '<span class="parameter" id="methodWithTypedefParam-param-p"><span class="type-annotation"><a href="ex/processMessage.html">processMessage</a></span> <span class="parameter-name">p</span></span>'));
-      //expect(params, contains('<a href="ex/processMessage.html">'));
     });
   });
 

From a32fd9819bbb16445a34905a146ade945e220ff3 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 12:37:22 -0700
Subject: [PATCH 3/9] Rename category to package in all remaining references

---
 bin/dartdoc.dart                 | 18 +++++++++++----
 lib/dartdoc.dart                 |  4 ++--
 lib/src/config.dart              |  8 +++----
 lib/src/html/html_generator.dart |  4 ++--
 lib/src/html/template_data.dart  |  6 ++---
 lib/src/model.dart               | 39 +++++++++++++++++---------------
 lib/src/package_meta.dart        | 12 +++++-----
 lib/src/warnings.dart            |  6 ++---
 lib/templates/index.html         | 28 +++++++++++------------
 lib/templates/library.html       | 12 +++++-----
 pubspec.lock                     |  2 +-
 test/model_test.dart             | 14 ++++++------
 12 files changed, 82 insertions(+), 71 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index bb7e9de144..64dfc45dc6 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -190,7 +190,7 @@ main(List<String> arguments) async {
 
   PackageMeta packageMeta = sdkDocs
       ? new PackageMeta.fromSdk(sdkDir,
-          sdkReadmePath: readme, useCategories: args['use-categories'])
+          sdkReadmePath: readme, displayAsPackages: args['use-categories'] || args['display-as-packages'])
       : new PackageMeta.fromDir(inputDir);
 
   if (!packageMeta.isValid) {
@@ -217,7 +217,7 @@ main(List<String> arguments) async {
       footerFilePaths: footerFilePaths,
       footerTextFilePaths: footerTextFilePaths,
       faviconPath: args['favicon'],
-      useCategories: args['use-categories'],
+      displayAsPackages: args['use-categories'],
       prettyIndexJson: args['pretty-index-json']);
 
   for (var generator in generators) {
@@ -257,7 +257,7 @@ main(List<String> arguments) async {
       inputDir: inputDir,
       sdkVersion: sdk.sdkVersion,
       autoIncludeDependencies: args['auto-include-dependencies'],
-      categoryOrder: args['category-order'],
+      packageOrder: args['package-order'].isEmpty ? args['category-order'] : args['package-order'],
       reexportMinConfidence:
           double.parse(args['ambiguous-reexport-scorer-min-confidence']),
       verboseWarnings: args['verbose-warnings'],
@@ -345,11 +345,19 @@ ArgParser _createArgsParser() {
   parser.addOption('favicon',
       help: 'A path to a favicon for the generated docs.');
   parser.addFlag('use-categories',
-      help: 'Group libraries from the same package into categories.',
+      help: 'Group libraries from the same package in the libraries sidebar. (deprecated, replaced by display-as-packages)',
+      negatable: false,
+      defaultsTo: false);
+  parser.addFlag('display-as-packages',
+      help: 'Group libraries from the same package in the libraries sidebar.',
       negatable: false,
       defaultsTo: false);
   parser.addMultiOption('category-order',
-      help: 'A list of category names to place first when --use-categories is '
+      help: 'A list of category names to place first when --display-as-packages is '
+          'set.  Unmentioned categories are sorted after these. (deprecated, replaced by package-order)',
+      splitCommas: true);
+  parser.addMultiOption('package-order',
+      help: 'A list of category names to place first when --display-as-packages is '
           'set.  Unmentioned categories are sorted after these.',
       splitCommas: true);
   parser.addFlag('auto-include-dependencies',
diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index 4ddaf91a89..1d1c0f7db9 100644
--- a/lib/dartdoc.dart
+++ b/lib/dartdoc.dart
@@ -46,14 +46,14 @@ Future<List<Generator>> initGenerators(String url, String relCanonicalPrefix,
     List<String> footerFilePaths,
     List<String> footerTextFilePaths,
     String faviconPath,
-    bool useCategories: false,
+    bool displayAsPackages: false,
     bool prettyIndexJson: false}) async {
   var options = new HtmlGeneratorOptions(
       url: url,
       relCanonicalPrefix: relCanonicalPrefix,
       toolVersion: version,
       faviconPath: faviconPath,
-      useCategories: useCategories,
+      displayAsPackages: displayAsPackages,
       prettyIndexJson: prettyIndexJson);
 
   return [
diff --git a/lib/src/config.dart b/lib/src/config.dart
index 95335371cb..ae08e10796 100644
--- a/lib/src/config.dart
+++ b/lib/src/config.dart
@@ -14,7 +14,7 @@ class Config {
   final bool includeSource;
   final String sdkVersion;
   final bool autoIncludeDependencies;
-  final List<String> categoryOrder;
+  final List<String> packageOrder;
   final double reexportMinConfidence;
   final bool verboseWarnings;
   final List<String> dropTextFrom;
@@ -28,7 +28,7 @@ class Config {
       this.includeSource,
       this.sdkVersion,
       this.autoIncludeDependencies,
-      this.categoryOrder,
+      this.packageOrder,
       this.reexportMinConfidence,
       this.verboseWarnings,
       this.dropTextFrom,
@@ -47,7 +47,7 @@ void setConfig(
     bool includeSource: true,
     String sdkVersion,
     bool autoIncludeDependencies: false,
-    List<String> categoryOrder,
+    List<String> packageOrder,
     double reexportMinConfidence: 0.1,
     bool verboseWarnings: true,
     List<String> dropTextFrom,
@@ -61,7 +61,7 @@ void setConfig(
       includeSource,
       sdkVersion,
       autoIncludeDependencies,
-      categoryOrder ?? const <String>[],
+      packageOrder ?? const <String>[],
       reexportMinConfidence,
       verboseWarnings,
       dropTextFrom ?? const <String>[],
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index cbe1385410..d8916ffa9b 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -116,7 +116,7 @@ class HtmlGeneratorOptions implements HtmlOptions {
   final bool prettyIndexJson;
 
   @override
-  final bool useCategories;
+  final bool displayAsPackages;
 
   @override
   final String relCanonicalPrefix;
@@ -129,7 +129,7 @@ class HtmlGeneratorOptions implements HtmlOptions {
       this.relCanonicalPrefix,
       this.faviconPath,
       String toolVersion,
-      this.useCategories: false,
+      this.displayAsPackages: false,
       this.prettyIndexJson: false})
       : this.toolVersion = toolVersion ?? 'unknown';
 }
diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
index 05e57ecabf..badb39a22b 100644
--- a/lib/src/html/template_data.dart
+++ b/lib/src/html/template_data.dart
@@ -7,7 +7,7 @@ import '../model.dart';
 abstract class HtmlOptions {
   String get relCanonicalPrefix;
   String get toolVersion;
-  bool get useCategories;
+  bool get displayAsPackages;
 }
 
 class Subnav {
@@ -63,7 +63,7 @@ abstract class TemplateData<T extends Documentable> {
   T get self;
   String get version => htmlOptions.toolVersion;
   String get relCanonicalPrefix => htmlOptions.relCanonicalPrefix;
-  bool get useCategories => htmlOptions.useCategories;
+  bool get displayAsPackages => htmlOptions.displayAsPackages;
 
   Iterable<Subnav> getSubNavItems() => <Subnav>[];
 
@@ -113,7 +113,7 @@ class PackageTemplateData extends TemplateData<PackageGraph> {
   String get homepage => packageGraph.homepage;
 
   @override
-  String get kind => (useCategories || packageGraph.isSdk) ? '' : 'package';
+  String get kind => (displayAsPackages || packageGraph.isSdk) ? '' : 'package';
 
   /// `null` for packages because they are at the root – not needed
   @override
diff --git a/lib/src/model.dart b/lib/src/model.dart
index f0f0d112b5..5653b0f238 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -3991,9 +3991,9 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
         warningMessage =
             "library says it is {@canonicalFor ${message}} but ${message} can't be canonical there";
         break;
-      case PackageWarning.categoryOrderGivesMissingPackageName:
+      case PackageWarning.packageOrderGivesMissingPackageName:
         warningMessage =
-            "--category-order gives invalid package name: '${message}'";
+            "--package-order gives invalid package name: '${message}'";
         break;
       case PackageWarning.unresolvedDocReference:
         warningMessage = "unresolved doc reference [${message}]";
@@ -4063,17 +4063,20 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
     return locatable.fullyQualifiedName.replaceFirst(':', '-');
   }
 
-  List<Package> get categories {
-    // Help the user if they pass us a category that doesn't exist.
-    for (String categoryName in config.categoryOrder) {
-      if (!packages.containsKey(categoryName))
-        warnOnElement(null, PackageWarning.categoryOrderGivesMissingPackageName,
-            message: "${categoryName}, categories: ${packages.keys.join(',')}");
+  List<Package> _publicPackages;
+  List<Package> get publicPackages {
+    if (_publicPackages == null) {
+      // Help the user if they pass us a package that doesn't exist.
+      for (String packageName in config.packageOrder) {
+        if (!packages.containsKey(packageName))
+          warnOnElement(null, PackageWarning.packageOrderGivesMissingPackageName,
+              message: "${packageName}, packages: ${packages.keys.join(',')}");
+      }
+      _publicPackages = packages.values
+          .where((p) => p.libraries.any((l) => l.isPublic))
+          .toList()..sort();
     }
-    List<Package> publicPackages = packages.values
-        .where((p) => p.libraries.any((l) => l.isPublic))
-        .toList();
-    return publicPackages..sort();
+    return _publicPackages;
   }
 
   Map<LibraryElement, Set<Library>> _libraryElementReexportedBy = new Map();
@@ -4200,7 +4203,7 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
   String get name => packageMeta.name;
 
   String get kind =>
-      (packageMeta.useCategories || packageGraph.isSdk) ? '' : 'package';
+      (packageMeta.displayAsPackages || packageGraph.isSdk) ? '' : 'package';
 
   @override
   String get oneLineDoc => '';
@@ -4492,14 +4495,14 @@ class Package implements Comparable<Package> {
   String toString() => name;
 
   /// Returns:
-  /// -1 if this category is listed in --category-order.
-  /// 0 if this category is the original package we are documenting.
+  /// -1 if this package is listed in --package-order.
+  /// 0 if this package is the original package we are documenting.
   /// 1 if this group represents the Dart SDK.
   /// 2 if this group has a name that contains the name of the original
   ///   package we are documenting.
   /// 3 otherwise.
   int get _group {
-    if (config.categoryOrder.contains(name)) return -1;
+    if (config.packageOrder.contains(name)) return -1;
     if (name.toLowerCase() == packageGraph.name.toLowerCase()) return 0;
     if (name == "Dart Core") return 1;
     if (name.toLowerCase().contains(packageGraph.name.toLowerCase())) return 2;
@@ -4510,8 +4513,8 @@ class Package implements Comparable<Package> {
   int compareTo(Package other) {
     if (_group == other._group) {
       if (_group == -1) {
-        return Comparable.compare(config.categoryOrder.indexOf(name),
-            config.categoryOrder.indexOf(other.name));
+        return Comparable.compare(config.packageOrder.indexOf(name),
+            config.packageOrder.indexOf(other.name));
       } else {
         return name.toLowerCase().compareTo(other.name.toLowerCase());
       }
diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart
index b14c007f00..e8f2739d72 100644
--- a/lib/src/package_meta.dart
+++ b/lib/src/package_meta.dart
@@ -13,15 +13,15 @@ import 'logging.dart';
 
 abstract class PackageMeta {
   final Directory dir;
-  final bool useCategories;
+  final bool displayAsPackages;
 
-  PackageMeta(this.dir, {this.useCategories: false});
+  PackageMeta(this.dir, {this.displayAsPackages: false});
 
   factory PackageMeta.fromDir(Directory dir) => new _FilePackageMeta(dir);
   factory PackageMeta.fromSdk(Directory sdkDir,
-          {String sdkReadmePath, bool useCategories}) =>
+          {String sdkReadmePath, bool displayAsPackages}) =>
       new _SdkMeta(sdkDir,
-          sdkReadmePath: sdkReadmePath, useCategories: useCategories);
+          sdkReadmePath: sdkReadmePath, displayAsPackages: displayAsPackages);
 
   bool get isSdk;
   bool get needsPubGet => false;
@@ -186,8 +186,8 @@ File _locate(Directory dir, List<String> fileNames) {
 class _SdkMeta extends PackageMeta {
   final String sdkReadmePath;
 
-  _SdkMeta(Directory dir, {this.sdkReadmePath, bool useCategories})
-      : super(dir, useCategories: useCategories);
+  _SdkMeta(Directory dir, {this.sdkReadmePath, bool displayAsPackages})
+      : super(dir, displayAsPackages: displayAsPackages);
 
   @override
   bool get isSdk => true;
diff --git a/lib/src/warnings.dart b/lib/src/warnings.dart
index 77d8c4c710..fd30576749 100644
--- a/lib/src/warnings.dart
+++ b/lib/src/warnings.dart
@@ -52,8 +52,8 @@ final Map<PackageWarning, PackageWarningHelpText> packageWarningText = const {
       PackageWarning.noLibraryLevelDocs,
       "no-library-level-docs",
       "There are no library level docs for this library"),
-  PackageWarning.categoryOrderGivesMissingPackageName: const PackageWarningHelpText(
-      PackageWarning.categoryOrderGivesMissingPackageName,
+  PackageWarning.packageOrderGivesMissingPackageName: const PackageWarningHelpText(
+      PackageWarning.packageOrderGivesMissingPackageName,
       "category-order-gives-missing-package-name",
       "The category-order flag on the command line was given the name of a nonexistent package"),
   PackageWarning.unresolvedDocReference: const PackageWarningHelpText(
@@ -117,7 +117,7 @@ enum PackageWarning {
   ignoredCanonicalFor,
   noCanonicalFound,
   noLibraryLevelDocs,
-  categoryOrderGivesMissingPackageName,
+  packageOrderGivesMissingPackageName,
   unresolvedDocReference,
   unknownMacro,
   brokenLink,
diff --git a/lib/templates/index.html b/lib/templates/index.html
index fa12a1f4c9..56066b3f55 100644
--- a/lib/templates/index.html
+++ b/lib/templates/index.html
@@ -3,26 +3,26 @@
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5>{{self.name}} {{self.kind}}</h5>
 
-    {{#useCategories}}
+    {{#displayAsPackages}}
     <ol>
-      {{#packageGraph.categories}}
+      {{#packageGraph.publicPackages}}
         <li class="section-title">{{name}}</li>
-        {{#libraries}}
+        {{#publicLibraries}}
         <li>{{{linkedName}}}</li>
-        {{/libraries}}
-      {{/packageGraph.categories}}
+        {{/publicLibraries}}
+      {{/packageGraph.publicPackages}}
 
     </ol>
-    {{/useCategories}}
+    {{/displayAsPackages}}
 
-    {{^useCategories}}
+    {{^displayAsPackages}}
     <ol>
       <li class="section-title"><a href="{{packageGraph.href}}#libraries">Libraries</a></li>
       {{#packageGraph.publicLibraries}}
       <li>{{{linkedName}}}</li>
       {{/packageGraph.publicLibraries}}
     </ol>
-    {{/useCategories}}
+    {{/displayAsPackages}}
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
@@ -30,8 +30,8 @@ <h5>{{self.name}} {{self.kind}}</h5>
       {{>documentation}}
     {{/packageGraph}}
 
-    {{#useCategories}}
-      {{#packageGraph.categories}}
+    {{#displayAsPackages}}
+      {{#packageGraph.publicPackages}}
         <section class="summary">
           <h2>{{name}}</h2>
           <dl>
@@ -45,11 +45,11 @@ <h2>{{name}}</h2>
             {{/libraries}}
           </dl>
         </section>
-      {{/packageGraph.categories}}
+      {{/packageGraph.publicPackages}}
 
-    {{/useCategories}}
+    {{/displayAsPackages}}
 
-    {{^useCategories}}
+    {{^displayAsPackages}}
       <section class="summary" id="libraries">
         <h2>Libraries</h2>
         <dl>
@@ -63,7 +63,7 @@ <h2>Libraries</h2>
           {{/packageGraph.publicLibraries}}
         </dl>
       </section>
-    {{/useCategories}}
+    {{/displayAsPackages}}
 
   </div> <!-- /.main-content -->
 
diff --git a/lib/templates/library.html b/lib/templates/library.html
index ec14b7795b..951611fc7b 100644
--- a/lib/templates/library.html
+++ b/lib/templates/library.html
@@ -2,25 +2,25 @@
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
     <h5>{{parent.name}} {{parent.kind}}</h5>
-    {{#useCategories}}
+    {{#displayAsPackages}}
     <ol>
-      {{#packageGraph.categories}}
+      {{#packageGraph.publicPackages}}
         <li class="section-title">{{name}}</li>
         {{#publicLibraries}}
         <li>{{{linkedName}}}</li>
         {{/publicLibraries}}
-      {{/packageGraph.categories}}
+      {{/packageGraph.publicPackages}}
     </ol>
-    {{/useCategories}}
+    {{/displayAsPackages}}
 
-    {{^useCategories}}
+    {{^displayAsPackages}}
     <ol>
       <li class="section-title"><a href="{{packageGraph.href}}#libraries">Libraries</a></li>
       {{#packageGraph.publicLibraries}}
       <li>{{{linkedName}}}</li>
       {{/packageGraph.publicLibraries}}
     </ol>
-    {{/useCategories}}
+    {{/displayAsPackages}}
   </div>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
diff --git a/pubspec.lock b/pubspec.lock
index 24097f014d..2b01741fee 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -408,4 +408,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.36.0"
+  dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.38.0"
diff --git a/test/model_test.dart b/test/model_test.dart
index 5da284d534..149df8eb50 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -66,23 +66,23 @@ void main() {
       });
 
       test('categories', () {
-        expect(packageGraph.categories, hasLength(1));
+        expect(packageGraph.publicPackages, hasLength(1));
 
-        Package category = packageGraph.categories.first;
+        Package category = packageGraph.publicPackages.first;
         expect(category.name, 'test_package');
         expect(category.libraries, hasLength(8));
       });
 
       test('multiple categories, sorted default', () {
-        expect(ginormousPackageGraph.categories, hasLength(3));
-        expect(ginormousPackageGraph.categories.first.name,
+        expect(ginormousPackageGraph.publicPackages, hasLength(3));
+        expect(ginormousPackageGraph.publicPackages.first.name,
             equals('test_package'));
       });
 
       test('multiple categories, specified sort order', () {
-        setConfig(categoryOrder: ['meta', 'test_package']);
-        expect(ginormousPackageGraph.categories, hasLength(3));
-        expect(ginormousPackageGraph.categories.first.name, equals('meta'));
+        setConfig(packageOrder: ['meta', 'test_package']);
+        expect(ginormousPackageGraph.publicPackages, hasLength(3));
+        expect(ginormousPackageGraph.publicPackages.first.name, equals('meta'));
       });
 
       test('is documented in library', () {

From b59a4df2a0154c421380b650153ad21507128cf9 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 12:37:49 -0700
Subject: [PATCH 4/9] dartfmt

---
 lib/src/model.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/src/model.dart b/lib/src/model.dart
index 5653b0f238..9be0f9b5f5 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -4069,12 +4069,14 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
       // Help the user if they pass us a package that doesn't exist.
       for (String packageName in config.packageOrder) {
         if (!packages.containsKey(packageName))
-          warnOnElement(null, PackageWarning.packageOrderGivesMissingPackageName,
+          warnOnElement(
+              null, PackageWarning.packageOrderGivesMissingPackageName,
               message: "${packageName}, packages: ${packages.keys.join(',')}");
       }
       _publicPackages = packages.values
           .where((p) => p.libraries.any((l) => l.isPublic))
-          .toList()..sort();
+          .toList()
+            ..sort();
     }
     return _publicPackages;
   }

From bc64d2c619cee4ee5a4de51e2b17262ad2c20ecb Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 13:10:21 -0700
Subject: [PATCH 5/9] Review comments

---
 pubspec.lock | 2 +-
 pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 24097f014d..2b01741fee 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -408,4 +408,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.36.0"
+  dart: ">=2.0.0-dev.23.0 <=2.0.0-dev.38.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 1c3118b354..0b74dcfed5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ homepage: https://github.com/dart-lang/dartdoc
 # For development, recommend 1.25.0-dev.0.0 or higher to allow
 # dartanalyzer to work on dartdoc itself.
 environment:
-  sdk: '>=1.23.0-dev.11.5 <2.0.0'
+  sdk: '>=2.0.0-dev.9.0 <3.0.0'
 dependencies:
   analyzer: '0.31.2-alpha.0'
   args: '>=0.13.0 <2.0.0'

From 5500887b656da1e4032378df3140c501074f879c Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 15:15:29 -0700
Subject: [PATCH 6/9] Fix test failure (accidentally caching config info)

---
 lib/src/model.dart | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/src/model.dart b/lib/src/model.dart
index 9be0f9b5f5..16cce3493e 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -4063,22 +4063,19 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
     return locatable.fullyQualifiedName.replaceFirst(':', '-');
   }
 
-  List<Package> _publicPackages;
   List<Package> get publicPackages {
-    if (_publicPackages == null) {
-      // Help the user if they pass us a package that doesn't exist.
-      for (String packageName in config.packageOrder) {
-        if (!packages.containsKey(packageName))
-          warnOnElement(
-              null, PackageWarning.packageOrderGivesMissingPackageName,
-              message: "${packageName}, packages: ${packages.keys.join(',')}");
-      }
-      _publicPackages = packages.values
-          .where((p) => p.libraries.any((l) => l.isPublic))
-          .toList()
-            ..sort();
-    }
-    return _publicPackages;
+    List<Package> _publicPackages;
+    // Help the user if they pass us a package that doesn't exist.
+    for (String packageName in config.packageOrder) {
+      if (!packages.containsKey(packageName))
+        warnOnElement(
+            null, PackageWarning.packageOrderGivesMissingPackageName,
+            message: "${packageName}, packages: ${packages.keys.join(',')}");
+    }
+    _publicPackages = packages.values
+        .where((p) => p.libraries.any((l) => l.isPublic))
+        .toList();
+    return _publicPackages..sort();
   }
 
   Map<LibraryElement, Set<Library>> _libraryElementReexportedBy = new Map();

From 65d9d3802e7bfd7eaf140eb60263e861bd2f95e8 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 15:17:53 -0700
Subject: [PATCH 7/9] dartfmt

---
 bin/dartdoc.dart     | 9 +++------
 test/model_test.dart | 9 +++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index bb7e9de144..ce6ef1317f 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -312,11 +312,9 @@ ArgParser _createArgsParser() {
   parser.addOption('output',
       help: 'Path to output directory.', defaultsTo: defaultOutDir);
   parser.addMultiOption('header',
-      splitCommas: true,
-      help: 'paths to header files containing HTML text.');
+      splitCommas: true, help: 'paths to header files containing HTML text.');
   parser.addMultiOption('footer',
-      splitCommas: true,
-      help: 'paths to footer files containing HTML text.');
+      splitCommas: true, help: 'paths to footer files containing HTML text.');
   parser.addMultiOption('footer-text',
       splitCommas: true,
       help: 'paths to footer-text files '
@@ -326,8 +324,7 @@ ArgParser _createArgsParser() {
   parser.addMultiOption('exclude-packages',
       splitCommas: true, help: 'Package names to ignore.');
   parser.addMultiOption('include',
-      splitCommas: true,
-      help: 'Library names to generate docs for.');
+      splitCommas: true, help: 'Library names to generate docs for.');
   parser.addMultiOption('include-external',
       help: 'Additional (external) dart files to include; use "dir/fileName", '
           'as in lib/material.dart.');
diff --git a/test/model_test.dart b/test/model_test.dart
index 5da284d534..3434e02ec7 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -2227,9 +2227,14 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           fakeLibrary.classes.firstWhere((t) => t.name == 'TypedefUsingClass');
     });
 
-    test('Typedefs with bound type parameters indirectly referred in parameters are displayed', () {
+    test(
+        'Typedefs with bound type parameters indirectly referred in parameters are displayed',
+        () {
       Constructor theConstructor = TypedefUsingClass.constructors.first;
-      expect(theConstructor.linkedParams(), equals('<span class="parameter" id="-param-x"><span class="type-annotation"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;double&gt;</span></span> <span class="parameter-name">x</span></span>'));
+      expect(
+          theConstructor.linkedParams(),
+          equals(
+              '<span class="parameter" id="-param-x"><span class="type-annotation"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a><span class="signature">&lt;double&gt;</span></span> <span class="parameter-name">x</span></span>'));
     });
 
     test('anonymous nested functions inside typedefs are handled', () {

From a113ef8c7c4af71ccc9a93b626275223c0162b95 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 15:18:34 -0700
Subject: [PATCH 8/9] dartfmt

---
 bin/dartdoc.dart   | 17 ++++++++++++-----
 lib/src/model.dart |  3 +--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index cd34ec5cc3..eb2131290e 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -190,7 +190,9 @@ main(List<String> arguments) async {
 
   PackageMeta packageMeta = sdkDocs
       ? new PackageMeta.fromSdk(sdkDir,
-          sdkReadmePath: readme, displayAsPackages: args['use-categories'] || args['display-as-packages'])
+          sdkReadmePath: readme,
+          displayAsPackages:
+              args['use-categories'] || args['display-as-packages'])
       : new PackageMeta.fromDir(inputDir);
 
   if (!packageMeta.isValid) {
@@ -257,7 +259,9 @@ main(List<String> arguments) async {
       inputDir: inputDir,
       sdkVersion: sdk.sdkVersion,
       autoIncludeDependencies: args['auto-include-dependencies'],
-      packageOrder: args['package-order'].isEmpty ? args['category-order'] : args['package-order'],
+      packageOrder: args['package-order'].isEmpty
+          ? args['category-order']
+          : args['package-order'],
       reexportMinConfidence:
           double.parse(args['ambiguous-reexport-scorer-min-confidence']),
       verboseWarnings: args['verbose-warnings'],
@@ -342,7 +346,8 @@ ArgParser _createArgsParser() {
   parser.addOption('favicon',
       help: 'A path to a favicon for the generated docs.');
   parser.addFlag('use-categories',
-      help: 'Group libraries from the same package in the libraries sidebar. (deprecated, replaced by display-as-packages)',
+      help:
+          'Group libraries from the same package in the libraries sidebar. (deprecated, replaced by display-as-packages)',
       negatable: false,
       defaultsTo: false);
   parser.addFlag('display-as-packages',
@@ -350,11 +355,13 @@ ArgParser _createArgsParser() {
       negatable: false,
       defaultsTo: false);
   parser.addMultiOption('category-order',
-      help: 'A list of category names to place first when --display-as-packages is '
+      help:
+          'A list of category names to place first when --display-as-packages is '
           'set.  Unmentioned categories are sorted after these. (deprecated, replaced by package-order)',
       splitCommas: true);
   parser.addMultiOption('package-order',
-      help: 'A list of category names to place first when --display-as-packages is '
+      help:
+          'A list of category names to place first when --display-as-packages is '
           'set.  Unmentioned categories are sorted after these.',
       splitCommas: true);
   parser.addFlag('auto-include-dependencies',
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 16cce3493e..70dd661b2e 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -4068,8 +4068,7 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
     // Help the user if they pass us a package that doesn't exist.
     for (String packageName in config.packageOrder) {
       if (!packages.containsKey(packageName))
-        warnOnElement(
-            null, PackageWarning.packageOrderGivesMissingPackageName,
+        warnOnElement(null, PackageWarning.packageOrderGivesMissingPackageName,
             message: "${packageName}, packages: ${packages.keys.join(',')}");
     }
     _publicPackages = packages.values

From 4c57a00a268756adf9724499838451878eafbfd4 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Fri, 16 Mar 2018 13:48:59 -0700
Subject: [PATCH 9/9] one last rename

---
 bin/dartdoc.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index eb2131290e..27252db039 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -356,12 +356,12 @@ ArgParser _createArgsParser() {
       defaultsTo: false);
   parser.addMultiOption('category-order',
       help:
-          'A list of category names to place first when --display-as-packages is '
+          'A list of package names to place first when --display-as-packages is '
           'set.  Unmentioned categories are sorted after these. (deprecated, replaced by package-order)',
       splitCommas: true);
   parser.addMultiOption('package-order',
       help:
-          'A list of category names to place first when --display-as-packages is '
+          'A list of package names to place first when --display-as-packages is '
           'set.  Unmentioned categories are sorted after these.',
       splitCommas: true);
   parser.addFlag('auto-include-dependencies',