Create renderers for Typedef & TypeParamaters

Author: jdkoren

lib/src/model/type_parameter.dart

@@ -5,6 +5,7 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/model.dart';
+import 'package:dartdoc/src/render/type_parameters_renderer.dart';
 
 class TypeParameter extends ModelElement {
   TypeParameter(
@@ -77,20 +78,13 @@ abstract class TypeParameters implements ModelElement {
 
   String get genericParameters {
     if (typeParameters.isEmpty) return '';
-
-    var joined = typeParameters
-        .map((t) => t.name)
-        .join('</span>, <span class="type-parameter">');
-    return '&lt;<wbr><span class="type-parameter">${joined}</span>&gt;';
+    return TypeParametersRendererHtml().renderGenericParameters(typeParameters);
   }
 
   String get linkedGenericParameters {
     if (typeParameters.isEmpty) return '';
-
-    var joined = typeParameters
-        .map((t) => t.linkedName)
-        .join('</span>, <span class="type-parameter">');
-    return '<span class="signature">&lt;<wbr><span class="type-parameter">${joined}</span>&gt;</span>';
+    return TypeParametersRendererHtml()
+        .renderLinkedGenericParameters(typeParameters);
   }
 
   @override

lib/src/model/typedef.dart

@@ -5,6 +5,7 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/model.dart';
+import 'package:dartdoc/src/render/typedef_renderer.dart';
 
 class Typedef extends ModelElement
     with SourceCodeMixin, TypeParameters, Categorization
@@ -25,10 +26,8 @@ class Typedef extends ModelElement
       List<TypeParameterElement> genericTypeParameters =
           (element as GenericTypeAliasElement).function.typeParameters;
       if (genericTypeParameters.isNotEmpty) {
-        var joined = genericTypeParameters
-            .map((t) => t.name)
-            .join('</span>, <span class="type-parameter">');
-        return '&lt;<wbr><span class="type-parameter">${joined}</span>&gt;';
+        return TypedefRendererHtml().renderGenericParameters(
+            genericTypeParameters);
       }
     } // else, all types are resolved.
     return '';

lib/src/render/type_parameters_renderer.dart

@@ -0,0 +1,28 @@
+// Copyright (c) 2019, 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.
+
+import 'package:dartdoc/src/model/type_parameter.dart';
+
+abstract class TypeParametersRenderer {
+  String renderGenericParameters(List<TypeParameter> typeParameters);
+  String renderLinkedGenericParameters(List<TypeParameter> typeParameters);
+}
+
+class TypeParametersRendererHtml extends TypeParametersRenderer {
+  @override
+  String renderGenericParameters(List<TypeParameter> typeParameters) {
+    var joined = typeParameters
+        .map((t) => t.name)
+        .join('</span>, <span class="type-parameter">');
+    return '&lt;<wbr><span class="type-parameter">${joined}</span>&gt;';
+  }
+
+  @override
+  String renderLinkedGenericParameters(List<TypeParameter> typeParameters) {
+    var joined = typeParameters
+        .map((t) => t.linkedName)
+        .join('</span>, <span class="type-parameter">');
+    return '<span class="signature">&lt;<wbr><span class="type-parameter">${joined}</span>&gt;</span>';
+  }
+}

lib/src/render/typedef_renderer.dart

@@ -0,0 +1,19 @@
+// Copyright (c) 2019, 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.
+
+import 'package:analyzer/dart/element/element.dart';
+
+abstract class TypedefRenderer {
+  String renderGenericParameters(List<TypeParameterElement> typeParameters);
+}
+
+class TypedefRendererHtml extends TypedefRenderer {
+  @override
+  String renderGenericParameters(List<TypeParameterElement> typeParameters) {
+    var joined = typeParameters
+        .map((t) => t.name)
+        .join('</span>, <span class="type-parameter">');
+    return '&lt;<wbr><span class="type-parameter">${joined}</span>&gt;';
+  }
+}

test/model_test.dart

@@ -3411,7 +3411,10 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
               'NewGenericTypedef&lt;<wbr><span class="type-parameter">T</span>&gt;'));
     });
 
-    test("generic parameters", () {
+    // TODO(jdkoren): Not easy to call TypedefRenderer directly because Typedef
+    // inspects its element member. Find a better way when we start to isolate
+    // renderer tests.
+    test("render generic parameters HTML", () {
       expect(t.genericParameters, equals(''));
       expect(generic.genericParameters,
           equals('&lt;<wbr><span class="type-parameter">S</span>&gt;'));