Move extendedDocLink creation to ModelElementRenderer

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

@@ -797,7 +797,7 @@ abstract class ModelElement extends Canonicalization
   /// does not exist.
   String get extendedDocLink {
     if (hasExtendedDocumentation) {
-      return '<a href="${href}">[...]</a>';
+      return ModelElementRendererHtml().renderExtendedDocLink(this);
     }
     return '';
   }
@@ -977,19 +977,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>

lib/templates/_property.html

@@ -3,6 +3,6 @@
   <span class="signature">{{{ arrow }}} {{{ linkedReturnType }}}</span> {{>categorization}}
 </dt>
 <dd{{ #isInherited }} class="inherited"{{ /isInherited}}>
-  {{{ oneLineDoc }}}
+  {{{ oneLineDoc }}} {{{ extendedDocLink }}}
   {{>features}}
 </dd>

lib/templates/class.html

@@ -88,7 +88,7 @@ <h2>Constructors</h2>
           <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
         </dt>
         <dd>
-          {{{ oneLineDoc }}}
+          {{{ oneLineDoc }}} {{{ extendedDocLink }}}
           {{#isConst}}
           <div class="constructor-modifier features">const</div>
           {{/isConst}}

lib/templates/enum.html

@@ -91,7 +91,7 @@ <h2>Constructors</h2>
           <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
         </dt>
         <dd>
-          {{{ oneLineDoc }}}
+          {{{ oneLineDoc }}} {{{ extendedDocLink }}}
           {{#isConst}}
           <div class="constructor-modifier features">const</div>
           {{/isConst}}

lib/templates/mixin.html

@@ -88,7 +88,7 @@ <h2>Constructors</h2>
           <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
         </dt>
         <dd>
-          {{{ oneLineDoc }}}
+          {{{ oneLineDoc }}} {{{ extendedDocLink }}}
           {{#isConst}}
           <div class="constructor-modifier features">const</div>
           {{/isConst}}

test/model_test.dart

@@ -9,8 +9,9 @@ import 'dart:io';
 import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/render/category_renderer.dart';
-import 'package:dartdoc/src/render/parameter_renderer.dart';
 import 'package:dartdoc/src/render/enum_field_renderer.dart';
+import 'package:dartdoc/src/render/model_element_renderer.dart';
+import 'package:dartdoc/src/render/parameter_renderer.dart';
 import 'package:dartdoc/src/render/typedef_renderer.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:test/test.dart';
@@ -584,7 +585,7 @@ void main() {
       expect(
           fakeLibrary.oneLineDoc,
           equals(
-              'WOW FAKE PACKAGE IS <strong>BEST</strong> <a href="http://example.org">PACKAGE</a> <a href="fake/fake-library.html">[...]</a>'));
+              'WOW FAKE PACKAGE IS <strong>BEST</strong> <a href="http://example.org">PACKAGE</a>'));
     });
 
     test('has properties', () {
@@ -1196,7 +1197,7 @@ void main() {
       expect(
           add.oneLineDoc,
           equals(
-              'Adds <code>value</code> to the end of this list,\nextending the length by one. <a href="fake/SpecialList/add.html">[...]</a>'));
+              'Adds <code>value</code> to the end of this list,\nextending the length by one.'));
     });
 
     test(
@@ -1322,8 +1323,10 @@ void main() {
     });
 
     test('bullet points work in top level variables', () {
-      expect(bulletDoced.oneLineDoc,
-          contains('<a href="fake/bulletDoced-constant.html">[...]</a>'));
+      expect(
+          bulletDoced.extendedDocLink,
+          equals(
+              ModelElementRendererHtml().renderExtendedDocLink(bulletDoced)));
       expect(bulletDoced.documentationAsHtml, contains('<li>'));
     });
   });
@@ -2757,10 +2760,9 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('has extended documentation', () {
       expect(lengthX.hasExtendedDocumentation, isTrue);
-      expect(
-          lengthX.oneLineDoc,
-          equals(
-              'Returns a length. <a href="fake/WithGetterAndSetter/lengthX.html">[...]</a>'));
+      expect(lengthX.oneLineDoc, equals('Returns a length.'));
+      expect(lengthX.extendedDocLink,
+          equals(ModelElementRendererHtml().renderExtendedDocLink(lengthX)));
       expect(lengthX.documentation, contains('the fourth dimension'));
       expect(lengthX.documentation, isNot(contains('[...]')));
     });

testing/test_package_custom_templates/templates/class.html

@@ -18,7 +18,7 @@ <h2>Constructors</h2>
           {{{linkedName}}}({{{ linkedParams }}})
         </dt>
         <dd>
-          {{{ oneLineDoc }}}
+          {{{ oneLineDoc }}} {{{ extendedDocLink }}}
         </dd>
         {{/publicConstructors}}
       </dl>
@@ -30,7 +30,7 @@ <h2>Constructors</h2>
       <h2>Methods</h2>
       <dl>
         {{#allPublicInstanceMethods}}
-        {{{ oneLineDoc }}}
+        {{{ oneLineDoc }}} {{{ extendedDocLink }}}
         {{/allPublicInstanceMethods}}
       </dl>
     </section>

testing/test_package_custom_templates/templates/index.html

@@ -20,7 +20,7 @@ <h2>{{name}}</h2>
           {{/isFirstPackage}}
           <dl>
           {{#defaultCategory.publicLibraries}}
-            {{{ oneLineDoc }}}
+            {{{ oneLineDoc }}} {{{ extendedDocLink }}}
           {{/defaultCategory.publicLibraries}}
           {{#categoriesWithPublicLibraries}}
             <h3>{{name}}</h3>
@@ -29,7 +29,7 @@ <h3>{{name}}</h3>
                 {{{ linkedName }}}
               </dt>
               <dd>
-                {{#isDocumented}}{{{ oneLineDoc }}}{{/isDocumented}}
+                {{#isDocumented}}{{{ oneLineDoc }}} {{{ extendedDocLink }}}{{/isDocumented}}
               </dd>
             {{/publicLibraries}}
           {{/categoriesWithPublicLibraries}}

testing/test_package_custom_templates/templates/library.html

@@ -19,7 +19,7 @@ <h2>Classes</h2>
           {{{linkedName}}}{{{linkedGenericParameters}}}
         </dt>
         <dd>
-          {{{ oneLineDoc }}}
+          {{{ oneLineDoc }}} {{{ extendedDocLink }}}
         </dd>
         {{/library.publicClasses}}
       </dl>
@@ -33,7 +33,7 @@ <h2>Functions</h2>
       <dl>
         {{#library.publicFunctions}}
         {{{linkedName}}}{{{linkedGenericParameters}}}
-        {{{ oneLineDoc }}}
+        {{{ oneLineDoc }}} {{{ extendedDocLink }}}
         {{/library.publicFunctions}}
       </dl>
     </div>