Move extendedDocLink creation to ModelElementRenderer (#2085)

* Move extendedDocLink creation to ModelElementRenderer

* Also separate it from oneLineDoc and update the templates accordingly.

* Retain one literal string test

* Enum ordinal members do not show extended doc link

Author: jdkoren

lib/src/model/enum.dart

@@ -63,6 +63,14 @@ class EnumField extends Field {
     }
   }
 
+  @override
+  String get extendedDocLink {
+    // Ordinal members don't get extended doc links. Inherited members
+    // (e.g. hashcode) follow the normal rules.
+    if (index != null) return '';
+    return super.extendedDocLink;
+  }
+
   @override
   String get href {
     if (!identical(canonicalModelElement, this)) {

lib/src/model/getter_setter_combo.dart

@@ -135,7 +135,7 @@ mixin GetterSetterCombo on ModelElement {
   String get oneLineDoc {
     if (_oneLineDoc == null) {
       if (!hasAccessorsWithDocs) {
-        _oneLineDoc = computeOneLineDoc();
+        _oneLineDoc = super.oneLineDoc;
       } else {
         StringBuffer buffer = StringBuffer();
         if (hasPublicGetter && getter.oneLineDoc.isNotEmpty) {

lib/src/model/model_element.dart

@@ -784,7 +784,7 @@ abstract class ModelElement extends Canonicalization
   /// does not exist.
   String get extendedDocLink {
     if (hasExtendedDocumentation) {
-      return '<a href="${href}">[...]</a>';
+      return ModelElementRendererHtml().renderExtendedDocLink(this);
     }
     return '';
   }
@@ -964,19 +964,8 @@ abstract class ModelElement extends Canonicalization
   @override
   String get name => element.name;
 
-  // TODO(jcollins-g): refactor once dartdoc will only run in a VM where mixins
-  // calling super is allowed (SDK constraint >= 2.1.0).
-  String computeOneLineDoc() =>
-      '${_documentation.asOneLiner}${extendedDocLink.isEmpty ? "" : " $extendedDocLink"}';
-  String _oneLineDoc;
-
   @override
-  String get oneLineDoc {
-    if (_oneLineDoc == null) {
-      _oneLineDoc = computeOneLineDoc();
-    }
-    return _oneLineDoc;
-  }
+  String get oneLineDoc => _documentation.asOneLiner;
 
   Member get originalMember => _originalMember;
 

lib/src/render/model_element_renderer.dart

@@ -7,6 +7,8 @@ import 'package:dartdoc/src/model/model_element.dart';
 abstract class ModelElementRenderer {
   String renderLinkedName(ModelElement modelElement);
 
+  String renderExtendedDocLink(ModelElement modelElement);
+
   String renderYoutubeUrl(String youTubeId, String aspectRatio);
 
   String renderAnimation(
@@ -20,6 +22,11 @@ class ModelElementRendererHtml extends ModelElementRenderer {
     return '<a${cssClass} href="${modelElement.href}">${modelElement.name}</a>';
   }
 
+  @override
+  String renderExtendedDocLink(ModelElement modelElement) {
+    return '<a href="${modelElement.href}">[...]</a>';
+  }
+
   @override
   String renderYoutubeUrl(String youTubeId, String aspectRatio) {
     // Blank lines before and after, and no indenting at the beginning and end

lib/templates/_callable.html

@@ -5,6 +5,6 @@
   {{>categorization}}
 </dt>
 <dd{{ #isInherited }} class="inherited"{{ /isInherited}}>
-  {{{ oneLineDoc }}}
+  {{{ oneLineDoc }}} {{{ extendedDocLink }}}
   {{>features}}
 </dd>

lib/templates/_class.html

@@ -2,5 +2,5 @@
   <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}{{{linkedGenericParameters}}}</span> {{>categorization}}
 </dt>
 <dd>
-  {{{ oneLineDoc }}}
+  {{{ oneLineDoc }}} {{{ extendedDocLink }}}
 </dd>

lib/templates/_constant.html

@@ -4,7 +4,7 @@
   {{>categorization}}
 </dt>
 <dd>
-  {{{ oneLineDoc }}}
+  {{{ oneLineDoc }}} {{{ extendedDocLink }}}
   {{>features}}
   <div>
     <span class="signature"><code>{{{ constantValueTruncated }}}</code></span>

lib/templates/_extension.html

@@ -2,6 +2,6 @@
     <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}</span> {{>categorization}}
 </dt>
 <dd>
-    {{{ oneLineDoc }}}
+    {{{ oneLineDoc }}} {{{ extendedDocLink }}}
 </dd>
 

lib/templates/_library.html

@@ -2,5 +2,5 @@
   <span class="name">{{{ linkedName }}}</span> {{>categorization}}
 </dt>
 <dd>
-  {{#isDocumented}}{{{ oneLineDoc }}}{{/isDocumented}}
-</dd>
+  {{#isDocumented}}{{{ oneLineDoc }}} {{{ extendedDocLink }}}{{/isDocumented}}
+</dd>

lib/templates/_mixin.html

@@ -2,5 +2,5 @@
   <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}{{{linkedGenericParameters}}}</span> {{>categorization}}
 </dt>
 <dd>
-  {{{ oneLineDoc }}}
+  {{{ oneLineDoc }}} {{{ extendedDocLink }}}
 </dd>