Fix some tests and dartfmt

Author: jdkoren

lib/src/model/model_element.dart

@@ -1375,8 +1375,8 @@ abstract class ModelElement extends Canonicalization
       final String youTubeId = url.group(url.groupCount);
       final String aspectRatio = (height / width * 100).toStringAsFixed(2);
 
-      return ModelElementRendererHtml().renderYoutubeUrl(
-          youTubeId, aspectRatio);
+      return ModelElementRendererHtml()
+          .renderYoutubeUrl(youTubeId, aspectRatio);
     });
   }
 
@@ -1507,8 +1507,8 @@ abstract class ModelElement extends Canonicalization
                 'parameter)');
       }
 
-      return ModelElementRendererHtml().renderAnimation(
-          uniqueId, width, height, movieUrl, overlayId);
+      return ModelElementRendererHtml()
+          .renderAnimation(uniqueId, width, height, movieUrl, overlayId);
     });
   }
 

lib/src/model/type_parameter.dart

@@ -77,14 +77,11 @@ abstract class TypeParameters implements ModelElement {
   bool get hasGenericParameters => typeParameters.isNotEmpty;
 
   String get genericParameters {
-    if (typeParameters.isEmpty) return '';
-    return TypeParametersRendererHtml().renderGenericParameters(typeParameters);
+    return TypeParametersRendererHtml().renderGenericParameters(this);
   }
 
   String get linkedGenericParameters {
-    if (typeParameters.isEmpty) return '';
-    return TypeParametersRendererHtml()
-        .renderLinkedGenericParameters(typeParameters);
+    return TypeParametersRendererHtml().renderLinkedGenericParameters(this);
   }
 
   @override

lib/src/model/typedef.dart

@@ -21,16 +21,14 @@ class Typedef extends ModelElement
   String get nameWithGenerics => '$name${super.genericParameters}';
 
   @override
-  String get genericParameters {
+  String get genericParameters =>
+      TypedefRendererHtml().renderGenericParameters(this);
+
+  List<TypeParameterElement> get genericTypeParameters {
     if (element is GenericTypeAliasElement) {
-      List<TypeParameterElement> genericTypeParameters =
-          (element as GenericTypeAliasElement).function.typeParameters;
-      if (genericTypeParameters.isNotEmpty) {
-        return TypedefRendererHtml().renderGenericParameters(
-            genericTypeParameters);
-      }
-    } // else, all types are resolved.
-    return '';
+      return (element as GenericTypeAliasElement).function.typeParameters;
+    }
+    return Iterable.empty();
   }
 
   @override

lib/src/render/type_parameters_renderer.dart

@@ -5,22 +5,28 @@
 import 'package:dartdoc/src/model/type_parameter.dart';
 
 abstract class TypeParametersRenderer {
-  String renderGenericParameters(List<TypeParameter> typeParameters);
-  String renderLinkedGenericParameters(List<TypeParameter> typeParameters);
+  String renderGenericParameters(TypeParameters typeParameters);
+  String renderLinkedGenericParameters(TypeParameters typeParameters);
 }
 
 class TypeParametersRendererHtml extends TypeParametersRenderer {
   @override
-  String renderGenericParameters(List<TypeParameter> typeParameters) {
-    var joined = typeParameters
+  String renderGenericParameters(TypeParameters typeParameters) {
+    if (typeParameters.typeParameters.isEmpty) {
+      return '';
+    }
+    var joined = typeParameters.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
+  String renderLinkedGenericParameters(TypeParameters typeParameters) {
+    if (typeParameters.typeParameters.isEmpty) {
+      return '';
+    }
+    var joined = typeParameters.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

@@ -2,16 +2,19 @@
 // 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';
+import 'package:dartdoc/src/model/typedef.dart';
 
 abstract class TypedefRenderer {
-  String renderGenericParameters(List<TypeParameterElement> typeParameters);
+  String renderGenericParameters(Typedef typedef);
 }
 
 class TypedefRendererHtml extends TypedefRenderer {
   @override
-  String renderGenericParameters(List<TypeParameterElement> typeParameters) {
-    var joined = typeParameters
+  String renderGenericParameters(Typedef typedef) {
+    if (typedef.genericTypeParameters.isEmpty) {
+      return '';
+    }
+    var joined = typedef.genericTypeParameters
         .map((t) => t.name)
         .join('</span>, <span class="type-parameter">');
     return '&lt;<wbr><span class="type-parameter">${joined}</span>&gt;';

test/model_special_cases_test.dart

@@ -459,7 +459,7 @@ void main() {
               PackageWarning.invalidParameter,
               'A @youtube directive has an invalid URL: '
               '"http://host/path/to/video.mp4". Supported YouTube URLs have '
-              'the follwing format: '
+              'the following format: '
               'https://www.youtube.com/watch?v=oHg5SJYRHA0.'),
           isTrue);
     });
@@ -470,7 +470,7 @@ void main() {
               PackageWarning.invalidParameter,
               'A @youtube directive has an invalid URL: '
               '"https://www.youtube.com/watch?v=yI-8QHpGIP4&list=PLjxrf2q8roU23XGwz3Km7sQZFTdB996iG&index=5". '
-              'Supported YouTube URLs have the follwing format: '
+              'Supported YouTube URLs have the following format: '
               'https://www.youtube.com/watch?v=oHg5SJYRHA0.'),
           isTrue);
     });

test/model_test.dart

@@ -11,6 +11,7 @@ import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart';
 import 'package:dartdoc/src/render/category_renderer.dart';
 import 'package:dartdoc/src/render/enum_field_renderer.dart';
+import 'package:dartdoc/src/render/typedef_renderer.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:test/test.dart';
 
@@ -1987,8 +1988,7 @@ void main() {
     test("has a (synthetic) values constant", () {
       var valuesField = animal.constants.firstWhere((f) => f.name == 'values');
       expect(valuesField, isNotNull);
-      expect(
-          valuesField.constantValue,
+      expect(valuesField.constantValue,
           equals(EnumFieldRendererHtml().renderValue(valuesField)));
       expect(valuesField.documentation, startsWith('A constant List'));
     });
@@ -3408,9 +3408,9 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     // 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,
+    test("TypedefRendererHtml renders genericParameters", () {
+      expect(TypedefRendererHtml().renderGenericParameters(t), equals(''));
+      expect(TypedefRendererHtml().renderGenericParameters(generic),
           equals('&lt;<wbr><span class="type-parameter">S</span>&gt;'));
     });
   });