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 01/21] 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 02/21] 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 03/21] 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 04/21] 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 05/21] 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 6afc18ba369609a9276f171ce757484996e92e37 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 10:23:20 -0700
Subject: [PATCH 06/21] Intermediate state

---
 lib/src/config.dart          |  33 ++++++++
 lib/src/dartdoc_options.dart | 148 +++++++++++++++++++++++++++++++++++
 lib/src/model.dart           |  75 +++++++++++++++++-
 3 files changed, 255 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/dartdoc_options.dart

diff --git a/lib/src/config.dart b/lib/src/config.dart
index ae08e10796..4e48af1322 100644
--- a/lib/src/config.dart
+++ b/lib/src/config.dart
@@ -6,6 +6,39 @@ library dartdoc.config;
 
 import 'dart:io';
 
+import 'package:analyzer/dart/element/element.dart';
+import 'package:dartdoc/dartdoc.dart';
+import 'package:path/path.dart' as p;
+
+import 'model.dart';
+
+/// Class representing values possibly local to a particular [ModelElement].
+class LocalConfig {
+  final Map<String, Set<String>> categoryMap;
+  final PackageMeta packageMeta;
+
+  LocalConfig._(this.categoryMap, this.packageMeta);
+
+  factory LocalConfig.fromLibrary(LibraryElement element) {
+    return new LocalConfig._({}, getPackageMeta(element));
+  }
+
+  static PackageMeta getPackageMeta(LibraryElement element) {
+    String sourcePath = element.source.fullName;
+    File file = new File(p.canonicalize(sourcePath));
+    Directory dir = file.parent;
+    while (dir.parent.path != dir.path && dir.existsSync()) {
+      File pubspec = new File(p.join(dir.path, 'pubspec.yaml'));
+      if (pubspec.existsSync()) {
+        return new PackageMeta.fromDir(dir);
+      }
+      dir = dir.parent;
+    }
+    return null;
+  }
+
+}
+
 class Config {
   final Directory inputDir;
   final bool showWarnings;
diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
new file mode 100644
index 0000000000..f311f238f2
--- /dev/null
+++ b/lib/src/dartdoc_options.dart
@@ -0,0 +1,148 @@
+// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library dartdoc.dartdoc_options;
+
+import 'dart:io';
+
+import 'package:path/path.dart' as p;
+import 'package:yaml/yaml.dart';
+
+import 'logging.dart';
+
+
+Map<String, DartdocOptions> _dartdocOptionsCache = {};
+
+/// dartdoc_options.yaml handling.
+abstract class DartdocOptions {
+  /// The parent of this DartdocOptions object, or null if there is none.
+  final DartdocOptions parent;
+
+  DartdocOptions(this.parent);
+
+  /// Path to the dartdoc options file, or '<default>' if this object is the
+  /// default setting. Intended for printing only.
+  String get _path;
+
+  /// A map of library name to subcategory name.
+  Map<String, String> get subCategoryMap;
+
+  /// A list indicating the preferred subcategory sorting order.
+  List<String> get subCategoryOrder;
+
+  factory DartdocOptions.fromDir(Directory dir) {
+    if (!_dartdocOptionsCache.containsKey(dir.absolute.path)) {
+      _dartdocOptionsCache[dir.absolute.path] = new DartdocOptions._fromDir(dir);
+    }
+    return _dartdocOptionsCache[dir.absolute.path];
+  }
+
+  /// Search for a dartdoc_options file in this and parent directories.
+  /// Refuses to cross a package boundary (demarcated by pubspec.yaml).
+  factory DartdocOptions._fromDir(Directory dir) {
+    if (!dir.existsSync()) return new _DefaultDartdocOptions();
+
+    File f, pb;
+    dir = dir.absolute;
+
+    while(true) {
+      f = new File(p.join(dir.path, 'dartdoc_options.yaml'));
+      pb = new File(p.join(dir.path, 'pubspec.yaml'));
+      if (f.existsSync() || pb.existsSync() || dir.parent.path == dir.path)
+        break;
+      dir = dir.parent.absolute;
+    }
+
+    DartdocOptions parent;
+    if (dir.parent.path != dir.path && !pb.existsSync()) {
+      parent = new DartdocOptions.fromDir(dir.parent);
+    } else {
+      parent = new _DefaultDartdocOptions();
+    }
+    if (f.existsSync()) {
+      return new _FileDartdocOptions(parent, f);
+    }
+    return parent;
+  }
+}
+
+class _DefaultDartdocOptions extends DartdocOptions {
+  _DefaultDartdocOptions() : super(null);
+
+  @override
+  String get _path => '<default>';
+
+  @override
+  Map<String, String> get subCategoryMap => new Map.unmodifiable({});
+
+  @override
+  List<String> get subCategoryOrder => new List.unmodifiable([]);
+}
+
+class _FileDartdocOptions extends DartdocOptions {
+  File dartdocOptionsFile;
+  Map _dartdocOptions;
+  _FileDartdocOptions(DartdocOptions parent, this.dartdocOptionsFile) : super(parent) {
+    Map allDartdocOptions = loadYaml(dartdocOptionsFile.readAsStringSync());
+    if (allDartdocOptions.containsKey('dartdoc')) {
+      _dartdocOptions = allDartdocOptions['dartdoc'];
+    } else {
+      _dartdocOptions = {};
+      logWarning("${dartdocOptionsFile.path}: must contain 'dartdoc' section");
+    }
+  }
+
+  @override
+  String get _path => dartdocOptionsFile.path;
+
+  List<String> _subCategoryOrder;
+  @override
+  /// subCategoryOrder overrides parents.
+  List<String> get subCategoryOrder {
+    if (_subCategoryOrder == null) {
+      _subCategoryOrder = [];
+      if (_dartdocOptions.containsKey('subCategoryOrder')) {
+        if (_dartdocOptions['subCategoryOrder'] is YamlList) {
+          if (parent.subCategoryOrder.isNotEmpty) {
+            logWarning('${dartdocOptionsFile.path}: subCategoryOrder can not override from ${parent._path}');
+          } else {
+            _subCategoryOrder.addAll(_dartdocOptions['subCategoryOrder']);
+          }
+        } else {
+          logWarning("${dartdocOptionsFile.path}: subCategoryOrder must be a list (ignoring)");
+          _subCategoryOrder = parent.subCategoryOrder;
+        }
+      } else {
+        _subCategoryOrder = parent.subCategoryOrder;
+      }
+      _subCategoryOrder = new List.unmodifiable(_subCategoryOrder);
+    }
+    return _subCategoryOrder;
+  }
+
+  List<String> _allSubCategories;
+  List<String> allSubCategories;
+  Map<String, String> _subCategoryMap;
+  @override
+  /// subCategoryMap adds to parents.
+  Map<String, String> get subCategoryMap {
+    if (_subCategoryMap == null) {
+      _subCategoryMap = new Map();
+      if (parent != null) _subCategoryMap.addAll(parent.subCategoryMap);
+      if (_dartdocOptions.containsKey('subcategories')) {
+        for (String key in _dartdocOptions['subcategories'].keys()) {
+          if (_dartdocOptions['subcategories'][key] is YamlList) {
+            for (var value in _dartdocOptions['subcategories'][key]) {
+              _subCategoryMap[value] = key;
+            }
+          } else {
+            logWarning('${dartdocOptionsFile.path}: subcategory "$key" must be a list (ignoring)');
+          }
+        }
+      }
+      _subCategoryMap = new Map.unmodifiable(_subCategoryMap);
+    }
+    return _subCategoryMap;
+  }
+}
\ No newline at end of file
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 9be0f9b5f5..61c18991bd 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -36,6 +36,7 @@ import 'package:analyzer/src/dart/element/member.dart'
     show ExecutableMember, Member, ParameterMember;
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:collection/collection.dart';
+import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/io_utils.dart';
 import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/base/performance_logger.dart';
@@ -1760,6 +1761,7 @@ class Library extends ModelElement {
         .toList(growable: false);
   }
 
+
   SdkLibrary get sdkLib {
     if (packageGraph.sdkLibrarySources.containsKey(element.librarySource)) {
       return packageGraph.sdkLibrarySources[element.librarySource];
@@ -4482,17 +4484,88 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
   }
 }
 
+class SubCategory implements Comparable<SubCategory> {
+  Package package;
+  final String name;
+  final List<Library> libraries;
+
+  SubCategory(this.name, this.package, this.libraries) {}
+
+  static List<SubCategory> buildSubCategories(Package package) {
+    Map<String, List<Library>> libraryLists;
+    for (Library lib in package.libraries) {
+
+    }
+  }
+
+
+  Iterable<Library> get publicLibraries => filterNonPublic(libraries);
+}
+
 class Package implements Comparable<Package> {
   final String name;
+
+  // Initialized by [PackageGraph.PackageGraph].
   final List<Library> _libraries = [];
   PackageGraph packageGraph;
 
   Package(this.name, this.packageGraph);
 
+
+  DartdocOptions _dartdocOptions;
+  DartdocOptions get dartdocOptions {
+    if (_dartdocOptions == null) {
+      _dartdocOptions = new DartdocOptions.fromDir(new Directory(packagePath));
+    }
+    return _dartdocOptions;
+  }
+
+  bool get isSdk => packageMeta.isSdk;
+
+  String _packagePath;
+  String get packagePath {
+    if (_packagePath == null) {
+      if (isSdk) {
+        _packagePath = packageMeta.resolvedDir;
+      } else {
+        assert(_libraries.isNotEmpty);
+        File file = new File(p.canonicalize(_libraries.first.element.source.fullName));
+        Directory dir = file.parent;
+        while (dir.parent.path != dir.path && dir.existsSync()) {
+          File pubspec = new File(p.join(dir.path, 'pubspec.yaml'));
+          if (pubspec.existsSync()) {
+            _packagePath = dir.absolute.path;
+            break;
+          }
+          dir = dir.parent;
+        }
+      }
+    }
+    return _packagePath;
+  }
+
   List<Library> get libraries => _libraries;
 
   Iterable<Library> get publicLibraries => filterNonPublic(libraries);
 
+  PackageMeta _packageMeta;
+  // TODO(jcollins-g): packageMeta should be passed in with the object rather
+  // than calculated indirectly from libraries.
+  PackageMeta get packageMeta {
+    if (_packageMeta == null) {
+      _packageMeta = _libraries.first.packageMeta;
+    }
+    return _packageMeta;
+  }
+
+  List<SubCategory> _subCategories;
+  List<SubCategory> get subCategories {
+    if (_subCategories == null) {
+
+    }
+    return _subCategories;
+  }
+
   @override
   String toString() => name;
 
@@ -4905,7 +4978,7 @@ class TypeParameter extends ModelElement {
   String toString() => element.name;
 }
 
-/// Everything you need to instantiate a Package object for documenting.
+/// Everything you need to instantiate a PackageGraph object for documenting.
 class PackageBuilder {
   final bool autoIncludeDependencies;
   final List<String> excludes;

From 3ee7464284289acb92849d355a61b7829db2327e Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 15 Mar 2018 15:03:03 -0700
Subject: [PATCH 07/21] basic dartdoc options now working

---
 lib/src/dartdoc_options.dart   | 65 ++++++------------------
 lib/src/model.dart             | 30 +-----------
 test/dartdoc_options_test.dart | 90 ++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 78 deletions(-)
 create mode 100644 test/dartdoc_options_test.dart

diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index f311f238f2..e55a93b22a 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -25,11 +25,8 @@ abstract class DartdocOptions {
   /// default setting. Intended for printing only.
   String get _path;
 
-  /// A map of library name to subcategory name.
-  Map<String, String> get subCategoryMap;
-
   /// A list indicating the preferred subcategory sorting order.
-  List<String> get subCategoryOrder;
+  List<String> get categoryOrder;
 
   factory DartdocOptions.fromDir(Directory dir) {
     if (!_dartdocOptionsCache.containsKey(dir.absolute.path)) {
@@ -74,10 +71,7 @@ class _DefaultDartdocOptions extends DartdocOptions {
   String get _path => '<default>';
 
   @override
-  Map<String, String> get subCategoryMap => new Map.unmodifiable({});
-
-  @override
-  List<String> get subCategoryOrder => new List.unmodifiable([]);
+  List<String> get categoryOrder => new List.unmodifiable([]);
 }
 
 class _FileDartdocOptions extends DartdocOptions {
@@ -96,53 +90,24 @@ class _FileDartdocOptions extends DartdocOptions {
   @override
   String get _path => dartdocOptionsFile.path;
 
-  List<String> _subCategoryOrder;
+  List<String> _categoryOrder;
   @override
-  /// subCategoryOrder overrides parents.
-  List<String> get subCategoryOrder {
-    if (_subCategoryOrder == null) {
-      _subCategoryOrder = [];
-      if (_dartdocOptions.containsKey('subCategoryOrder')) {
-        if (_dartdocOptions['subCategoryOrder'] is YamlList) {
-          if (parent.subCategoryOrder.isNotEmpty) {
-            logWarning('${dartdocOptionsFile.path}: subCategoryOrder can not override from ${parent._path}');
-          } else {
-            _subCategoryOrder.addAll(_dartdocOptions['subCategoryOrder']);
-          }
+  /// categoryOrder overrides parents.
+  List<String> get categoryOrder {
+    if (_categoryOrder == null) {
+      _categoryOrder = [];
+      if (_dartdocOptions.containsKey('categoryOrder')) {
+        if (_dartdocOptions['categoryOrder'] is YamlList) {
+          _categoryOrder.addAll(_dartdocOptions['categoryOrder']);
         } else {
-          logWarning("${dartdocOptionsFile.path}: subCategoryOrder must be a list (ignoring)");
-          _subCategoryOrder = parent.subCategoryOrder;
+          logWarning("${dartdocOptionsFile.path}: categoryOrder must be a list (ignoring)");
+          _categoryOrder = parent.categoryOrder;
         }
       } else {
-        _subCategoryOrder = parent.subCategoryOrder;
-      }
-      _subCategoryOrder = new List.unmodifiable(_subCategoryOrder);
-    }
-    return _subCategoryOrder;
-  }
-
-  List<String> _allSubCategories;
-  List<String> allSubCategories;
-  Map<String, String> _subCategoryMap;
-  @override
-  /// subCategoryMap adds to parents.
-  Map<String, String> get subCategoryMap {
-    if (_subCategoryMap == null) {
-      _subCategoryMap = new Map();
-      if (parent != null) _subCategoryMap.addAll(parent.subCategoryMap);
-      if (_dartdocOptions.containsKey('subcategories')) {
-        for (String key in _dartdocOptions['subcategories'].keys()) {
-          if (_dartdocOptions['subcategories'][key] is YamlList) {
-            for (var value in _dartdocOptions['subcategories'][key]) {
-              _subCategoryMap[value] = key;
-            }
-          } else {
-            logWarning('${dartdocOptionsFile.path}: subcategory "$key" must be a list (ignoring)');
-          }
-        }
+        _categoryOrder = parent.categoryOrder;
       }
-      _subCategoryMap = new Map.unmodifiable(_subCategoryMap);
+      _categoryOrder = new List.unmodifiable(_categoryOrder);
     }
-    return _subCategoryMap;
+    return _categoryOrder;
   }
 }
\ No newline at end of file
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 61c18991bd..e59b0f3da3 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -38,6 +38,7 @@ import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:collection/collection.dart';
 import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/io_utils.dart';
+import 'package:dartdoc/src/sdk.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;
@@ -4484,24 +4485,6 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
   }
 }
 
-class SubCategory implements Comparable<SubCategory> {
-  Package package;
-  final String name;
-  final List<Library> libraries;
-
-  SubCategory(this.name, this.package, this.libraries) {}
-
-  static List<SubCategory> buildSubCategories(Package package) {
-    Map<String, List<Library>> libraryLists;
-    for (Library lib in package.libraries) {
-
-    }
-  }
-
-
-  Iterable<Library> get publicLibraries => filterNonPublic(libraries);
-}
-
 class Package implements Comparable<Package> {
   final String name;
 
@@ -4511,7 +4494,6 @@ class Package implements Comparable<Package> {
 
   Package(this.name, this.packageGraph);
 
-
   DartdocOptions _dartdocOptions;
   DartdocOptions get dartdocOptions {
     if (_dartdocOptions == null) {
@@ -4526,7 +4508,7 @@ class Package implements Comparable<Package> {
   String get packagePath {
     if (_packagePath == null) {
       if (isSdk) {
-        _packagePath = packageMeta.resolvedDir;
+        _packagePath = getSdkDir().path;
       } else {
         assert(_libraries.isNotEmpty);
         File file = new File(p.canonicalize(_libraries.first.element.source.fullName));
@@ -4558,14 +4540,6 @@ class Package implements Comparable<Package> {
     return _packageMeta;
   }
 
-  List<SubCategory> _subCategories;
-  List<SubCategory> get subCategories {
-    if (_subCategories == null) {
-
-    }
-    return _subCategories;
-  }
-
   @override
   String toString() => name;
 
diff --git a/test/dartdoc_options_test.dart b/test/dartdoc_options_test.dart
new file mode 100644
index 0000000000..b725bfcae0
--- /dev/null
+++ b/test/dartdoc_options_test.dart
@@ -0,0 +1,90 @@
+// Copyright (c) 2018, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library dartdoc.options_test;
+
+import 'dart:io';
+
+import 'package:dartdoc/src/dartdoc_options.dart';
+import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
+
+void main() {
+  Directory tempDir;
+  Directory firstDir;
+  Directory firstDirFirstSub;
+  Directory secondDir;
+  Directory secondDirFirstSub;
+  Directory secondDirSecondSub;
+
+  File pubspecYamlOne;
+  File dartdocOptionsOne;
+  File dartdocOptionsTwo;
+  File dartdocOptionsTwoFirstSub;
+
+  setUpAll(() {
+    tempDir = Directory.systemTemp.createTempSync('options_test');
+    firstDir = new Directory(p.join(tempDir.path, 'firstDir'))..createSync();
+    secondDir = new Directory(p.join(tempDir.path, 'secondDir'))..createSync();
+
+    firstDirFirstSub = new Directory(p.join(firstDir.path, 'firstSub'))..createSync();
+    secondDirFirstSub = new Directory(p.join(secondDir.path, 'firstSub'))..createSync();
+    secondDirSecondSub = new Directory(p.join(secondDir.path, 'secondSub'))..createSync();
+
+    dartdocOptionsOne = new File(p.join(firstDir.path, 'dartdoc_options.yaml'));
+    pubspecYamlOne = new File(p.join(firstDirFirstSub.path, 'pubspec.yaml'));
+    dartdocOptionsTwo = new File(p.join(secondDir.path, 'dartdoc_options.yaml'));
+    dartdocOptionsTwoFirstSub = new File(p.join(secondDirFirstSub.path, 'dartdoc_options.yaml'));
+
+    pubspecYamlOne.writeAsStringSync('# Sentinel to block dartdoc options loading');
+    dartdocOptionsOne.writeAsStringSync('''
+dartdoc:
+  categoryOrder: ['options_one']
+        ''');
+    dartdocOptionsTwo.writeAsStringSync('''
+dartdoc:
+  categoryOrder: ['options_two']
+        ''');
+    dartdocOptionsTwoFirstSub.writeAsStringSync('''
+dartdoc:
+  categoryOrder: ['options_two_first_sub']
+    ''');
+  });
+
+  tearDownAll(() {
+    tempDir.deleteSync(recursive: true);
+  });
+
+  group('dartdoc options', () {
+
+    group('options file finding and loading', () {
+      test('DartdocOptions loads defaults', () {
+        DartdocOptions options = new DartdocOptions.fromDir(tempDir);
+        expect(options.categoryOrder, isEmpty);
+      });
+
+      test('DartdocOptions loads defaults if blocked by pubspec.yaml', () {
+        DartdocOptions options = new DartdocOptions.fromDir(firstDirFirstSub);
+        expect(options.categoryOrder, isEmpty);
+      });
+
+      test('DartdocOptions loads a file', () {
+        DartdocOptions options = new DartdocOptions.fromDir(firstDir);
+        expect(options.categoryOrder, orderedEquals(['options_one']));
+      });
+
+      test('DartdocOptions loads a file in parent directories', () {
+        DartdocOptions options = new DartdocOptions.fromDir(secondDirSecondSub);
+        expect(options.categoryOrder, orderedEquals(['options_two']));
+      });
+
+      test('DartdocOptions loads the override file and valid parents', () {
+        DartdocOptions options = new DartdocOptions.fromDir(secondDirFirstSub);
+        expect(options.categoryOrder, orderedEquals(['options_two_first_sub']));
+        expect(options.parent.categoryOrder, orderedEquals(['options_two']));
+        expect(options.parent.parent.categoryOrder, isEmpty);
+      });
+    });
+  });
+}
\ No newline at end of file

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 08/21] 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 09/21] 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 10/21] 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 11/21] 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',

From de913ddeca3fe9319ab54fbce9520b499599a8c8 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Mon, 19 Mar 2018 09:25:54 -0700
Subject: [PATCH 12/21] Remove overly complicated config inheritance; we can
 add it back if we truly need this

---
 lib/src/dartdoc_options.dart   | 36 ++++++++++++++++------------------
 test/dartdoc_options_test.dart | 15 +-------------
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index e55a93b22a..43b460d6e1 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -2,6 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+
+///
+/// dartdoc's dartdoc_options.yaml configuration file follows similar loading
+/// semantics to that of analysis_options.yaml,
+/// [documented here](https://www.dartlang.org/guides/language/analysis-options).
+/// It searches parent directories until it finds an analysis_options.yaml file,
+/// and uses built-in defaults if one is not found.
+///
 library dartdoc.dartdoc_options;
 
 import 'dart:io';
@@ -14,12 +22,8 @@ import 'logging.dart';
 
 Map<String, DartdocOptions> _dartdocOptionsCache = {};
 
-/// dartdoc_options.yaml handling.
 abstract class DartdocOptions {
-  /// The parent of this DartdocOptions object, or null if there is none.
-  final DartdocOptions parent;
-
-  DartdocOptions(this.parent);
+  DartdocOptions();
 
   /// Path to the dartdoc options file, or '<default>' if this object is the
   /// default setting. Intended for printing only.
@@ -36,36 +40,34 @@ abstract class DartdocOptions {
   }
 
   /// Search for a dartdoc_options file in this and parent directories.
-  /// Refuses to cross a package boundary (demarcated by pubspec.yaml).
   factory DartdocOptions._fromDir(Directory dir) {
     if (!dir.existsSync()) return new _DefaultDartdocOptions();
 
-    File f, pb;
+    File f;
     dir = dir.absolute;
 
     while(true) {
       f = new File(p.join(dir.path, 'dartdoc_options.yaml'));
-      pb = new File(p.join(dir.path, 'pubspec.yaml'));
-      if (f.existsSync() || pb.existsSync() || dir.parent.path == dir.path)
+      if (f.existsSync() || dir.parent.path == dir.path)
         break;
       dir = dir.parent.absolute;
     }
 
     DartdocOptions parent;
-    if (dir.parent.path != dir.path && !pb.existsSync()) {
+    if (dir.parent.path != dir.path) {
       parent = new DartdocOptions.fromDir(dir.parent);
     } else {
       parent = new _DefaultDartdocOptions();
     }
     if (f.existsSync()) {
-      return new _FileDartdocOptions(parent, f);
+      return new _FileDartdocOptions(f);
     }
     return parent;
   }
 }
 
 class _DefaultDartdocOptions extends DartdocOptions {
-  _DefaultDartdocOptions() : super(null);
+  _DefaultDartdocOptions() : super();
 
   @override
   String get _path => '<default>';
@@ -77,13 +79,13 @@ class _DefaultDartdocOptions extends DartdocOptions {
 class _FileDartdocOptions extends DartdocOptions {
   File dartdocOptionsFile;
   Map _dartdocOptions;
-  _FileDartdocOptions(DartdocOptions parent, this.dartdocOptionsFile) : super(parent) {
+  _FileDartdocOptions(this.dartdocOptionsFile) : super() {
     Map allDartdocOptions = loadYaml(dartdocOptionsFile.readAsStringSync());
     if (allDartdocOptions.containsKey('dartdoc')) {
       _dartdocOptions = allDartdocOptions['dartdoc'];
     } else {
       _dartdocOptions = {};
-      logWarning("${dartdocOptionsFile.path}: must contain 'dartdoc' section");
+      logWarning("${_path}: must contain 'dartdoc' section");
     }
   }
 
@@ -92,7 +94,6 @@ class _FileDartdocOptions extends DartdocOptions {
 
   List<String> _categoryOrder;
   @override
-  /// categoryOrder overrides parents.
   List<String> get categoryOrder {
     if (_categoryOrder == null) {
       _categoryOrder = [];
@@ -100,11 +101,8 @@ class _FileDartdocOptions extends DartdocOptions {
         if (_dartdocOptions['categoryOrder'] is YamlList) {
           _categoryOrder.addAll(_dartdocOptions['categoryOrder']);
         } else {
-          logWarning("${dartdocOptionsFile.path}: categoryOrder must be a list (ignoring)");
-          _categoryOrder = parent.categoryOrder;
+          logWarning("${_path}: categoryOrder must be a list (ignoring)");
         }
-      } else {
-        _categoryOrder = parent.categoryOrder;
       }
       _categoryOrder = new List.unmodifiable(_categoryOrder);
     }
diff --git a/test/dartdoc_options_test.dart b/test/dartdoc_options_test.dart
index b725bfcae0..c2e3654bac 100644
--- a/test/dartdoc_options_test.dart
+++ b/test/dartdoc_options_test.dart
@@ -13,12 +13,10 @@ import 'package:test/test.dart';
 void main() {
   Directory tempDir;
   Directory firstDir;
-  Directory firstDirFirstSub;
   Directory secondDir;
   Directory secondDirFirstSub;
   Directory secondDirSecondSub;
 
-  File pubspecYamlOne;
   File dartdocOptionsOne;
   File dartdocOptionsTwo;
   File dartdocOptionsTwoFirstSub;
@@ -28,16 +26,13 @@ void main() {
     firstDir = new Directory(p.join(tempDir.path, 'firstDir'))..createSync();
     secondDir = new Directory(p.join(tempDir.path, 'secondDir'))..createSync();
 
-    firstDirFirstSub = new Directory(p.join(firstDir.path, 'firstSub'))..createSync();
     secondDirFirstSub = new Directory(p.join(secondDir.path, 'firstSub'))..createSync();
     secondDirSecondSub = new Directory(p.join(secondDir.path, 'secondSub'))..createSync();
 
     dartdocOptionsOne = new File(p.join(firstDir.path, 'dartdoc_options.yaml'));
-    pubspecYamlOne = new File(p.join(firstDirFirstSub.path, 'pubspec.yaml'));
     dartdocOptionsTwo = new File(p.join(secondDir.path, 'dartdoc_options.yaml'));
     dartdocOptionsTwoFirstSub = new File(p.join(secondDirFirstSub.path, 'dartdoc_options.yaml'));
 
-    pubspecYamlOne.writeAsStringSync('# Sentinel to block dartdoc options loading');
     dartdocOptionsOne.writeAsStringSync('''
 dartdoc:
   categoryOrder: ['options_one']
@@ -57,18 +52,12 @@ dartdoc:
   });
 
   group('dartdoc options', () {
-
     group('options file finding and loading', () {
       test('DartdocOptions loads defaults', () {
         DartdocOptions options = new DartdocOptions.fromDir(tempDir);
         expect(options.categoryOrder, isEmpty);
       });
 
-      test('DartdocOptions loads defaults if blocked by pubspec.yaml', () {
-        DartdocOptions options = new DartdocOptions.fromDir(firstDirFirstSub);
-        expect(options.categoryOrder, isEmpty);
-      });
-
       test('DartdocOptions loads a file', () {
         DartdocOptions options = new DartdocOptions.fromDir(firstDir);
         expect(options.categoryOrder, orderedEquals(['options_one']));
@@ -79,11 +68,9 @@ dartdoc:
         expect(options.categoryOrder, orderedEquals(['options_two']));
       });
 
-      test('DartdocOptions loads the override file and valid parents', () {
+      test('DartdocOptions loads the override file instead of parents', () {
         DartdocOptions options = new DartdocOptions.fromDir(secondDirFirstSub);
         expect(options.categoryOrder, orderedEquals(['options_two_first_sub']));
-        expect(options.parent.categoryOrder, orderedEquals(['options_two']));
-        expect(options.parent.parent.categoryOrder, isEmpty);
       });
     });
   });

From 76013a663f81be77fbe3907be45356535f8f93ac Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Mon, 19 Mar 2018 09:26:17 -0700
Subject: [PATCH 13/21] dartfmt

---
 lib/src/config.dart          |  1 -
 lib/src/dartdoc_options.dart | 12 +++++-------
 lib/src/model.dart           |  4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/lib/src/config.dart b/lib/src/config.dart
index 4e48af1322..f6fd2800e2 100644
--- a/lib/src/config.dart
+++ b/lib/src/config.dart
@@ -36,7 +36,6 @@ class LocalConfig {
     }
     return null;
   }
-
 }
 
 class Config {
diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index 43b460d6e1..9570e20d33 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-
 ///
 /// dartdoc's dartdoc_options.yaml configuration file follows similar loading
 /// semantics to that of analysis_options.yaml,
@@ -19,7 +18,6 @@ import 'package:yaml/yaml.dart';
 
 import 'logging.dart';
 
-
 Map<String, DartdocOptions> _dartdocOptionsCache = {};
 
 abstract class DartdocOptions {
@@ -34,7 +32,8 @@ abstract class DartdocOptions {
 
   factory DartdocOptions.fromDir(Directory dir) {
     if (!_dartdocOptionsCache.containsKey(dir.absolute.path)) {
-      _dartdocOptionsCache[dir.absolute.path] = new DartdocOptions._fromDir(dir);
+      _dartdocOptionsCache[dir.absolute.path] =
+          new DartdocOptions._fromDir(dir);
     }
     return _dartdocOptionsCache[dir.absolute.path];
   }
@@ -46,10 +45,9 @@ abstract class DartdocOptions {
     File f;
     dir = dir.absolute;
 
-    while(true) {
+    while (true) {
       f = new File(p.join(dir.path, 'dartdoc_options.yaml'));
-      if (f.existsSync() || dir.parent.path == dir.path)
-        break;
+      if (f.existsSync() || dir.parent.path == dir.path) break;
       dir = dir.parent.absolute;
     }
 
@@ -108,4 +106,4 @@ class _FileDartdocOptions extends DartdocOptions {
     }
     return _categoryOrder;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 89cc2b5f5b..2ca15fd707 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -1762,7 +1762,6 @@ class Library extends ModelElement {
         .toList(growable: false);
   }
 
-
   SdkLibrary get sdkLib {
     if (packageGraph.sdkLibrarySources.containsKey(element.librarySource)) {
       return packageGraph.sdkLibrarySources[element.librarySource];
@@ -4507,7 +4506,8 @@ class Package implements Comparable<Package> {
         _packagePath = getSdkDir().path;
       } else {
         assert(_libraries.isNotEmpty);
-        File file = new File(p.canonicalize(_libraries.first.element.source.fullName));
+        File file =
+            new File(p.canonicalize(_libraries.first.element.source.fullName));
         Directory dir = file.parent;
         while (dir.parent.path != dir.path && dir.existsSync()) {
           File pubspec = new File(p.join(dir.path, 'pubspec.yaml'));

From 687ea5aab55527af6988dd7740240c364a51924a Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 20 Mar 2018 08:26:06 -0700
Subject: [PATCH 14/21] Unify SDK PackageMeta construction and add cache

---
 bin/dartdoc.dart            | 20 ++++++++++-------
 lib/src/model.dart          |  2 +-
 lib/src/package_meta.dart   | 44 ++++++++++++++++++++-----------------
 test/package_meta_test.dart |  3 ++-
 test/src/utils.dart         |  2 +-
 5 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index 27252db039..ca9bfe5eb7 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -59,7 +59,15 @@ main(List<String> arguments) async {
     exit(1);
   }
 
-  Directory inputDir = new Directory(args['input']);
+  Directory inputDir;
+  if (sdkDocs) {
+    inputDir = sdkDir;
+  } else if (args['input'] == null) {
+    inputDir = Directory.current;
+  } else {
+    inputDir = args['input'];
+  }
+
   if (!inputDir.existsSync()) {
     stderr.writeln(
         " fatal error: unable to locate the input directory at ${inputDir
@@ -188,12 +196,7 @@ main(List<String> arguments) async {
     });
   }
 
-  PackageMeta packageMeta = sdkDocs
-      ? new PackageMeta.fromSdk(sdkDir,
-          sdkReadmePath: readme,
-          displayAsPackages:
-              args['use-categories'] || args['display-as-packages'])
-      : new PackageMeta.fromDir(inputDir);
+  PackageMeta packageMeta = new PackageMeta.fromDir(inputDir);
 
   if (!packageMeta.isValid) {
     final String firstError = packageMeta.getInvalidReasons().first;
@@ -211,6 +214,7 @@ main(List<String> arguments) async {
     }
   }
 
+
   logInfo("Generating documentation for '${packageMeta}' into "
       "${outputDir.absolute.path}${Platform.pathSeparator}");
 
@@ -312,7 +316,7 @@ ArgParser _createArgsParser() {
       help:
           'Path to the SDK description file; use if generating Dart SDK docs.');
   parser.addOption('input',
-      help: 'Path to source directory.', defaultsTo: Directory.current.path);
+      help: 'Path to source directory.');
   parser.addOption('output',
       help: 'Path to output directory.', defaultsTo: defaultOutDir);
   parser.addMultiOption('header',
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 2ca15fd707..b56333233a 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -4203,7 +4203,7 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
   String get name => packageMeta.name;
 
   String get kind =>
-      (packageMeta.displayAsPackages || packageGraph.isSdk) ? '' : 'package';
+      (publicPackages.length > 1 || packageGraph.isSdk) ? '' : 'package';
 
   @override
   String get oneLineDoc => '';
diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart
index e8f2739d72..dca1ef9076 100644
--- a/lib/src/package_meta.dart
+++ b/lib/src/package_meta.dart
@@ -11,17 +11,26 @@ import 'package:yaml/yaml.dart';
 
 import 'logging.dart';
 
+
+Map<String, PackageMeta> _packageMetaCache = {};
+
 abstract class PackageMeta {
   final Directory dir;
-  final bool displayAsPackages;
-
-  PackageMeta(this.dir, {this.displayAsPackages: false});
 
-  factory PackageMeta.fromDir(Directory dir) => new _FilePackageMeta(dir);
-  factory PackageMeta.fromSdk(Directory sdkDir,
-          {String sdkReadmePath, bool displayAsPackages}) =>
-      new _SdkMeta(sdkDir,
-          sdkReadmePath: sdkReadmePath, displayAsPackages: displayAsPackages);
+  PackageMeta(this.dir);
+
+  factory PackageMeta.fromDir(Directory dir) {
+    if (!_packageMetaCache.containsKey(dir.absolute.path)) {
+      PackageMeta packageMeta;
+      if (path.join(dir.absolute.path, 'bin', path.split(Platform.resolvedExecutable).last) == Platform.resolvedExecutable) {
+        packageMeta = new _SdkMeta(dir);
+      } else {
+        packageMeta = new _FilePackageMeta(dir);
+      }
+      _packageMetaCache[dir.absolute.path] = packageMeta;
+    }
+    return _packageMetaCache[dir.absolute.path];
+  }
 
   bool get isSdk;
   bool get needsPubGet => false;
@@ -46,7 +55,7 @@ abstract class PackageMeta {
   FileContents getChangelogContents();
 
   /// Returns true if we are a valid package, valid enough to generate docs.
-  bool get isValid;
+  bool get isValid => getInvalidReasons().isEmpty;
 
   /// Returns a list of reasons this package is invalid, or an
   /// empty list if no reasons found.
@@ -151,8 +160,6 @@ class _FilePackageMeta extends PackageMeta {
     return _changelog;
   }
 
-  @override
-  bool get isValid => getInvalidReasons().isEmpty;
 
   /// Returns a list of reasons this package is invalid, or an
   /// empty list if no reasons found.
@@ -184,10 +191,12 @@ File _locate(Directory dir, List<String> fileNames) {
 }
 
 class _SdkMeta extends PackageMeta {
-  final String sdkReadmePath;
+  String sdkReadmePath;
 
-  _SdkMeta(Directory dir, {this.sdkReadmePath, bool displayAsPackages})
-      : super(dir, displayAsPackages: displayAsPackages);
+  _SdkMeta(Directory dir)
+      : super(dir) {
+    sdkReadmePath = path.join(dir.path, 'lib', 'api_readme.md');
+  }
 
   @override
   bool get isSdk => true;
@@ -211,15 +220,10 @@ class _SdkMeta extends PackageMeta {
 
   @override
   FileContents getReadmeContents() {
-    File f = sdkReadmePath != null
-        ? new File(sdkReadmePath)
-        : new File(path.join(dir.path, 'lib', 'api_readme.md'));
+    File f = new File(path.join(dir.path, 'lib', 'api_readme.md'));
     return f.existsSync() ? new FileContents(f) : null;
   }
 
-  @override
-  bool get isValid => true;
-
   @override
   List<String> getInvalidReasons() => [];
 
diff --git a/test/package_meta_test.dart b/test/package_meta_test.dart
index 91d1d32b84..e89c8a3faf 100644
--- a/test/package_meta_test.dart
+++ b/test/package_meta_test.dart
@@ -76,7 +76,7 @@ void main() {
   });
 
   group('PackageMeta.fromSdk', () {
-    PackageMeta p = new PackageMeta.fromSdk(getSdkDir());
+    PackageMeta p = new PackageMeta.fromDir(getSdkDir());
 
     test('has a name', () {
       expect(p.name, 'Dart SDK');
@@ -85,6 +85,7 @@ void main() {
     test('is valid', () {
       expect(p.isValid, isTrue);
       expect(p.getInvalidReasons(), isEmpty);
+      expect(p.isSdk, isTrue);
     });
 
     test('has a version', () {
diff --git a/test/src/utils.dart b/test/src/utils.dart
index c8710c0336..0906309925 100644
--- a/test/src/utils.dart
+++ b/test/src/utils.dart
@@ -34,7 +34,7 @@ void delete(Directory dir) {
 
 init() async {
   sdkDir = getSdkDir();
-  sdkPackageMeta = new PackageMeta.fromSdk(sdkDir);
+  sdkPackageMeta = new PackageMeta.fromDir(sdkDir);
   setConfig();
 
   testPackageGraph = await bootBasicPackage(

From 9d0d8c530294b6f2085efcf2f93fa2724791d537 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 20 Mar 2018 08:43:23 -0700
Subject: [PATCH 15/21] update test package docs

---
 .../anonymous_library/anonymous_library-library.html            | 2 +-
 .../another_anonymous_lib/another_anonymous_lib-library.html    | 2 +-
 .../code_in_comments/code_in_comments-library.html              | 2 +-
 testing/test_package_docs/css/css-library.html                  | 2 +-
 testing/test_package_docs/ex/ex-library.html                    | 2 +-
 testing/test_package_docs/fake/fake-library.html                | 2 +-
 testing/test_package_docs/index.html                            | 2 +-
 .../test_package_docs/is_deprecated/is_deprecated-library.html  | 2 +-
 .../test_package_docs/reexport_one/reexport_one-library.html    | 2 +-
 .../test_package_docs/reexport_two/reexport_two-library.html    | 2 +-
 .../test_package_imported.main-library.html                     | 2 +-
 testing/test_package_docs/two_exports/two_exports-library.html  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testing/test_package_docs/anonymous_library/anonymous_library-library.html b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
index 59b480c118..8bebd2ac43 100644
--- a/testing/test_package_docs/anonymous_library/anonymous_library-library.html
+++ b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
index 91bad1cf90..7533406876 100644
--- a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
+++ b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/code_in_comments/code_in_comments-library.html b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
index 76149fcc30..1c9e4b23e5 100644
--- a/testing/test_package_docs/code_in_comments/code_in_comments-library.html
+++ b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html
index ca6979a4bd..cbcbb9c5a2 100644
--- a/testing/test_package_docs/css/css-library.html
+++ b/testing/test_package_docs/css/css-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html
index bf9281ecda..0c25055092 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index c238d7c165..b2ff86affb 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html
index e6369486e5..0f27cf07cd 100644
--- a/testing/test_package_docs/index.html
+++ b/testing/test_package_docs/index.html
@@ -32,7 +32,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
 
     <ol>
diff --git a/testing/test_package_docs/is_deprecated/is_deprecated-library.html b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
index aba2db6f0e..710797dfd5 100644
--- a/testing/test_package_docs/is_deprecated/is_deprecated-library.html
+++ b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html
index 7f92858c48..62e8dbe75d 100644
--- a/testing/test_package_docs/reexport_one/reexport_one-library.html
+++ b/testing/test_package_docs/reexport_one/reexport_one-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html
index d31377abc3..9568617743 100644
--- a/testing/test_package_docs/reexport_two/reexport_two-library.html
+++ b/testing/test_package_docs/reexport_two/reexport_two-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
index 9a653576ed..d8cefd8635 100644
--- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
+++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html
index b0b8a0edcc..c0daa76aed 100644
--- a/testing/test_package_docs/two_exports/two_exports-library.html
+++ b/testing/test_package_docs/two_exports/two_exports-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package package</h5>
+    <h5>test_package </h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>

From 216f6d2fba15ff1dca5e27f4cc6af0bd0f6aba1b Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 20 Mar 2018 09:23:40 -0700
Subject: [PATCH 16/21] PackageMeta construction sufficiently robust for
 refactor

---
 bin/dartdoc.dart          |  9 +--------
 lib/src/model.dart        | 11 +----------
 lib/src/package_meta.dart | 22 +++++++++++++++++++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index ca9bfe5eb7..46c78e8692 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -52,13 +52,6 @@ main(List<String> arguments) async {
   final bool sdkDocs = args['sdk-docs'];
   final bool showProgress = args['show-progress'];
 
-  final String readme = args['sdk-readme'];
-  if (readme != null && !(new File(readme).existsSync())) {
-    stderr.writeln(
-        " fatal error: unable to locate the SDK description file at $readme.");
-    exit(1);
-  }
-
   Directory inputDir;
   if (sdkDocs) {
     inputDir = sdkDir;
@@ -314,7 +307,7 @@ ArgParser _createArgsParser() {
       help: 'Display progress indications to console stdout', negatable: false);
   parser.addOption('sdk-readme',
       help:
-          'Path to the SDK description file; use if generating Dart SDK docs.');
+          'Path to the SDK description file.  Deprecated (ignored)');
   parser.addOption('input',
       help: 'Path to source directory.');
   parser.addOption('output',
diff --git a/lib/src/model.dart b/lib/src/model.dart
index b56333233a..6c5841d85a 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -2187,16 +2187,7 @@ class Library extends ModelElement {
 
   static PackageMeta getPackageMeta(LibraryElement element) {
     String sourcePath = element.source.fullName;
-    File file = new File(p.canonicalize(sourcePath));
-    Directory dir = file.parent;
-    while (dir.parent.path != dir.path && dir.existsSync()) {
-      File pubspec = new File(p.join(dir.path, 'pubspec.yaml'));
-      if (pubspec.existsSync()) {
-        return new PackageMeta.fromDir(dir);
-      }
-      dir = dir.parent;
-    }
-    return null;
+    return new PackageMeta.fromDir(new File(p.canonicalize(sourcePath)).parent);
   }
 
   static String getLibraryName(LibraryElement element) {
diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart
index dca1ef9076..fb8a2b6ae3 100644
--- a/lib/src/package_meta.dart
+++ b/lib/src/package_meta.dart
@@ -6,6 +6,7 @@ library dartdoc.package_meta;
 
 import 'dart:io';
 
+import 'package:dartdoc/src/sdk.dart';
 import 'package:path/path.dart' as path;
 import 'package:yaml/yaml.dart';
 
@@ -19,13 +20,28 @@ abstract class PackageMeta {
 
   PackageMeta(this.dir);
 
+  /// This factory is guaranteed to return the same object for any given
+  /// [dir.absolute.path].  Multiple [dir.absolute.path]s will resolve to the
+  /// same object if they are part of the same package.  Returns null
+  /// if the directory is not part of a known package.
   factory PackageMeta.fromDir(Directory dir) {
     if (!_packageMetaCache.containsKey(dir.absolute.path)) {
       PackageMeta packageMeta;
-      if (path.join(dir.absolute.path, 'bin', path.split(Platform.resolvedExecutable).last) == Platform.resolvedExecutable) {
-        packageMeta = new _SdkMeta(dir);
+      // There are pubspec.yaml files inside the SDK.  Ignore them.
+      if (path.isWithin(getSdkDir().absolute.path, dir.absolute.path) || getSdkDir().absolute.path == dir.absolute.path) {
+        packageMeta = new _SdkMeta(getSdkDir());
       } else {
-        packageMeta = new _FilePackageMeta(dir);
+        while (dir.existsSync()) {
+          File pubspec = new File(path.join(dir.path, 'pubspec.yaml'));
+          if (pubspec.existsSync()) {
+            packageMeta = new _FilePackageMeta(dir);
+            break;
+          }
+          // Allow a package to be at root (possible in a Windows setting with
+          // drive letter mappings).
+          if (dir == dir.parent) break;
+          dir = dir.parent;
+        }
       }
       _packageMetaCache[dir.absolute.path] = packageMeta;
     }

From aaba65d1928c501b75a790f9e56ca27425dc7261 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 20 Mar 2018 10:55:14 -0700
Subject: [PATCH 17/21] Fix infinite loop and error messages

---
 bin/dartdoc.dart            |  5 +++++
 lib/src/package_meta.dart   | 10 ++++++----
 test/package_meta_test.dart | 10 ++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index 46c78e8692..67e1ee91c0 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -191,6 +191,11 @@ main(List<String> arguments) async {
 
   PackageMeta packageMeta = new PackageMeta.fromDir(inputDir);
 
+  if (packageMeta == null) {
+    stderr.writeln(' fatal error: Unable to generate documentation: no pubspec.yaml found');
+    exit(1);
+  }
+
   if (!packageMeta.isValid) {
     final String firstError = packageMeta.getInvalidReasons().first;
     stderr.writeln(
diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart
index fb8a2b6ae3..2cfe058193 100644
--- a/lib/src/package_meta.dart
+++ b/lib/src/package_meta.dart
@@ -25,10 +25,12 @@ abstract class PackageMeta {
   /// same object if they are part of the same package.  Returns null
   /// if the directory is not part of a known package.
   factory PackageMeta.fromDir(Directory dir) {
-    if (!_packageMetaCache.containsKey(dir.absolute.path)) {
+    Directory original = dir.absolute;
+    dir = original;
+    if (!_packageMetaCache.containsKey(dir.path)) {
       PackageMeta packageMeta;
       // There are pubspec.yaml files inside the SDK.  Ignore them.
-      if (path.isWithin(getSdkDir().absolute.path, dir.absolute.path) || getSdkDir().absolute.path == dir.absolute.path) {
+      if (path.isWithin(getSdkDir().absolute.path, dir.path) || getSdkDir().path == dir.path) {
         packageMeta = new _SdkMeta(getSdkDir());
       } else {
         while (dir.existsSync()) {
@@ -39,8 +41,8 @@ abstract class PackageMeta {
           }
           // Allow a package to be at root (possible in a Windows setting with
           // drive letter mappings).
-          if (dir == dir.parent) break;
-          dir = dir.parent;
+          if (dir.path == dir.parent.absolute.path) break;
+          dir = dir.parent.absolute;
         }
       }
       _packageMetaCache[dir.absolute.path] = packageMeta;
diff --git a/test/package_meta_test.dart b/test/package_meta_test.dart
index e89c8a3faf..bd26253e1b 100644
--- a/test/package_meta_test.dart
+++ b/test/package_meta_test.dart
@@ -16,18 +16,12 @@ void main() {
     PackageMeta p;
 
     setUp(() {
-      var d = new Directory(
-          path.join(Directory.current.path, 'testing/test_package_not_valid'));
-      if (!d.existsSync()) {
-        throw "$d cannot be found";
-      }
+      var d = Directory.systemTemp.createTempSync('test_package_not_valid');
       p = new PackageMeta.fromDir(d);
     });
 
     test('is not valid', () {
-      expect(p.isValid, isFalse);
-      expect(p.getInvalidReasons(), isNotEmpty);
-      expect(p.getInvalidReasons(), contains('no pubspec.yaml found'));
+      expect(p, isNull);
     });
   });
 

From 58837829c0366beb1d24fc4867687321e145efc2 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 20 Mar 2018 11:16:28 -0700
Subject: [PATCH 18/21] Rename path/p import directive to pathLib everywhere.

---
 bin/dartdoc.dart                          | 10 ++---
 lib/dartdoc.dart                          | 48 ++++++++++----------
 lib/src/config.dart                       |  6 +--
 lib/src/dartdoc_options.dart              |  6 +--
 lib/src/html/html_generator.dart          |  4 +-
 lib/src/html/html_generator_instance.dart | 30 ++++++-------
 lib/src/io_utils.dart                     |  4 +-
 lib/src/model.dart                        | 54 +++++++++++------------
 lib/src/package_meta.dart                 | 14 +++---
 test/compare_output_test.dart             | 26 +++++------
 test/dartdoc_options_test.dart            | 16 +++----
 test/dartdoc_test.dart                    |  6 +--
 test/html_generator_test.dart             |  8 ++--
 test/model_test.dart                      |  6 +--
 test/package_meta_test.dart               |  4 +-
 test/src/utils.dart                       |  4 +-
 test/template_test.dart                   |  4 +-
 tool/grind.dart                           | 52 +++++++++++-----------
 18 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart
index 27252db039..5187c04d0c 100644
--- a/bin/dartdoc.dart
+++ b/bin/dartdoc.dart
@@ -16,7 +16,7 @@ import 'package:args/args.dart';
 import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/logging.dart';
 import 'package:logging/logging.dart' as logging;
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 import 'package:stack_trace/stack_trace.dart';
 
 /// Analyzes Dart files and generates a representation of included libraries,
@@ -112,7 +112,7 @@ main(List<String> arguments) async {
   }
 
   Directory outputDir =
-      new Directory(path.join(Directory.current.path, defaultOutDir));
+      new Directory(pathLib.join(Directory.current.path, defaultOutDir));
   if (args['output'] != null) {
     outputDir = new Directory(_resolveTildePath(args['output']));
   }
@@ -421,10 +421,10 @@ String _resolveTildePath(String originalPath) {
   String homeDir;
 
   if (Platform.isWindows) {
-    homeDir = path.absolute(Platform.environment['USERPROFILE']);
+    homeDir = pathLib.absolute(Platform.environment['USERPROFILE']);
   } else {
-    homeDir = path.absolute(Platform.environment['HOME']);
+    homeDir = pathLib.absolute(Platform.environment['HOME']);
   }
 
-  return path.join(homeDir, originalPath.substring(2));
+  return pathLib.join(homeDir, originalPath.substring(2));
 }
diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index 1d1c0f7db9..6c169c6401 100644
--- a/lib/dartdoc.dart
+++ b/lib/dartdoc.dart
@@ -16,7 +16,7 @@ import 'package:analyzer/src/generated/source.dart';
 import 'package:dartdoc/src/utils.dart';
 import 'package:html/dom.dart' show Element, Document;
 import 'package:html/parser.dart' show parse;
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 
 import 'package:tuple/tuple.dart';
 import 'src/config.dart';
@@ -38,7 +38,7 @@ const String name = 'dartdoc';
 // Update when pubspec version changes.
 const String version = '0.17.1+1';
 
-final String defaultOutDir = path.join('doc', 'api');
+final String defaultOutDir = pathLib.join('doc', 'api');
 
 /// Initialize and setup the generators.
 Future<List<Generator>> initGenerators(String url, String relCanonicalPrefix,
@@ -169,7 +169,7 @@ class DartDoc extends PackageBuilder {
 
     for (var generator in generators) {
       await generator.generate(packageGraph, outputDir.path);
-      writtenFiles.addAll(generator.writtenFiles.map(path.normalize));
+      writtenFiles.addAll(generator.writtenFiles.map(pathLib.normalize));
     }
     if (config.validateLinks) validateLinks(packageGraph, outputDir.path);
     int warnings = packageGraph.packageWarningCounter.warningCount;
@@ -209,12 +209,12 @@ class DartDoc extends PackageBuilder {
     Set<Warnable> warnOnElements;
 
     // Make all paths relative to origin.
-    if (path.isWithin(origin, warnOn)) {
-      warnOn = path.relative(warnOn, from: origin);
+    if (pathLib.isWithin(origin, warnOn)) {
+      warnOn = pathLib.relative(warnOn, from: origin);
     }
     if (referredFrom != null) {
-      if (path.isWithin(origin, referredFrom)) {
-        referredFrom = path.relative(referredFrom, from: origin);
+      if (pathLib.isWithin(origin, referredFrom)) {
+        referredFrom = pathLib.relative(referredFrom, from: origin);
       }
       // Source paths are always relative.
       if (_hrefs[referredFrom] != null) {
@@ -245,13 +245,13 @@ class DartDoc extends PackageBuilder {
 
   void _doOrphanCheck(
       PackageGraph packageGraph, String origin, Set<String> visited) {
-    String normalOrigin = path.normalize(origin);
-    String staticAssets = path.joinAll([normalOrigin, 'static-assets', '']);
-    String indexJson = path.joinAll([normalOrigin, 'index.json']);
+    String normalOrigin = pathLib.normalize(origin);
+    String staticAssets = pathLib.joinAll([normalOrigin, 'static-assets', '']);
+    String indexJson = pathLib.joinAll([normalOrigin, 'index.json']);
     bool foundIndexJson = false;
     for (FileSystemEntity f
         in new Directory(normalOrigin).listSync(recursive: true)) {
-      var fullPath = path.normalize(f.path);
+      var fullPath = pathLib.normalize(f.path);
       if (f is Directory) {
         continue;
       }
@@ -304,8 +304,8 @@ class DartDoc extends PackageBuilder {
 
   void _doSearchIndexCheck(
       PackageGraph packageGraph, String origin, Set<String> visited) {
-    String fullPath = path.joinAll([origin, 'index.json']);
-    String indexPath = path.joinAll([origin, 'index.html']);
+    String fullPath = pathLib.joinAll([origin, 'index.json']);
+    String indexPath = pathLib.joinAll([origin, 'index.html']);
     File file = new File("$fullPath");
     if (!file.existsSync()) {
       return null;
@@ -320,10 +320,10 @@ class DartDoc extends PackageBuilder {
     found.add(indexPath);
     for (Map<String, String> entry in jsonData) {
       if (entry.containsKey('href')) {
-        String entryPath = path.joinAll([origin, entry['href']]);
+        String entryPath = pathLib.joinAll([origin, entry['href']]);
         if (!visited.contains(entryPath)) {
           _warn(packageGraph, PackageWarning.brokenLink, entryPath,
-              path.normalize(origin),
+              pathLib.normalize(origin),
               referredFrom: fullPath);
         }
         found.add(entryPath);
@@ -333,7 +333,7 @@ class DartDoc extends PackageBuilder {
     Set<String> missing_from_search = visited.difference(found);
     for (String s in missing_from_search) {
       _warn(packageGraph, PackageWarning.missingFromSearchIndex, s,
-          path.normalize(origin),
+          pathLib.normalize(origin),
           referredFrom: fullPath);
     }
   }
@@ -342,14 +342,14 @@ class DartDoc extends PackageBuilder {
       String pathToCheck,
       [String source, String fullPath]) {
     if (fullPath == null) {
-      fullPath = path.joinAll([origin, pathToCheck]);
-      fullPath = path.normalize(fullPath);
+      fullPath = pathLib.joinAll([origin, pathToCheck]);
+      fullPath = pathLib.normalize(fullPath);
     }
 
     Tuple2 stringLinksAndHref = _getStringLinksAndHref(fullPath);
     if (stringLinksAndHref == null) {
       _warn(packageGraph, PackageWarning.brokenLink, pathToCheck,
-          path.normalize(origin),
+          pathLib.normalize(origin),
           referredFrom: source);
       _onCheckProgress.add(pathToCheck);
       // Remove so that we properly count that the file doesn't exist for
@@ -376,13 +376,13 @@ class DartDoc extends PackageBuilder {
       if (uri == null || !uri.hasAuthority && !uri.hasFragment) {
         var full;
         if (baseHref != null) {
-          full = '${path.dirname(pathToCheck)}/$baseHref/$href';
+          full = '${pathLib.dirname(pathToCheck)}/$baseHref/$href';
         } else {
-          full = '${path.dirname(pathToCheck)}/$href';
+          full = '${pathLib.dirname(pathToCheck)}/$href';
         }
-        var newPathToCheck = path.normalize(full);
-        String newFullPath = path.joinAll([origin, newPathToCheck]);
-        newFullPath = path.normalize(newFullPath);
+        var newPathToCheck = pathLib.normalize(full);
+        String newFullPath = pathLib.joinAll([origin, newPathToCheck]);
+        newFullPath = pathLib.normalize(newFullPath);
         if (!visited.contains(newFullPath)) {
           toVisit.add(new Tuple2(newPathToCheck, newFullPath));
           visited.add(newFullPath);
diff --git a/lib/src/config.dart b/lib/src/config.dart
index f6fd2800e2..03b752e8f6 100644
--- a/lib/src/config.dart
+++ b/lib/src/config.dart
@@ -8,7 +8,7 @@ import 'dart:io';
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/dartdoc.dart';
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as pathLib;
 
 import 'model.dart';
 
@@ -25,10 +25,10 @@ class LocalConfig {
 
   static PackageMeta getPackageMeta(LibraryElement element) {
     String sourcePath = element.source.fullName;
-    File file = new File(p.canonicalize(sourcePath));
+    File file = new File(pathLib.canonicalize(sourcePath));
     Directory dir = file.parent;
     while (dir.parent.path != dir.path && dir.existsSync()) {
-      File pubspec = new File(p.join(dir.path, 'pubspec.yaml'));
+      File pubspec = new File(pathLib.join(dir.path, 'pubspec.yaml'));
       if (pubspec.existsSync()) {
         return new PackageMeta.fromDir(dir);
       }
diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index 9570e20d33..95d8108d9b 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -13,12 +13,12 @@ library dartdoc.dartdoc_options;
 
 import 'dart:io';
 
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as pathLib;
 import 'package:yaml/yaml.dart';
 
 import 'logging.dart';
 
-Map<String, DartdocOptions> _dartdocOptionsCache = {};
+final Map<String, DartdocOptions> _dartdocOptionsCache = {};
 
 abstract class DartdocOptions {
   DartdocOptions();
@@ -46,7 +46,7 @@ abstract class DartdocOptions {
     dir = dir.absolute;
 
     while (true) {
-      f = new File(p.join(dir.path, 'dartdoc_options.yaml'));
+      f = new File(pathLib.join(dir.path, 'dartdoc_options.yaml'));
       if (f.existsSync() || dir.parent.path == dir.path) break;
       dir = dir.parent.absolute;
     }
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index d8916ffa9b..012eda0539 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -7,7 +7,7 @@ library dartdoc.html_generator;
 import 'dart:async' show Future, StreamController, Stream;
 import 'dart:io' show File;
 
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as pathLib;
 
 import '../generator.dart';
 import '../model.dart';
@@ -82,7 +82,7 @@ class HtmlGenerator extends Generator {
       // docs somehow.  Check data.self.isCanonical and callers for bugs.
       assert(allowOverwrite || !writtenFiles.contains(filePath));
 
-      var file = new File(p.join(outputDirectoryPath, filePath));
+      var file = new File(pathLib.join(outputDirectoryPath, filePath));
       var parent = file.parent;
       if (!parent.existsSync()) {
         parent.createSync(recursive: true);
diff --git a/lib/src/html/html_generator_instance.dart b/lib/src/html/html_generator_instance.dart
index 80b87c6cf0..02b3a1a528 100644
--- a/lib/src/html/html_generator_instance.dart
+++ b/lib/src/html/html_generator_instance.dart
@@ -8,7 +8,7 @@ import 'dart:io' show File;
 
 import 'package:collection/collection.dart' show compareNatural;
 import 'package:dartdoc/src/model_utils.dart';
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 
 import '../logging.dart';
 import '../model.dart';
@@ -41,7 +41,7 @@ class HtmlGeneratorInstance {
     if (_options.faviconPath != null) {
       var bytes = new File(_options.faviconPath).readAsBytesSync();
       // Allow overwrite of favicon.
-      _writer(path.join('static-assets', 'favicon.png'), bytes,
+      _writer(pathLib.join('static-assets', 'favicon.png'), bytes,
           allowOverwrite: true);
     }
   }
@@ -81,7 +81,7 @@ class HtmlGeneratorInstance {
     });
 
     String json = encoder.convert(indexItems);
-    _writer(path.join('index.json'), '${json}\n');
+    _writer(pathLib.join('index.json'), '${json}\n');
   }
 
   void _generateDocs() {
@@ -177,14 +177,14 @@ class HtmlGeneratorInstance {
     }
     TemplateData data = new LibraryTemplateData(_options, packageGraph, lib);
 
-    _build(path.join(lib.dirName, '${lib.fileName}'),
+    _build(pathLib.join(lib.dirName, '${lib.fileName}'),
         _templates.libraryTemplate, data);
   }
 
   void generateClass(PackageGraph packageGraph, Library lib, Class clazz) {
     TemplateData data =
         new ClassTemplateData(_options, packageGraph, lib, clazz);
-    _build(path.joinAll(clazz.href.split('/')), _templates.classTemplate, data);
+    _build(pathLib.joinAll(clazz.href.split('/')), _templates.classTemplate, data);
   }
 
   void generateConstructor(PackageGraph packageGraph, Library lib, Class clazz,
@@ -192,14 +192,14 @@ class HtmlGeneratorInstance {
     TemplateData data = new ConstructorTemplateData(
         _options, packageGraph, lib, clazz, constructor);
 
-    _build(path.joinAll(constructor.href.split('/')),
+    _build(pathLib.joinAll(constructor.href.split('/')),
         _templates.constructorTemplate, data);
   }
 
   void generateEnum(PackageGraph packageGraph, Library lib, Enum eNum) {
     TemplateData data = new EnumTemplateData(_options, packageGraph, lib, eNum);
 
-    _build(path.joinAll(eNum.href.split('/')), _templates.enumTemplate, data);
+    _build(pathLib.joinAll(eNum.href.split('/')), _templates.enumTemplate, data);
   }
 
   void generateFunction(
@@ -207,7 +207,7 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new FunctionTemplateData(_options, packageGraph, lib, function);
 
-    _build(path.joinAll(function.href.split('/')), _templates.functionTemplate,
+    _build(pathLib.joinAll(function.href.split('/')), _templates.functionTemplate,
         data);
   }
 
@@ -217,7 +217,7 @@ class HtmlGeneratorInstance {
         new MethodTemplateData(_options, packageGraph, lib, clazz, method);
 
     _build(
-        path.joinAll(method.href.split('/')), _templates.methodTemplate, data);
+        pathLib.joinAll(method.href.split('/')), _templates.methodTemplate, data);
   }
 
   void generateConstant(
@@ -225,7 +225,7 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new ConstantTemplateData(_options, packageGraph, lib, clazz, property);
 
-    _build(path.joinAll(property.href.split('/')), _templates.constantTemplate,
+    _build(pathLib.joinAll(property.href.split('/')), _templates.constantTemplate,
         data);
   }
 
@@ -234,7 +234,7 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new PropertyTemplateData(_options, packageGraph, lib, clazz, property);
 
-    _build(path.joinAll(property.href.split('/')), _templates.propertyTemplate,
+    _build(pathLib.joinAll(property.href.split('/')), _templates.propertyTemplate,
         data);
   }
 
@@ -243,7 +243,7 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new TopLevelPropertyTemplateData(_options, packageGraph, lib, property);
 
-    _build(path.joinAll(property.href.split('/')),
+    _build(pathLib.joinAll(property.href.split('/')),
         _templates.topLevelPropertyTemplate, data);
   }
 
@@ -252,7 +252,7 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new TopLevelConstTemplateData(_options, packageGraph, lib, property);
 
-    _build(path.joinAll(property.href.split('/')),
+    _build(pathLib.joinAll(property.href.split('/')),
         _templates.topLevelConstantTemplate, data);
   }
 
@@ -261,7 +261,7 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new TypedefTemplateData(_options, packageGraph, lib, typeDef);
 
-    _build(path.joinAll(typeDef.href.split('/')), _templates.typeDefTemplate,
+    _build(pathLib.joinAll(typeDef.href.split('/')), _templates.typeDefTemplate,
         data);
   }
 
@@ -274,7 +274,7 @@ class HtmlGeneratorInstance {
             'encountered $resourcePath');
       }
       String destFileName = resourcePath.substring(prefix.length);
-      _writer(path.join('static-assets', destFileName),
+      _writer(pathLib.join('static-assets', destFileName),
           await loader.loadAsBytes(resourcePath));
     }
   }
diff --git a/lib/src/io_utils.dart b/lib/src/io_utils.dart
index f99a69df22..5e9855658c 100644
--- a/lib/src/io_utils.dart
+++ b/lib/src/io_utils.dart
@@ -9,7 +9,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 
 /// Lists the contents of [dir].
 ///
@@ -36,7 +36,7 @@ Iterable<String> _doList(String dir, Set<String> listedDirectories,
 
     for (var entity in listDir(new Directory(dir))) {
       // Skip hidden files and directories
-      if (path.basename(entity.path).startsWith('.')) {
+      if (pathLib.basename(entity.path).startsWith('.')) {
         continue;
       }
 
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 2ca15fd707..92e972b2dc 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -41,7 +41,7 @@ import 'package:dartdoc/src/io_utils.dart';
 import 'package:dartdoc/src/sdk.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:path/path.dart' as pathLib;
 import 'package:tuple/tuple.dart';
 import 'package:package_config/discovery.dart' as package_config;
 
@@ -61,7 +61,7 @@ Map<String, Map<String, List<Map<String, dynamic>>>> get _crossdartJson {
   if (__crossdartJson == null) {
     if (config != null) {
       var crossdartFile =
-          new File(p.join(config.inputDir.path, "crossdart.json"));
+          new File(pathLib.join(config.inputDir.path, "crossdart.json"));
       if (crossdartFile.existsSync()) {
         __crossdartJson = json.decode(crossdartFile.readAsStringSync())
             as Map<String, Map<String, List<Map<String, dynamic>>>>;
@@ -2161,12 +2161,12 @@ class Library extends ModelElement {
     if (name.startsWith('file:')) {
       // restoreUri doesn't do anything for the package we're documenting.
       String canonicalPackagePath =
-          '${p.canonicalize(defaultPackage.dir.path)}${p.separator}lib${p.separator}';
+          '${pathLib.canonicalize(defaultPackage.dir.path)}${pathLib.separator}lib${pathLib.separator}';
       String canonicalElementPath =
-          p.canonicalize(element.source.uri.toFilePath());
+          pathLib.canonicalize(element.source.uri.toFilePath());
       assert(canonicalElementPath.startsWith(canonicalPackagePath));
       List<String> pathSegments = [defaultPackage.name]..addAll(
-          p.split(canonicalElementPath.replaceFirst(canonicalPackagePath, '')));
+          pathLib.split(canonicalElementPath.replaceFirst(canonicalPackagePath, '')));
       Uri libraryUri = new Uri(
         scheme: 'package',
         pathSegments: pathSegments,
@@ -2187,10 +2187,10 @@ class Library extends ModelElement {
 
   static PackageMeta getPackageMeta(LibraryElement element) {
     String sourcePath = element.source.fullName;
-    File file = new File(p.canonicalize(sourcePath));
+    File file = new File(pathLib.canonicalize(sourcePath));
     Directory dir = file.parent;
     while (dir.parent.path != dir.path && dir.existsSync()) {
-      File pubspec = new File(p.join(dir.path, 'pubspec.yaml'));
+      File pubspec = new File(pathLib.join(dir.path, 'pubspec.yaml'));
       if (pubspec.existsSync()) {
         return new PackageMeta.fromDir(dir);
       }
@@ -2974,9 +2974,9 @@ abstract class ModelElement extends Canonicalization
   String get elementLocation {
     // Call nothing from here that can emit warnings or you'll cause stack overflows.
     if (lineAndColumn != null) {
-      return "(${p.toUri(sourceFileName)}:${lineAndColumn.item1}:${lineAndColumn.item2})";
+      return "(${pathLib.toUri(sourceFileName)}:${lineAndColumn.item1}:${lineAndColumn.item2})";
     }
-    return "(${p.toUri(sourceFileName)})";
+    return "(${pathLib.toUri(sourceFileName)})";
   }
 
   /// Returns a link to extended documentation, or the empty string if that
@@ -3464,11 +3464,11 @@ abstract class ModelElement extends Canonicalization
     RegExp exampleRE = new RegExp(r'{@example\s+([^}]+)}');
     return rawdocs.replaceAllMapped(exampleRE, (match) {
       var args = _getExampleArgs(match[1]);
-      var lang = args['lang'] ?? p.extension(args['src']).replaceFirst('.', '');
+      var lang = args['lang'] ?? pathLib.extension(args['src']).replaceFirst('.', '');
 
       var replacement = match[0]; // default to fully matched string.
 
-      var fragmentFile = new File(p.join(dirPath, args['file']));
+      var fragmentFile = new File(pathLib.join(dirPath, args['file']));
       if (fragmentFile.existsSync()) {
         replacement = fragmentFile.readAsStringSync();
         if (!lang.isEmpty) {
@@ -3568,14 +3568,14 @@ abstract class ModelElement extends Canonicalization
     var file = src + fragExtension;
     var region = args['region'] ?? '';
     if (!region.isEmpty) {
-      var dir = p.dirname(src);
-      var basename = p.basenameWithoutExtension(src);
-      var ext = p.extension(src);
-      file = p.join(dir, '$basename-$region$ext$fragExtension');
+      var dir = pathLib.dirname(src);
+      var basename = pathLib.basenameWithoutExtension(src);
+      var ext = pathLib.extension(src);
+      file = pathLib.join(dir, '$basename-$region$ext$fragExtension');
     }
     args['file'] = config?.examplePathPrefix == null
         ? file
-        : p.join(config.examplePathPrefix, file);
+        : pathLib.join(config.examplePathPrefix, file);
     return args;
   }
 }
@@ -4507,10 +4507,10 @@ class Package implements Comparable<Package> {
       } else {
         assert(_libraries.isNotEmpty);
         File file =
-            new File(p.canonicalize(_libraries.first.element.source.fullName));
+            new File(pathLib.canonicalize(_libraries.first.element.source.fullName));
         Directory dir = file.parent;
         while (dir.parent.path != dir.path && dir.existsSync()) {
-          File pubspec = new File(p.join(dir.path, 'pubspec.yaml'));
+          File pubspec = new File(pathLib.join(dir.path, 'pubspec.yaml'));
           if (pubspec.existsSync()) {
             _packagePath = dir.absolute.path;
             break;
@@ -5171,25 +5171,25 @@ class PackageBuilder {
   /// library files in the "lib" directory to document.
   Iterable<String> findFilesToDocumentInPackage(
       String basePackageDir, bool autoIncludeDependencies) sync* {
-    final String sep = p.separator;
+    final String sep = pathLib.separator;
 
     Set<String> packageDirs = new Set()..add(basePackageDir);
 
     if (autoIncludeDependencies) {
       Map<String, Uri> info = package_config
           .findPackagesFromFile(
-              new Uri.file(p.join(basePackageDir, 'pubspec.yaml')))
+              new Uri.file(pathLib.join(basePackageDir, 'pubspec.yaml')))
           .asMap();
       for (String packageName in info.keys) {
         if (!excludes.contains(packageName)) {
-          packageDirs.add(p.dirname(info[packageName].toFilePath()));
+          packageDirs.add(pathLib.dirname(info[packageName].toFilePath()));
         }
       }
     }
 
     for (String packageDir in packageDirs) {
-      var packageLibDir = p.join(packageDir, 'lib');
-      var packageLibSrcDir = p.join(packageLibDir, 'src');
+      var packageLibDir = pathLib.join(packageDir, 'lib');
+      var packageLibSrcDir = pathLib.join(packageLibDir, 'src');
       // To avoid analyzing package files twice, only files with paths not
       // containing '/packages' will be added. The only exception is if the file
       // to analyze already has a '/package' in its path.
@@ -5199,8 +5199,8 @@ class PackageBuilder {
             (!lib.contains('${sep}packages${sep}') ||
                 packageDir.contains('${sep}packages${sep}'))) {
           // Only include libraries within the lib dir that are not in lib/src
-          if (p.isWithin(packageLibDir, lib) &&
-              !p.isWithin(packageLibSrcDir, lib)) {
+          if (pathLib.isWithin(packageLibDir, lib) &&
+              !pathLib.isWithin(packageLibSrcDir, lib)) {
             // Only add the file if it does not contain 'part of'
             var contents = new File(lib).readAsStringSync();
 
@@ -5265,11 +5265,11 @@ class PackageBuilder {
     var entities = dir.listSync();
 
     var pubspec = entities.firstWhere(
-        (e) => e is File && p.basename(e.path) == 'pubspec.yaml',
+        (e) => e is File && pathLib.basename(e.path) == 'pubspec.yaml',
         orElse: () => null);
 
     var libDir = entities.firstWhere(
-        (e) => e is Directory && p.basename(e.path) == 'lib',
+        (e) => e is Directory && pathLib.basename(e.path) == 'lib',
         orElse: () => null);
 
     if (pubspec != null && libDir != null) {
diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart
index e8f2739d72..46e8bd8649 100644
--- a/lib/src/package_meta.dart
+++ b/lib/src/package_meta.dart
@@ -6,7 +6,7 @@ library dartdoc.package_meta;
 
 import 'dart:io';
 
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 import 'package:yaml/yaml.dart';
 
 import 'logging.dart';
@@ -81,7 +81,7 @@ class _FilePackageMeta extends PackageMeta {
   Map _pubspec;
 
   _FilePackageMeta(Directory dir) : super(dir) {
-    File f = new File(path.join(dir.path, 'pubspec.yaml'));
+    File f = new File(pathLib.join(dir.path, 'pubspec.yaml'));
     if (f.existsSync()) {
       _pubspec = loadYaml(f.readAsStringSync());
     } else {
@@ -94,12 +94,12 @@ class _FilePackageMeta extends PackageMeta {
 
   @override
   bool get needsPubGet =>
-      !(new File(path.join(dir.path, '.packages')).existsSync());
+      !(new File(pathLib.join(dir.path, '.packages')).existsSync());
 
   @override
   void runPubGet() {
     String pubPath =
-        path.join(path.dirname(Platform.resolvedExecutable), 'pub');
+        pathLib.join(pathLib.dirname(Platform.resolvedExecutable), 'pub');
     if (Platform.isWindows) pubPath += '.bat';
 
     ProcessResult result =
@@ -174,7 +174,7 @@ File _locate(Directory dir, List<String> fileNames) {
 
   for (String name in fileNames) {
     for (File f in files) {
-      String baseName = path.basename(f.path).toLowerCase();
+      String baseName = pathLib.basename(f.path).toLowerCase();
       if (baseName == name) return f;
       if (baseName.startsWith(name)) return f;
     }
@@ -201,7 +201,7 @@ class _SdkMeta extends PackageMeta {
   String get name => 'Dart SDK';
   @override
   String get version =>
-      new File(path.join(dir.path, 'version')).readAsStringSync().trim();
+      new File(pathLib.join(dir.path, 'version')).readAsStringSync().trim();
   @override
   String get description =>
       'The Dart SDK is a set of tools and libraries for the '
@@ -213,7 +213,7 @@ class _SdkMeta extends PackageMeta {
   FileContents getReadmeContents() {
     File f = sdkReadmePath != null
         ? new File(sdkReadmePath)
-        : new File(path.join(dir.path, 'lib', 'api_readme.md'));
+        : new File(pathLib.join(dir.path, 'lib', 'api_readme.md'));
     return f.existsSync() ? new FileContents(f) : null;
   }
 
diff --git a/test/compare_output_test.dart b/test/compare_output_test.dart
index 3a594d44e3..23a52b239e 100644
--- a/test/compare_output_test.dart
+++ b/test/compare_output_test.dart
@@ -8,7 +8,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:mirrors';
 
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 import 'package:test/test.dart';
 
 const List<String> _filesToIgnore = const <String>['.DS_Store'];
@@ -21,17 +21,17 @@ Uri get _currentFileUri =>
     (reflect(main) as ClosureMirror).function.location.sourceUri;
 
 String get _testPackageDocsPath =>
-    path.fromUri(_currentFileUri.resolve('../testing/test_package_docs'));
+    pathLib.fromUri(_currentFileUri.resolve('../testing/test_package_docs'));
 
 String get _testPackagePath =>
-    path.fromUri(_currentFileUri.resolve('../testing/test_package'));
+    pathLib.fromUri(_currentFileUri.resolve('../testing/test_package'));
 
 void main() {
   group('compare outputs', () {
     Directory tempDir;
 
     var dartdocBin =
-        path.fromUri(_currentFileUri.resolve('../bin/dartdoc.dart'));
+        pathLib.fromUri(_currentFileUri.resolve('../bin/dartdoc.dart'));
 
     setUp(() {
       tempDir = Directory.systemTemp.createTempSync('dartdoc.test.');
@@ -101,8 +101,8 @@ void main() {
             'diff',
             '--no-index',
             '--no-color',
-            path.join(_testPackageDocsPath, k),
-            path.join(tempDir.path, k)
+            pathLib.join(_testPackageDocsPath, k),
+            pathLib.join(tempDir.path, k)
           ];
           result = Process.runSync(gitBinName, args);
           assert(result.exitCode != 0);
@@ -186,7 +186,7 @@ void main() {
 
     test('--footer-text includes text', () {
       String footerTextPath =
-          path.join(Directory.systemTemp.path, 'footer.txt');
+          pathLib.join(Directory.systemTemp.path, 'footer.txt');
       new File(footerTextPath).writeAsStringSync(' footer text include ');
 
       var args = <String>[
@@ -208,7 +208,7 @@ void main() {
         fail('dartdoc failed');
       }
 
-      File outFile = new File(path.join(tempDir.path, 'index.html'));
+      File outFile = new File(pathLib.join(tempDir.path, 'index.html'));
       expect(outFile.readAsStringSync(), contains('footer text include'));
     });
 
@@ -242,18 +242,18 @@ Map<String, String> _parseOutput(
     var type = match[1];
     var p = match[2];
 
-    if (_filesToIgnore.any((i) => path.basename(p) == i)) {
+    if (_filesToIgnore.any((i) => pathLib.basename(p) == i)) {
       continue;
     }
 
     if (type == 'A') {
-      expect(path.isWithin(tempPath, p), isTrue,
+      expect(pathLib.isWithin(tempPath, p), isTrue,
           reason: '`$p` should be within $tempPath');
-      p = path.relative(p, from: tempPath);
+      p = pathLib.relative(p, from: tempPath);
     } else {
-      expect(path.isWithin(sourcePath, p), isTrue,
+      expect(pathLib.isWithin(sourcePath, p), isTrue,
           reason: '`$p` should be within $sourcePath');
-      p = path.relative(p, from: sourcePath);
+      p = pathLib.relative(p, from: sourcePath);
     }
 
     values[p] = type;
diff --git a/test/dartdoc_options_test.dart b/test/dartdoc_options_test.dart
index c2e3654bac..525e7c0dff 100644
--- a/test/dartdoc_options_test.dart
+++ b/test/dartdoc_options_test.dart
@@ -7,7 +7,7 @@ library dartdoc.options_test;
 import 'dart:io';
 
 import 'package:dartdoc/src/dartdoc_options.dart';
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as pathLib;
 import 'package:test/test.dart';
 
 void main() {
@@ -23,15 +23,15 @@ void main() {
 
   setUpAll(() {
     tempDir = Directory.systemTemp.createTempSync('options_test');
-    firstDir = new Directory(p.join(tempDir.path, 'firstDir'))..createSync();
-    secondDir = new Directory(p.join(tempDir.path, 'secondDir'))..createSync();
+    firstDir = new Directory(pathLib.join(tempDir.path, 'firstDir'))..createSync();
+    secondDir = new Directory(pathLib.join(tempDir.path, 'secondDir'))..createSync();
 
-    secondDirFirstSub = new Directory(p.join(secondDir.path, 'firstSub'))..createSync();
-    secondDirSecondSub = new Directory(p.join(secondDir.path, 'secondSub'))..createSync();
+    secondDirFirstSub = new Directory(pathLib.join(secondDir.path, 'firstSub'))..createSync();
+    secondDirSecondSub = new Directory(pathLib.join(secondDir.path, 'secondSub'))..createSync();
 
-    dartdocOptionsOne = new File(p.join(firstDir.path, 'dartdoc_options.yaml'));
-    dartdocOptionsTwo = new File(p.join(secondDir.path, 'dartdoc_options.yaml'));
-    dartdocOptionsTwoFirstSub = new File(p.join(secondDirFirstSub.path, 'dartdoc_options.yaml'));
+    dartdocOptionsOne = new File(pathLib.join(firstDir.path, 'dartdoc_options.yaml'));
+    dartdocOptionsTwo = new File(pathLib.join(secondDir.path, 'dartdoc_options.yaml'));
+    dartdocOptionsTwoFirstSub = new File(pathLib.join(secondDirFirstSub.path, 'dartdoc_options.yaml'));
 
     dartdocOptionsOne.writeAsStringSync('''
 dartdoc:
diff --git a/test/dartdoc_test.dart b/test/dartdoc_test.dart
index a2e023857a..85dc9f7831 100644
--- a/test/dartdoc_test.dart
+++ b/test/dartdoc_test.dart
@@ -10,7 +10,7 @@ import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:dartdoc/src/sdk.dart';
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 import 'package:test/test.dart';
 
 import 'src/utils.dart';
@@ -28,7 +28,7 @@ void main() {
       delete(tempDir);
     });
 
-    test('generate docs for ${path.basename(testPackageDir.path)} works',
+    test('generate docs for ${pathLib.basename(testPackageDir.path)} works',
         () async {
       PackageMeta meta = new PackageMeta.fromDir(testPackageDir);
       DartDoc dartdoc = new DartDoc(
@@ -43,7 +43,7 @@ void main() {
       expect(p.publicLibraries, hasLength(10));
     });
 
-    test('generate docs for ${path.basename(testPackageBadDir.path)} fails',
+    test('generate docs for ${pathLib.basename(testPackageBadDir.path)} fails',
         () async {
       PackageMeta meta = new PackageMeta.fromDir(testPackageBadDir);
       DartDoc dartdoc = new DartDoc(
diff --git a/test/html_generator_test.dart b/test/html_generator_test.dart
index a459011d4f..aa8cd8ddc3 100644
--- a/test/html_generator_test.dart
+++ b/test/html_generator_test.dart
@@ -9,7 +9,7 @@ import 'dart:io' show File, Directory;
 import 'package:dartdoc/src/html/html_generator.dart';
 import 'package:dartdoc/src/html/templates.dart';
 import 'package:dartdoc/src/html/resources.g.dart';
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as pathLib;
 import 'package:test/test.dart';
 
 void main() {
@@ -87,12 +87,12 @@ void main() {
 
       test('resources are put into the right place', () {
         Directory output =
-            new Directory(p.join(tempOutput.path, 'static-assets'));
+            new Directory(pathLib.join(tempOutput.path, 'static-assets'));
         expect(output, doesExist);
 
         for (var resource in resource_names.map(
-            (r) => p.relative(Uri.parse(r).path, from: 'dartdoc/resources'))) {
-          expect(new File(p.join(output.path, resource)), doesExist);
+            (r) => pathLib.relative(Uri.parse(r).path, from: 'dartdoc/resources'))) {
+          expect(new File(pathLib.join(output.path, resource)), doesExist);
         }
       });
     });
diff --git a/test/model_test.dart b/test/model_test.dart
index 2b308cf669..2fbbfa8496 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -10,7 +10,7 @@ import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:dartdoc/src/sdk.dart';
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as pathLib;
 import 'package:test/test.dart';
 
 import 'src/utils.dart' as utils;
@@ -1365,7 +1365,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     tearDown(() {
-      var file = new File(p.join(Directory.current.path, "crossdart.json"));
+      var file = new File(pathLib.join(Directory.current.path, "crossdart.json"));
       if (file.existsSync()) {
         file.deleteSync();
       }
@@ -1492,7 +1492,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(offset, isNonNegative,
           reason: "Can't find convertToMap function in ${fakePath}");
       if (Platform.isWindows) fakePath = fakePath.replaceAll('/', r'\\');
-      new File(p.join(Directory.current.path, "crossdart.json"))
+      new File(pathLib.join(Directory.current.path, "crossdart.json"))
           .writeAsStringSync("""
               {"$fakePath":
                 {"references":[{"offset":${offset},"end":${offset+3},"remotePath":"http://www.example.com/fake.dart"}]}}
diff --git a/test/package_meta_test.dart b/test/package_meta_test.dart
index 91d1d32b84..6c67ee8022 100644
--- a/test/package_meta_test.dart
+++ b/test/package_meta_test.dart
@@ -8,7 +8,7 @@ import 'dart:io';
 
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:dartdoc/src/sdk.dart';
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 import 'package:test/test.dart';
 
 void main() {
@@ -17,7 +17,7 @@ void main() {
 
     setUp(() {
       var d = new Directory(
-          path.join(Directory.current.path, 'testing/test_package_not_valid'));
+          pathLib.join(Directory.current.path, 'testing/test_package_not_valid'));
       if (!d.existsSync()) {
         throw "$d cannot be found";
       }
diff --git a/test/src/utils.dart b/test/src/utils.dart
index c8710c0336..0b8e3e24ac 100644
--- a/test/src/utils.dart
+++ b/test/src/utils.dart
@@ -12,7 +12,7 @@ import 'package:dartdoc/src/config.dart';
 import 'package:dartdoc/src/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:dartdoc/src/sdk.dart';
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as pathLib;
 
 Directory sdkDir;
 PackageMeta sdkPackageMeta;
@@ -48,7 +48,7 @@ init() async {
 }
 
 Future<PackageGraph> bootSdkPackage() {
-  Directory dir = new Directory(p.current);
+  Directory dir = new Directory(pathLib.current);
   return new PackageBuilder(
           dir, [], [], sdkDir, sdkPackageMeta, [], [], true, false)
       .buildPackageGraph();
diff --git a/test/template_test.dart b/test/template_test.dart
index 359093e783..8f41c398cb 100644
--- a/test/template_test.dart
+++ b/test/template_test.dart
@@ -7,7 +7,7 @@ library dartdoc.template_test;
 import 'dart:io';
 
 import 'package:mustache4dart/mustache4dart.dart';
-import 'package:path/path.dart' as p;
+import 'package:path/path.dart' as pathLib;
 import 'package:test/test.dart';
 
 void main() {
@@ -17,7 +17,7 @@ void main() {
 
       setUp(() {
         if (sitemap == null) {
-          var templatePath = p.join(p.current, 'lib/templates/sitemap.xml');
+          var templatePath = pathLib.join(pathLib.current, 'lib/templates/sitemap.xml');
           File tmplFile = new File(templatePath);
           var siteMapTmpl = tmplFile.readAsStringSync();
           sitemap = compile(siteMapTmpl);
diff --git a/tool/grind.dart b/tool/grind.dart
index 1f09cd155f..d9e76f9170 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -8,7 +8,7 @@ import 'dart:io' hide ProcessException;
 import 'package:dartdoc/src/io_utils.dart';
 import 'package:dartdoc/src/model_utils.dart';
 import 'package:grinder/grinder.dart';
-import 'package:path/path.dart' as path;
+import 'package:path/path.dart' as pathLib;
 import 'package:yaml/yaml.dart' as yaml;
 
 main([List<String> args]) => grind(args);
@@ -24,7 +24,7 @@ Directory get dartdocDocsDir =>
 Directory get sdkDocsDir => tempdirsCache.memoized1(createTempSync, 'sdkdocs');
 Directory get flutterDir => tempdirsCache.memoized1(createTempSync, 'flutter');
 Directory get testPackage =>
-    new Directory(path.joinAll(['testing', 'test_package']));
+    new Directory(pathLib.joinAll(['testing', 'test_package']));
 Directory get testPackageDocsDir =>
     tempdirsCache.memoized1(createTempSync, 'test_package');
 
@@ -39,13 +39,13 @@ String get dartdocOriginalBranch {
 }
 
 final Directory flutterDirDevTools =
-    new Directory(path.join(flutterDir.path, 'dev', 'tools'));
+    new Directory(pathLib.join(flutterDir.path, 'dev', 'tools'));
 
 /// Creates a throwaway pub cache and returns the environment variables
 /// necessary to use it.
 Map<String, String> _createThrowawayPubCache() {
   final Directory pubCache = Directory.systemTemp.createTempSync('pubcache');
-  final Directory pubCacheBin = new Directory(path.join(pubCache.path, 'bin'));
+  final Directory pubCacheBin = new Directory(pathLib.join(pubCache.path, 'bin'));
   pubCacheBin.createSync();
   return new Map.fromIterables([
     'PUB_CACHE',
@@ -233,7 +233,7 @@ Future<List<Map>> _buildSdkDocs(String sdkDocsPath, Future<String> futureCwd,
       Platform.resolvedExecutable,
       [
         '--checked',
-        path.join('bin', 'dartdoc.dart'),
+        pathLib.join('bin', 'dartdoc.dart'),
         '--output',
         '${sdkDocsPath}',
         '--sdk-docs',
@@ -257,7 +257,7 @@ Future<List<Map>> _buildTestPackageDocs(
       Platform.resolvedExecutable,
       [
         '--checked',
-        path.join(cwd, 'bin', 'dartdoc.dart'),
+        pathLib.join(cwd, 'bin', 'dartdoc.dart'),
         '--output',
         outputDir,
         '--auto-include-dependencies',
@@ -351,7 +351,7 @@ Future compareFlutterWarnings() async {
       '--port',
       '9000',
       '--path',
-      path.join(originalDartdocFlutter.absolute.path, 'dev', 'docs', 'doc'),
+      pathLib.join(originalDartdocFlutter.absolute.path, 'dev', 'docs', 'doc'),
     ]);
     Future current = launcher.runStreamed(sdkBin('pub'), [
       'run',
@@ -359,7 +359,7 @@ Future compareFlutterWarnings() async {
       '--port',
       '9001',
       '--path',
-      path.join(flutterDir.absolute.path, 'dev', 'docs', 'doc'),
+      pathLib.join(flutterDir.absolute.path, 'dev', 'docs', 'doc'),
     ]);
     await Future.wait([original, current]);
   }
@@ -377,7 +377,7 @@ Future serveFlutterDocs() async {
     '--port',
     '8001',
     '--path',
-    path.join(flutterDir.path, 'dev', 'docs', 'doc'),
+    pathLib.join(flutterDir.path, 'dev', 'docs', 'doc'),
   ]);
 }
 
@@ -388,7 +388,7 @@ Future buildFlutterDocs() async {
   await _buildFlutterDocs(
       flutterDir.path, new Future.value(Directory.current.path), env);
   String index =
-      new File(path.join(flutterDir.path, 'dev', 'docs', 'doc', 'index.html'))
+      new File(pathLib.join(flutterDir.path, 'dev', 'docs', 'doc', 'index.html'))
           .readAsStringSync();
   stdout.write(index);
 }
@@ -396,17 +396,17 @@ Future buildFlutterDocs() async {
 Future<List<Map>> _buildFlutterDocs(
     String flutterPath, Future<String> futureCwd, Map<String, String> env,
     [String label]) async {
-  env['PATH'] = '${path.join(flutterPath, "bin")}:${env['PATH']}';
+  env['PATH'] = '${pathLib.join(flutterPath, "bin")}:${env['PATH']}';
   var launcher = new SubprocessLauncher(
       'build-flutter-docs${label == null ? "" : "-$label"}', env);
   await launcher.runStreamed(
       'git', ['clone', 'https://github.com/flutter/flutter.git', '.'],
       workingDirectory: flutterPath);
-  String flutterBin = path.join('bin', 'flutter');
+  String flutterBin = pathLib.join('bin', 'flutter');
   String flutterCacheDart =
-      path.join(flutterPath, 'bin', 'cache', 'dart-sdk', 'bin', 'dart');
+      pathLib.join(flutterPath, 'bin', 'cache', 'dart-sdk', 'bin', 'dart');
   String flutterCachePub =
-      path.join(flutterPath, 'bin', 'cache', 'dart-sdk', 'bin', 'pub');
+      pathLib.join(flutterPath, 'bin', 'cache', 'dart-sdk', 'bin', 'pub');
   await launcher.runStreamed(
     flutterBin,
     ['--version'],
@@ -420,14 +420,14 @@ Future<List<Map>> _buildFlutterDocs(
   await launcher.runStreamed(
     flutterCachePub,
     ['get'],
-    workingDirectory: path.join(flutterPath, 'dev', 'tools'),
+    workingDirectory: pathLib.join(flutterPath, 'dev', 'tools'),
   );
   await launcher.runStreamed(
       flutterCachePub, ['global', 'activate', '-spath', '.'],
       workingDirectory: await futureCwd);
   return await launcher.runStreamed(
     flutterCacheDart,
-    [path.join('dev', 'tools', 'dartdoc.dart'), '-c', '--json'],
+    [pathLib.join('dev', 'tools', 'dartdoc.dart'), '-c', '--json'],
     workingDirectory: flutterPath,
   );
 }
@@ -444,7 +444,7 @@ Future<String> _buildPubPackageDocs(String pubPackageName,
   args.add(pubPackageName);
   await launcher.runStreamed('pub', args);
   Directory cache =
-      new Directory(path.join(env['PUB_CACHE'], 'hosted', 'pub.dartlang.org'));
+      new Directory(pathLib.join(env['PUB_CACHE'], 'hosted', 'pub.dartlang.org'));
   Directory pubPackageDir =
       cache.listSync().firstWhere((e) => e.path.contains(pubPackageName));
   await launcher.runStreamed('pub', ['get'],
@@ -453,12 +453,12 @@ Future<String> _buildPubPackageDocs(String pubPackageName,
       Platform.resolvedExecutable,
       [
         '--checked',
-        path.join(Directory.current.absolute.path, 'bin', 'dartdoc.dart'),
+        pathLib.join(Directory.current.absolute.path, 'bin', 'dartdoc.dart'),
         '--json',
         '--show-progress',
       ],
       workingDirectory: pubPackageDir.absolute.path);
-  return path.join(pubPackageDir.absolute.path, 'doc', 'api');
+  return pathLib.join(pubPackageDir.absolute.path, 'doc', 'api');
 }
 
 @Task(
@@ -545,12 +545,12 @@ findTransformers() async {
 
 @Task('Make sure all the resource files are present')
 indexResources() {
-  var sourcePath = path.join('lib', 'resources');
+  var sourcePath = pathLib.join('lib', 'resources');
   if (!new Directory(sourcePath).existsSync()) {
     throw new StateError('lib/resources directory not found');
   }
-  var outDir = new Directory(path.join('lib'));
-  var out = new File(path.join(outDir.path, 'src', 'html', 'resources.g.dart'));
+  var outDir = new Directory(pathLib.join('lib'));
+  var out = new File(pathLib.join(outDir.path, 'src', 'html', 'resources.g.dart'));
   out.createSync(recursive: true);
   var buffer = new StringBuffer()
     ..write('// WARNING: This file is auto-generated. Do not taunt.\n\n')
@@ -596,8 +596,8 @@ testDartdoc() async {
 updateTestPackageDocs() async {
   var launcher = new SubprocessLauncher('update-test-package-docs');
   var testPackageDocs =
-      new Directory(path.join('testing', 'test_package_docs'));
-  var testPackage = new Directory(path.join('testing', 'test_package'));
+      new Directory(pathLib.join('testing', 'test_package_docs'));
+  var testPackage = new Directory(pathLib.join('testing', 'test_package'));
   await launcher.runStreamed(sdkBin('pub'), ['get'],
       workingDirectory: testPackage.path);
   delete(testPackageDocs);
@@ -607,7 +607,7 @@ updateTestPackageDocs() async {
       Platform.resolvedExecutable,
       [
         '--checked',
-        path.join('..', '..', 'bin', 'dartdoc.dart'),
+        pathLib.join('..', '..', 'bin', 'dartdoc.dart'),
         '--auto-include-dependencies',
         '--example-path-prefix',
         'examples',
@@ -650,7 +650,7 @@ validateSdkDocs() {
   log('$libsLength dart: libraries found');
 
   var futureConstFile =
-      joinFile(sdkDocsDir, [path.join('dart-async', 'Future', 'Future.html')]);
+      joinFile(sdkDocsDir, [pathLib.join('dart-async', 'Future', 'Future.html')]);
   if (!futureConstFile.existsSync()) {
     fail('no Future.html found for dart:async Future constructor');
   }

From 287393536392642dbd6eb806d3f30d1bc2e8f664 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 20 Mar 2018 11:19:27 -0700
Subject: [PATCH 19/21] dartfmt

---
 lib/src/html/html_generator_instance.dart | 22 ++++++++++++----------
 lib/src/model.dart                        | 11 ++++++-----
 test/dartdoc_options_test.dart            | 23 +++++++++++++++--------
 test/html_generator_test.dart             |  4 ++--
 test/model_test.dart                      |  3 ++-
 test/package_meta_test.dart               |  4 ++--
 test/template_test.dart                   |  3 ++-
 testing/test_package/lib/example.dart     |  2 +-
 testing/test_package/lib/fake.dart        | 14 ++++++++------
 tool/grind.dart                           | 20 +++++++++++---------
 10 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/lib/src/html/html_generator_instance.dart b/lib/src/html/html_generator_instance.dart
index 02b3a1a528..cbbfdb463b 100644
--- a/lib/src/html/html_generator_instance.dart
+++ b/lib/src/html/html_generator_instance.dart
@@ -184,7 +184,8 @@ class HtmlGeneratorInstance {
   void generateClass(PackageGraph packageGraph, Library lib, Class clazz) {
     TemplateData data =
         new ClassTemplateData(_options, packageGraph, lib, clazz);
-    _build(pathLib.joinAll(clazz.href.split('/')), _templates.classTemplate, data);
+    _build(
+        pathLib.joinAll(clazz.href.split('/')), _templates.classTemplate, data);
   }
 
   void generateConstructor(PackageGraph packageGraph, Library lib, Class clazz,
@@ -199,7 +200,8 @@ class HtmlGeneratorInstance {
   void generateEnum(PackageGraph packageGraph, Library lib, Enum eNum) {
     TemplateData data = new EnumTemplateData(_options, packageGraph, lib, eNum);
 
-    _build(pathLib.joinAll(eNum.href.split('/')), _templates.enumTemplate, data);
+    _build(
+        pathLib.joinAll(eNum.href.split('/')), _templates.enumTemplate, data);
   }
 
   void generateFunction(
@@ -207,8 +209,8 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new FunctionTemplateData(_options, packageGraph, lib, function);
 
-    _build(pathLib.joinAll(function.href.split('/')), _templates.functionTemplate,
-        data);
+    _build(pathLib.joinAll(function.href.split('/')),
+        _templates.functionTemplate, data);
   }
 
   void generateMethod(
@@ -216,8 +218,8 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new MethodTemplateData(_options, packageGraph, lib, clazz, method);
 
-    _build(
-        pathLib.joinAll(method.href.split('/')), _templates.methodTemplate, data);
+    _build(pathLib.joinAll(method.href.split('/')), _templates.methodTemplate,
+        data);
   }
 
   void generateConstant(
@@ -225,8 +227,8 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new ConstantTemplateData(_options, packageGraph, lib, clazz, property);
 
-    _build(pathLib.joinAll(property.href.split('/')), _templates.constantTemplate,
-        data);
+    _build(pathLib.joinAll(property.href.split('/')),
+        _templates.constantTemplate, data);
   }
 
   void generateProperty(
@@ -234,8 +236,8 @@ class HtmlGeneratorInstance {
     TemplateData data =
         new PropertyTemplateData(_options, packageGraph, lib, clazz, property);
 
-    _build(pathLib.joinAll(property.href.split('/')), _templates.propertyTemplate,
-        data);
+    _build(pathLib.joinAll(property.href.split('/')),
+        _templates.propertyTemplate, data);
   }
 
   void generateTopLevelProperty(
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 92e972b2dc..33d5ab4496 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -2165,8 +2165,8 @@ class Library extends ModelElement {
       String canonicalElementPath =
           pathLib.canonicalize(element.source.uri.toFilePath());
       assert(canonicalElementPath.startsWith(canonicalPackagePath));
-      List<String> pathSegments = [defaultPackage.name]..addAll(
-          pathLib.split(canonicalElementPath.replaceFirst(canonicalPackagePath, '')));
+      List<String> pathSegments = [defaultPackage.name]..addAll(pathLib
+          .split(canonicalElementPath.replaceFirst(canonicalPackagePath, '')));
       Uri libraryUri = new Uri(
         scheme: 'package',
         pathSegments: pathSegments,
@@ -3464,7 +3464,8 @@ abstract class ModelElement extends Canonicalization
     RegExp exampleRE = new RegExp(r'{@example\s+([^}]+)}');
     return rawdocs.replaceAllMapped(exampleRE, (match) {
       var args = _getExampleArgs(match[1]);
-      var lang = args['lang'] ?? pathLib.extension(args['src']).replaceFirst('.', '');
+      var lang =
+          args['lang'] ?? pathLib.extension(args['src']).replaceFirst('.', '');
 
       var replacement = match[0]; // default to fully matched string.
 
@@ -4506,8 +4507,8 @@ class Package implements Comparable<Package> {
         _packagePath = getSdkDir().path;
       } else {
         assert(_libraries.isNotEmpty);
-        File file =
-            new File(pathLib.canonicalize(_libraries.first.element.source.fullName));
+        File file = new File(
+            pathLib.canonicalize(_libraries.first.element.source.fullName));
         Directory dir = file.parent;
         while (dir.parent.path != dir.path && dir.existsSync()) {
           File pubspec = new File(pathLib.join(dir.path, 'pubspec.yaml'));
diff --git a/test/dartdoc_options_test.dart b/test/dartdoc_options_test.dart
index 525e7c0dff..c878c130c9 100644
--- a/test/dartdoc_options_test.dart
+++ b/test/dartdoc_options_test.dart
@@ -23,15 +23,22 @@ void main() {
 
   setUpAll(() {
     tempDir = Directory.systemTemp.createTempSync('options_test');
-    firstDir = new Directory(pathLib.join(tempDir.path, 'firstDir'))..createSync();
-    secondDir = new Directory(pathLib.join(tempDir.path, 'secondDir'))..createSync();
+    firstDir = new Directory(pathLib.join(tempDir.path, 'firstDir'))
+      ..createSync();
+    secondDir = new Directory(pathLib.join(tempDir.path, 'secondDir'))
+      ..createSync();
 
-    secondDirFirstSub = new Directory(pathLib.join(secondDir.path, 'firstSub'))..createSync();
-    secondDirSecondSub = new Directory(pathLib.join(secondDir.path, 'secondSub'))..createSync();
+    secondDirFirstSub = new Directory(pathLib.join(secondDir.path, 'firstSub'))
+      ..createSync();
+    secondDirSecondSub =
+        new Directory(pathLib.join(secondDir.path, 'secondSub'))..createSync();
 
-    dartdocOptionsOne = new File(pathLib.join(firstDir.path, 'dartdoc_options.yaml'));
-    dartdocOptionsTwo = new File(pathLib.join(secondDir.path, 'dartdoc_options.yaml'));
-    dartdocOptionsTwoFirstSub = new File(pathLib.join(secondDirFirstSub.path, 'dartdoc_options.yaml'));
+    dartdocOptionsOne =
+        new File(pathLib.join(firstDir.path, 'dartdoc_options.yaml'));
+    dartdocOptionsTwo =
+        new File(pathLib.join(secondDir.path, 'dartdoc_options.yaml'));
+    dartdocOptionsTwoFirstSub =
+        new File(pathLib.join(secondDirFirstSub.path, 'dartdoc_options.yaml'));
 
     dartdocOptionsOne.writeAsStringSync('''
 dartdoc:
@@ -74,4 +81,4 @@ dartdoc:
       });
     });
   });
-}
\ No newline at end of file
+}
diff --git a/test/html_generator_test.dart b/test/html_generator_test.dart
index aa8cd8ddc3..95d094f915 100644
--- a/test/html_generator_test.dart
+++ b/test/html_generator_test.dart
@@ -90,8 +90,8 @@ void main() {
             new Directory(pathLib.join(tempOutput.path, 'static-assets'));
         expect(output, doesExist);
 
-        for (var resource in resource_names.map(
-            (r) => pathLib.relative(Uri.parse(r).path, from: 'dartdoc/resources'))) {
+        for (var resource in resource_names.map((r) =>
+            pathLib.relative(Uri.parse(r).path, from: 'dartdoc/resources'))) {
           expect(new File(pathLib.join(output.path, resource)), doesExist);
         }
       });
diff --git a/test/model_test.dart b/test/model_test.dart
index 2fbbfa8496..08d7c4f121 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1365,7 +1365,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     tearDown(() {
-      var file = new File(pathLib.join(Directory.current.path, "crossdart.json"));
+      var file =
+          new File(pathLib.join(Directory.current.path, "crossdart.json"));
       if (file.existsSync()) {
         file.deleteSync();
       }
diff --git a/test/package_meta_test.dart b/test/package_meta_test.dart
index 6c67ee8022..12e131f4bc 100644
--- a/test/package_meta_test.dart
+++ b/test/package_meta_test.dart
@@ -16,8 +16,8 @@ void main() {
     PackageMeta p;
 
     setUp(() {
-      var d = new Directory(
-          pathLib.join(Directory.current.path, 'testing/test_package_not_valid'));
+      var d = new Directory(pathLib.join(
+          Directory.current.path, 'testing/test_package_not_valid'));
       if (!d.existsSync()) {
         throw "$d cannot be found";
       }
diff --git a/test/template_test.dart b/test/template_test.dart
index 8f41c398cb..dea263bbb8 100644
--- a/test/template_test.dart
+++ b/test/template_test.dart
@@ -17,7 +17,8 @@ void main() {
 
       setUp(() {
         if (sitemap == null) {
-          var templatePath = pathLib.join(pathLib.current, 'lib/templates/sitemap.xml');
+          var templatePath =
+              pathLib.join(pathLib.current, 'lib/templates/sitemap.xml');
           File tmplFile = new File(templatePath);
           var siteMapTmpl = tmplFile.readAsStringSync();
           sitemap = compile(siteMapTmpl);
diff --git a/testing/test_package/lib/example.dart b/testing/test_package/lib/example.dart
index 63349207ce..c7664dbb90 100644
--- a/testing/test_package/lib/example.dart
+++ b/testing/test_package/lib/example.dart
@@ -73,7 +73,7 @@ abstract class ParameterizedClass<T> {
   ParameterizedTypedef<T> aInheritedTypedefReturningMethod();
   AnotherParameterizedClass<T> aInheritedField;
   AnotherParameterizedClass<T> get aInheritedGetter;
-  ParameterizedClass<T> operator+ (ParameterizedClass<T> other);
+  ParameterizedClass<T> operator +(ParameterizedClass<T> other);
   set aInheritedSetter(AnotherParameterizedClass<T> thingToSet);
 }
 
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index ad099b5907..5dccf53bab 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -89,7 +89,6 @@ class HasGenerics<X, Y, Z> {
   Map<X, Y> convertToMap() => null;
 }
 
-
 /// This is a class with a table.
 ///
 /// It has multiple sentences before the table.  Because testing is a good
@@ -124,7 +123,6 @@ class DocumentWithATable {
   void aMethod(String parameter) {}
 }
 
-
 Map<dynamic, String> mapWithDynamicKeys = {};
 
 /// Useful for annotations.
@@ -344,10 +342,12 @@ class ClassWithUnusualProperties extends ImplicitProperties {
   String get documentedPartialFieldInSubclassOnly => "overridden getter";
 
   @override
+
   /// Docs for setter of implicitGetterExplicitSetter.
   set implicitGetterExplicitSetter(String x) {}
 
   @override
+
   /// Getter doc for explicitGetterImplicitSetter
   List<int> get explicitGetterImplicitSetter => new List<int>();
 
@@ -760,6 +760,7 @@ class _PrivateClassDefiningSomething {
 }
 
 class InheritingClassOne extends _PrivateClassDefiningSomething {}
+
 class InheritingClassTwo extends _PrivateClassDefiningSomething {}
 
 class ReferringClass {
@@ -774,11 +775,12 @@ class ReferringClass {
 /// Test an edge case for cases where inherited ExecutableElements can come
 /// both from private classes and public interfaces.  The test makes sure the
 /// class still takes precedence (#1561).
-abstract class MIEEMixinWithOverride<K, V> = MIEEBase<K, V> with _MIEEPrivateOverride<K, V>;
+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) {
+  void operator []=(K key, V value) {
     throw new UnsupportedError("Never use this");
   }
 }
@@ -791,5 +793,5 @@ abstract class MIEEMixin<K, V> implements MIEEThing<K, V> {
 }
 
 abstract class MIEEThing<K, V> {
-  void operator[]=(K key, V value);
-}
\ No newline at end of file
+  void operator []=(K key, V value);
+}
diff --git a/tool/grind.dart b/tool/grind.dart
index d9e76f9170..452210a50b 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -45,7 +45,8 @@ final Directory flutterDirDevTools =
 /// necessary to use it.
 Map<String, String> _createThrowawayPubCache() {
   final Directory pubCache = Directory.systemTemp.createTempSync('pubcache');
-  final Directory pubCacheBin = new Directory(pathLib.join(pubCache.path, 'bin'));
+  final Directory pubCacheBin =
+      new Directory(pathLib.join(pubCache.path, 'bin'));
   pubCacheBin.createSync();
   return new Map.fromIterables([
     'PUB_CACHE',
@@ -387,9 +388,9 @@ Future buildFlutterDocs() async {
   Map<String, String> env = _createThrowawayPubCache();
   await _buildFlutterDocs(
       flutterDir.path, new Future.value(Directory.current.path), env);
-  String index =
-      new File(pathLib.join(flutterDir.path, 'dev', 'docs', 'doc', 'index.html'))
-          .readAsStringSync();
+  String index = new File(
+          pathLib.join(flutterDir.path, 'dev', 'docs', 'doc', 'index.html'))
+      .readAsStringSync();
   stdout.write(index);
 }
 
@@ -443,8 +444,8 @@ Future<String> _buildPubPackageDocs(String pubPackageName,
   if (version != null) args.addAll(<String>['-v', version]);
   args.add(pubPackageName);
   await launcher.runStreamed('pub', args);
-  Directory cache =
-      new Directory(pathLib.join(env['PUB_CACHE'], 'hosted', 'pub.dartlang.org'));
+  Directory cache = new Directory(
+      pathLib.join(env['PUB_CACHE'], 'hosted', 'pub.dartlang.org'));
   Directory pubPackageDir =
       cache.listSync().firstWhere((e) => e.path.contains(pubPackageName));
   await launcher.runStreamed('pub', ['get'],
@@ -550,7 +551,8 @@ indexResources() {
     throw new StateError('lib/resources directory not found');
   }
   var outDir = new Directory(pathLib.join('lib'));
-  var out = new File(pathLib.join(outDir.path, 'src', 'html', 'resources.g.dart'));
+  var out =
+      new File(pathLib.join(outDir.path, 'src', 'html', 'resources.g.dart'));
   out.createSync(recursive: true);
   var buffer = new StringBuffer()
     ..write('// WARNING: This file is auto-generated. Do not taunt.\n\n')
@@ -649,8 +651,8 @@ validateSdkDocs() {
   }
   log('$libsLength dart: libraries found');
 
-  var futureConstFile =
-      joinFile(sdkDocsDir, [pathLib.join('dart-async', 'Future', 'Future.html')]);
+  var futureConstFile = joinFile(
+      sdkDocsDir, [pathLib.join('dart-async', 'Future', 'Future.html')]);
   if (!futureConstFile.existsSync()) {
     fail('no Future.html found for dart:async Future constructor');
   }

From 092e2fec8a17800b6d51ed9bcf84879f4b3b4880 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 20 Mar 2018 13:12:16 -0700
Subject: [PATCH 20/21] 'Dart SDK' + '' => 'Dart Core' + 'SDK'

---
 lib/src/model.dart                                             | 2 +-
 lib/src/package_meta.dart                                      | 2 +-
 lib/templates/index.html                                       | 3 +--
 lib/templates/library.html                                     | 2 +-
 test/model_test.dart                                           | 3 ++-
 test/package_meta_test.dart                                    | 2 +-
 .../anonymous_library/anonymous_library-library.html           | 2 +-
 .../another_anonymous_lib/another_anonymous_lib-library.html   | 2 +-
 .../code_in_comments/code_in_comments-library.html             | 2 +-
 testing/test_package_docs/css/css-library.html                 | 2 +-
 testing/test_package_docs/ex/ex-library.html                   | 2 +-
 testing/test_package_docs/fake/fake-library.html               | 2 +-
 testing/test_package_docs/index.html                           | 2 +-
 .../test_package_docs/is_deprecated/is_deprecated-library.html | 2 +-
 .../test_package_docs/reexport_one/reexport_one-library.html   | 2 +-
 .../test_package_docs/reexport_two/reexport_two-library.html   | 2 +-
 .../test_package_imported.main-library.html                    | 2 +-
 testing/test_package_docs/two_exports/two_exports-library.html | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/src/model.dart b/lib/src/model.dart
index 0ffcd581f6..65fae4cabf 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -4195,7 +4195,7 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
   String get name => packageMeta.name;
 
   String get kind =>
-      (publicPackages.length > 1 || packageGraph.isSdk) ? '' : 'package';
+      (packageGraph.isSdk) ? 'SDK' : 'package';
 
   @override
   String get oneLineDoc => '';
diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart
index 8662668e29..279a3fe631 100644
--- a/lib/src/package_meta.dart
+++ b/lib/src/package_meta.dart
@@ -225,7 +225,7 @@ class _SdkMeta extends PackageMeta {
   }
 
   @override
-  String get name => 'Dart SDK';
+  String get name => 'Dart Core';
   @override
   String get version =>
       new File(pathLib.join(dir.path, 'version')).readAsStringSync().trim();
diff --git a/lib/templates/index.html b/lib/templates/index.html
index 56066b3f55..0b7ec93e85 100644
--- a/lib/templates/index.html
+++ b/lib/templates/index.html
@@ -1,7 +1,7 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{self.name}} {{self.kind}}</h5>
+    <h5><span class="package-name">{{self.name}}</span> <span class="package-kind">{{self.kind}}</span></h5>
 
     {{#displayAsPackages}}
     <ol>
@@ -11,7 +11,6 @@ <h5>{{self.name}} {{self.kind}}</h5>
         <li>{{{linkedName}}}</li>
         {{/publicLibraries}}
       {{/packageGraph.publicPackages}}
-
     </ol>
     {{/displayAsPackages}}
 
diff --git a/lib/templates/library.html b/lib/templates/library.html
index 951611fc7b..ff4c02f1ad 100644
--- a/lib/templates/library.html
+++ b/lib/templates/library.html
@@ -1,7 +1,7 @@
 {{>head}}
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>{{parent.name}} {{parent.kind}}</h5>
+    <h5><span class="package-name">{{parent.name}}</span> <span class="package-kind">{{parent.kind}}</span></h5>
     {{#displayAsPackages}}
     <ol>
       {{#packageGraph.publicPackages}}
diff --git a/test/model_test.dart b/test/model_test.dart
index 08d7c4f121..a015d30308 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -104,7 +104,8 @@ void main() {
       });
 
       test('sdk name', () {
-        expect(sdkAsPackageGraph.name, equals('Dart SDK'));
+        expect(sdkAsPackageGraph.name, equals('Dart Core'));
+        expect(sdkAsPackageGraph.kind, equals('SDK'));
       });
 
       test('sdk homepage', () {
diff --git a/test/package_meta_test.dart b/test/package_meta_test.dart
index b5722920ae..afc9d4e97e 100644
--- a/test/package_meta_test.dart
+++ b/test/package_meta_test.dart
@@ -72,7 +72,7 @@ void main() {
     PackageMeta p = new PackageMeta.fromDir(getSdkDir());
 
     test('has a name', () {
-      expect(p.name, 'Dart SDK');
+      expect(p.name, 'Dart Core');
     });
 
     test('is valid', () {
diff --git a/testing/test_package_docs/anonymous_library/anonymous_library-library.html b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
index 8bebd2ac43..1d4534e6c4 100644
--- a/testing/test_package_docs/anonymous_library/anonymous_library-library.html
+++ b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
index 7533406876..22447b4d92 100644
--- a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
+++ b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/code_in_comments/code_in_comments-library.html b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
index 1c9e4b23e5..c6dcd0d8b2 100644
--- a/testing/test_package_docs/code_in_comments/code_in_comments-library.html
+++ b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html
index cbcbb9c5a2..35c76a568c 100644
--- a/testing/test_package_docs/css/css-library.html
+++ b/testing/test_package_docs/css/css-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html
index 0c25055092..2b4da0baba 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index b2ff86affb..ae8db03053 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html
index 0f27cf07cd..fe6e70594c 100644
--- a/testing/test_package_docs/index.html
+++ b/testing/test_package_docs/index.html
@@ -32,7 +32,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
 
     <ol>
diff --git a/testing/test_package_docs/is_deprecated/is_deprecated-library.html b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
index 710797dfd5..906ba22e38 100644
--- a/testing/test_package_docs/is_deprecated/is_deprecated-library.html
+++ b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html
index 62e8dbe75d..12308942a8 100644
--- a/testing/test_package_docs/reexport_one/reexport_one-library.html
+++ b/testing/test_package_docs/reexport_one/reexport_one-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html
index 9568617743..3bc1b496eb 100644
--- a/testing/test_package_docs/reexport_two/reexport_two-library.html
+++ b/testing/test_package_docs/reexport_two/reexport_two-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
index d8cefd8635..da267e33a4 100644
--- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
+++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>
diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html
index c0daa76aed..ac5e38c0e9 100644
--- a/testing/test_package_docs/two_exports/two_exports-library.html
+++ b/testing/test_package_docs/two_exports/two_exports-library.html
@@ -35,7 +35,7 @@
 <main>
 
   <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>test_package </h5>
+    <h5><span class="package-name">test_package</span> <span class="package-kind">package</span></h5>
 
     <ol>
       <li class="section-title"><a href="index.html#libraries">Libraries</a></li>

From b8ccf9c62b2636b0bba8a5442cccea2f6ca9bcf0 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 20 Mar 2018 13:55:01 -0700
Subject: [PATCH 21/21] SDK name is no longer special

---
 lib/src/model.dart          | 18 ++++--------------
 lib/src/package_meta.dart   |  2 +-
 test/model_test.dart        |  2 +-
 test/package_meta_test.dart |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/lib/src/model.dart b/lib/src/model.dart
index 65fae4cabf..346238980c 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -1710,7 +1710,6 @@ class Library extends ModelElement {
   List<TopLevelVariable> _variables;
   Namespace _exportedNamespace;
   String _name;
-  String _packageName;
   factory Library(LibraryElement element, PackageGraph packageGraph) {
     return packageGraph.findOrCreateLibraryFor(element);
   }
@@ -2015,16 +2014,7 @@ class Library extends ModelElement {
 
   /// The real package, as opposed to the package we are documenting it with,
   /// [PackageGraph.name]
-  String get packageName {
-    if (_packageName == null) {
-      if (name.startsWith('dart:')) {
-        _packageName = 'Dart Core';
-      } else {
-        _packageName = packageMeta?.name ?? '';
-      }
-    }
-    return _packageName;
-  }
+  String get packageName => packageMeta?.name ?? '';
 
   /// The real packageMeta, as opposed to the package we are documenting with.
   PackageMeta _packageMeta;
@@ -4534,14 +4524,14 @@ class Package implements Comparable<Package> {
   /// Returns:
   /// -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
+  /// 1 if this package represents the Dart SDK.
+  /// 2 if this package has a name that contains the name of the original
   ///   package we are documenting.
   /// 3 otherwise.
   int get _group {
     if (config.packageOrder.contains(name)) return -1;
     if (name.toLowerCase() == packageGraph.name.toLowerCase()) return 0;
-    if (name == "Dart Core") return 1;
+    if (isSdk) return 1;
     if (name.toLowerCase().contains(packageGraph.name.toLowerCase())) return 2;
     return 3;
   }
diff --git a/lib/src/package_meta.dart b/lib/src/package_meta.dart
index 279a3fe631..12562e4a6e 100644
--- a/lib/src/package_meta.dart
+++ b/lib/src/package_meta.dart
@@ -225,7 +225,7 @@ class _SdkMeta extends PackageMeta {
   }
 
   @override
-  String get name => 'Dart Core';
+  String get name => 'Dart';
   @override
   String get version =>
       new File(pathLib.join(dir.path, 'version')).readAsStringSync().trim();
diff --git a/test/model_test.dart b/test/model_test.dart
index a015d30308..d04a20f478 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -104,7 +104,7 @@ void main() {
       });
 
       test('sdk name', () {
-        expect(sdkAsPackageGraph.name, equals('Dart Core'));
+        expect(sdkAsPackageGraph.name, equals('Dart'));
         expect(sdkAsPackageGraph.kind, equals('SDK'));
       });
 
diff --git a/test/package_meta_test.dart b/test/package_meta_test.dart
index afc9d4e97e..c893cb42ae 100644
--- a/test/package_meta_test.dart
+++ b/test/package_meta_test.dart
@@ -72,7 +72,7 @@ void main() {
     PackageMeta p = new PackageMeta.fromDir(getSdkDir());
 
     test('has a name', () {
-      expect(p.name, 'Dart Core');
+      expect(p.name, 'Dart');
     });
 
     test('is valid', () {