Fix annotation templates and renderer (#2605)

* Fix annotation templates and renderer

* remove extra annotation

Author: jcollins-g

lib/src/generator/templates.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// Annotations only appear on other pages, so there is no template data here.
+@Renderer(#renderAnnotation, Context<Annotation>())
 @Renderer(#renderCategory, Context<CategoryTemplateData>(),
     visibleTypes: _visibleTypes)
 @Renderer(#renderClass, Context<ClassTemplateData>())
@@ -28,6 +30,7 @@ import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/options.dart';
 import 'package:dartdoc/src/generator/resource_loader.dart';
 import 'package:dartdoc/src/generator/template_data.dart';
+import 'package:dartdoc/src/model/annotation.dart';
 import 'package:dartdoc/src/model/feature_set.dart';
 import 'package:dartdoc/src/model/language_feature.dart';
 import 'package:dartdoc/src/mustachio/annotations.dart';
@@ -36,6 +39,7 @@ import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path show Context;
 
 const _visibleTypes = {
+  Annotation,
   CallableElementTypeMixin,
   Category,
   Class,

lib/src/generator/templates.renderers.dart

@@ -2,7 +2,7 @@
 <div>
   <ol class="annotation-list">
     {{#annotations}}
-    <li>{{{.}}}</li>
+    <li>{{{linkedNameWithParameters}}}</li>
     {{/annotations}}
   </ol>
 </div>

lib/templates/html/_callable_multiline.html

@@ -2,7 +2,7 @@
 <div>
   <ol class="annotation-list">
     {{#annotations}}
-    <li>{{{.}}}</li>
+    <li>{{{linkedNameWithParameters}}}</li>
     {{/annotations}}
   </ol>
 </div>

lib/templates/html/_type_multiline.html

@@ -70,7 +70,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
         <dt>Annotations</dt>
         <dd><ul class="annotation-list clazz-relationships">
           {{#annotations}}
-          <li>{{{.}}}</li>
+          <li>{{{linkedNameWithParameters}}}</li>
           {{/annotations}}
         </ul></dd>
         {{/hasAnnotations}}

lib/templates/html/class.html

@@ -17,7 +17,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
       <div>
         <ol class="annotation-list">
           {{#annotations}}
-          <li>{{{.}}}</li>
+          <li>{{{linkedNameWithParameters}}}</li>
           {{/annotations}}
         </ol>
       </div>

lib/templates/html/constructor.html

@@ -61,7 +61,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
         <dt>Annotations</dt>
         <dd><ul class="annotation-list eNum-relationships">
           {{#annotations}}
-          <li>{{{.}}}</li>
+          <li>{{{linkedNameWithParameters}}}</li>
           {{/annotations}}
         </ul></dd>
         {{/hasAnnotations}}

lib/templates/html/enum.html

@@ -70,7 +70,7 @@ <h5>{{parent.name}} {{parent.kind}}</h5>
         <dt>Annotations</dt>
         <dd><ul class="annotation-list mixin-relationships">
           {{#annotations}}
-          <li>{{{.}}}</li>
+          <li>{{{linkedNameWithParameters}}}</li>
           {{/annotations}}
         </ul></dd>
         {{/hasAnnotations}}

lib/templates/html/mixin.html

@@ -1,6 +1,6 @@
 {{#hasAnnotations}}
 {{#annotations}}
-- {{{.}}}
+- {{{linkedNameWithParameters}}}
 {{/annotations}}
 {{/hasAnnotations}}
 

lib/templates/md/_callable_multiline.md

@@ -1,6 +1,6 @@
 {{#hasAnnotations}}
 {{#annotations}}
-- {{{.}}}
+- {{{linkedNameWithParameters}}}
 {{/annotations}}
 {{/hasAnnotations}}
 

lib/templates/md/_type_multiline.md

@@ -58,7 +58,7 @@
 **Annotations**
 
 {{#annotations}}
-- {{{.}}}
+- {{{linkedNameWithParameters}}}
 {{/annotations}}
 {{/hasAnnotations}}
 {{/hasModifiers}}

lib/templates/md/class.md

@@ -10,7 +10,7 @@
 {{#constructor}}
 {{#hasAnnotations}}
 {{#annotations}}
-- {{{.}}}
+- {{{linkedNameWithParameters}}}
 {{/annotations}}
 {{/hasAnnotations}}
 

lib/templates/md/constructor.md

@@ -49,7 +49,7 @@
 **Annotations**
 
 {{#annotations}}
-- {{{.}}}
+- {{{linkedNameWithParameters}}}
 {{/annotations}}
 {{/hasAnnotations}}
 {{/hasModifiers}}

lib/templates/md/enum.md

@@ -58,7 +58,7 @@
 **Annotations**
 
 {{#annotations}}
-- {{{.}}}
+- {{{linkedNameWithParameters}}}
 {{/annotations}}
 {{/hasAnnotations}}
 {{/hasModifiers}}

lib/templates/md/mixin.md

@@ -8,6 +8,8 @@
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/generator/template_data.dart';
+import 'package:dartdoc/src/model/annotation.dart';
+import 'package:dartdoc/src/model/feature.dart';
 import 'package:dartdoc/src/model/extension_target.dart';
 import 'package:dartdoc/src/model/feature_set.dart';
 import 'package:dartdoc/src/model/language_feature.dart';

test/mustachio/foo.renderers.dart

@@ -90,6 +90,8 @@ class RuntimeRenderersBuilder {
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/generator/template_data.dart';
+import 'package:dartdoc/src/model/annotation.dart';
+import 'package:dartdoc/src/model/feature.dart';
 import 'package:dartdoc/src/model/extension_target.dart';
 import 'package:dartdoc/src/model/feature_set.dart';
 import 'package:dartdoc/src/model/language_feature.dart';