Merge branch 'master' into nodoc-param

Author: jcollins-g

lib/src/generator/template_data.dart

@@ -21,7 +21,7 @@ abstract class TemplateData<T extends Documentable> {
   String get metaDescription;
 
   List<Documentable> get navLinks;
-  List<Documentable> get navLinksWithGenerics => [];
+  List<Container> get navLinksWithGenerics => [];
   Documentable get parent {
     if (navLinksWithGenerics.isEmpty) {
       return navLinks.isNotEmpty ? navLinks.last : null;
@@ -33,6 +33,8 @@ abstract class TemplateData<T extends Documentable> {
 
   bool get hasHomepage => false;
 
+  String get homepage => null;
+
   String get htmlBase;
   T get self;
   String get version => htmlOptions.toolVersion;
@@ -73,6 +75,7 @@ class PackageTemplateData extends TemplateData<Package> {
 
   @override
   bool get hasHomepage => package.hasHomepage;
+  @override
   String get homepage => package.homepage;
 
   /// empty for packages because they are at the root – not needed
@@ -235,7 +238,7 @@ class ConstructorTemplateData extends TemplateData<Constructor> {
   @override
   List<Documentable> get navLinks => [packageGraph.defaultPackage, library];
   @override
-  List<Documentable> get navLinksWithGenerics => [clazz];
+  List<Container> get navLinksWithGenerics => [clazz];
   @override
   @override
   String get htmlBase => '../../';
@@ -313,7 +316,7 @@ class MethodTemplateData extends TemplateData<Method> {
   @override
   List<Documentable> get navLinks => [packageGraph.defaultPackage, library];
   @override
-  List<Documentable> get navLinksWithGenerics => [container];
+  List<Container> get navLinksWithGenerics => [container];
   @override
   String get htmlBase => '../../';
 }
@@ -347,7 +350,7 @@ class PropertyTemplateData extends TemplateData<Field> {
   @override
   List<Documentable> get navLinks => [packageGraph.defaultPackage, library];
   @override
-  List<Documentable> get navLinksWithGenerics => [container];
+  List<Container> get navLinksWithGenerics => [container];
   @override
   String get htmlBase => '../../';
 }

lib/src/model/category.dart

@@ -88,7 +88,7 @@ class Category extends Nameable
     } else if (c is Extension) {
       _extensions.add(c);
     } else {
-      throw UnimplementedError('Unrecognized element');
+      throw UnimplementedError('Unrecognized element: $c (${c.runtimeType})');
     }
   }
 
@@ -147,8 +147,6 @@ class Category extends Nameable
   @override
   String get href => isCanonical ? '${package.baseHref}$filePath' : null;
 
-  @Deprecated(
-      'Public field is unused; will be removed as early as Dartdoc 1.0.0')
   String get categoryLabel => _categoryRenderer.renderCategoryLabel(this);
 
   @Deprecated(

lib/src/model/class.dart

@@ -19,7 +19,7 @@ import 'package:meta/meta.dart';
 /// **instance**: As with [Container], but also includes inherited children.
 /// **inherited**: Filtered getters giving only inherited children.
 class Class extends Container
-    with TypeParameters, Categorization, ExtensionTarget
+    with Categorization, ExtensionTarget
     implements EnclosedElement {
   // TODO(srawlins): To make final, remove public getter, setter, rename to be
   // public, and add `final` modifier.

lib/src/model/container.dart

@@ -27,7 +27,7 @@ import 'package:meta/meta.dart';
 /// **has** : boolean getters indicating whether the underlying getters are
 /// empty.  Mostly for the templating system.
 /// **all** : Referring to all children.
-abstract class Container extends ModelElement {
+abstract class Container extends ModelElement with TypeParameters {
   Container(Element element, Library library, PackageGraph packageGraph)
       : super(element, library, packageGraph, null);
 

lib/src/model/extension.dart

@@ -10,7 +10,7 @@ import 'package:dartdoc/src/quiver.dart' as quiver;
 
 /// Extension methods
 class Extension extends Container
-    with TypeParameters, Categorization
+    with Categorization
     implements EnclosedElement {
   ElementType extendedType;
 

lib/src/model/model_node.dart

@@ -4,6 +4,7 @@
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/file_system/file_system.dart';
 import 'package:dartdoc/src/model_utils.dart' as model_utils;
 
 /// A stripped down [CommentReference] containing only that information needed
@@ -22,11 +23,12 @@ class ModelCommentReference {
 class ModelNode {
   final List<ModelCommentReference> commentRefs;
   final Element element;
+  final ResourceProvider resourceProvider;
 
   final int _sourceOffset;
   final int _sourceEnd;
 
-  ModelNode(AstNode sourceNode, this.element)
+  ModelNode(AstNode sourceNode, this.element, this.resourceProvider)
       : _sourceOffset = sourceNode?.offset,
         _sourceEnd = sourceNode?.end,
         commentRefs = _commentRefsFor(sourceNode);
@@ -46,7 +48,8 @@ class ModelNode {
   String get sourceCode {
     if (_sourceCode == null) {
       if (_sourceOffset != null) {
-        var contents = model_utils.getFileContentsFor(element);
+        var contents =
+            model_utils.getFileContentsFor(element, resourceProvider);
         // Find the start of the line, so that we can line up all the indents.
         var i = _sourceOffset;
         while (i > 0) {

lib/src/model/package_graph.dart

@@ -141,8 +141,8 @@ class PackageGraph {
       Element element, Map<String, CompilationUnit> compilationUnitMap) {
     _modelNodes.putIfAbsent(
         element,
-        () =>
-            ModelNode(utils.getAstNode(element, compilationUnitMap), element));
+        () => ModelNode(utils.getAstNode(element, compilationUnitMap), element,
+            resourceProvider));
   }
 
   ModelNode getModelNodeFor(Element element) => _modelNodes[element];

lib/src/model_utils.dart

@@ -5,10 +5,10 @@
 library dartdoc.model_utils;
 
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model/model.dart';
@@ -90,10 +90,10 @@ Iterable<Class> findCanonicalFor(Iterable<Class> classes) {
       c.packageGraph.findCanonicalModelElementFor(c.element) as Class ?? c);
 }
 
-String getFileContentsFor(Element e) {
+String getFileContentsFor(Element e, ResourceProvider resourceProvider) {
   var location = e.source.fullName;
   if (!_fileContents.containsKey(location)) {
-    var contents = File(location).readAsStringSync();
+    var contents = resourceProvider.getFile(location).readAsStringSync();
     _fileContents.putIfAbsent(location, () => contents);
   }
   return _fileContents[location];