Remove SourceCodeRenderer and TypeParametersRenderer. (#3683)

Author: kallentu

Diff for: lib/src/model/accessor.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.
 
+import 'dart:convert';
+
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/line_info.dart';
 // ignore: implementation_imports
@@ -10,7 +12,6 @@ import 'package:collection/collection.dart' show IterableExtension;
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/model.dart';
-import 'package:dartdoc/src/render/source_code_renderer.dart';
 import 'package:dartdoc/src/utils.dart';
 import 'package:dartdoc/src/warnings.dart';
 
@@ -49,8 +50,6 @@ class Accessor extends ModelElement implements EnclosedElement {
 
   bool get isSynthetic => element.isSynthetic;
 
-  SourceCodeRenderer get _sourceCodeRenderer => const SourceCodeRendererHtml();
-
   // The [enclosingCombo] where this element was defined.
   late final GetterSetterCombo definingCombo =
       getModelForElement(element.variable) as GetterSetterCombo;
@@ -62,7 +61,7 @@ class Accessor extends ModelElement implements EnclosedElement {
     var modelNode = packageGraph.getModelNodeFor(definingCombo.element);
     return modelNode == null
         ? ''
-        : _sourceCodeRenderer.renderSourceCode(modelNode.sourceCode);
+        : const HtmlEscape().convert(modelNode.sourceCode);
   }
 
   @override

Diff for: lib/src/model/field.dart

@@ -2,10 +2,11 @@
 // 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 'dart:convert';
+
 import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/model/attribute.dart';
 import 'package:dartdoc/src/model/model.dart';
-import 'package:dartdoc/src/render/source_code_renderer.dart';
 
 class Field extends ModelElement
     with GetterSetterCombo, ContainerMember, Inheritable
@@ -149,16 +150,14 @@ class Field extends ModelElement
   @override
   String? get belowSidebarPath => null;
 
-  SourceCodeRenderer get _sourceCodeRenderer => const SourceCodeRendererHtml();
-
   late final String _sourceCode = () {
     // We could use a set to figure the dupes out, but that would lose ordering.
     var fieldSourceCode = modelNode?.sourceCode ?? '';
     var getterSourceCode = getter?.sourceCode ?? '';
     var setterSourceCode = setter?.sourceCode ?? '';
     var buffer = StringBuffer();
     if (fieldSourceCode.isNotEmpty) {
-      fieldSourceCode = _sourceCodeRenderer.renderSourceCode(fieldSourceCode);
+      fieldSourceCode = const HtmlEscape().convert(fieldSourceCode);
       buffer.write(fieldSourceCode);
     }
     if (buffer.isNotEmpty) buffer.write('\n\n');

Diff for: lib/src/model/model_element.dart

@@ -25,7 +25,6 @@ import 'package:dartdoc/src/model/prefix.dart';
 import 'package:dartdoc/src/model_utils.dart' as utils;
 import 'package:dartdoc/src/render/model_element_renderer.dart';
 import 'package:dartdoc/src/render/parameter_renderer.dart';
-import 'package:dartdoc/src/render/source_code_renderer.dart';
 import 'package:dartdoc/src/runtime_stats.dart';
 import 'package:dartdoc/src/source_linker.dart';
 import 'package:dartdoc/src/special_elements.dart';
@@ -686,8 +685,6 @@ abstract class ModelElement extends Canonicalization
   ParameterRenderer get _parameterRendererDetailed =>
       const ParameterRendererHtmlList();
 
-  SourceCodeRenderer get _sourceCodeRenderer => const SourceCodeRendererHtml();
-
   String get linkedParams => _parameterRenderer.renderLinkedParams(parameters);
 
   String get linkedParamsLines =>
@@ -757,8 +754,7 @@ abstract class ModelElement extends Canonicalization
   }();
 
   @override
-  late final String sourceCode =
-      _sourceCodeRenderer.renderSourceCode(super.sourceCode);
+  late final String sourceCode = const HtmlEscape().convert(super.sourceCode);
 
   @override
   int compareTo(Object other) {

Diff for: lib/src/model/type_parameter.dart

@@ -6,7 +6,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/element_type.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
 import 'package:dartdoc/src/model/model.dart';
-import 'package:dartdoc/src/render/type_parameters_renderer.dart';
 
 class TypeParameter extends ModelElement with HasNoPage {
   @override
@@ -73,14 +72,28 @@ mixin TypeParameters implements ModelElement {
 
   bool get hasGenericParameters => typeParameters.isNotEmpty;
 
-  String get genericParameters =>
-      _typeParametersRenderer.renderGenericParameters(this);
+  String get genericParameters => _renderTypeParameters();
 
-  String get linkedGenericParameters =>
-      _typeParametersRenderer.renderLinkedGenericParameters(this);
+  String get linkedGenericParameters => _renderTypeParameters(isLinked: true);
 
   List<TypeParameter> get typeParameters;
 
-  TypeParametersRenderer get _typeParametersRenderer =>
-      const TypeParametersRendererHtml();
+  String _renderTypeParameters({bool isLinked = false}) {
+    if (typeParameters.isEmpty) {
+      return '';
+    }
+    var joined = typeParameters
+        .map((t) => [
+              ...t.annotations.map((a) => a.linkedNameWithParameters),
+              isLinked ? t.linkedName : t.name
+            ].join(' '))
+        .join('</span>, <span class="type-parameter">');
+    var typeParametersString =
+        '&lt;<wbr><span class="type-parameter">$joined</span>&gt;';
+    if (isLinked) {
+      typeParametersString =
+          '<span class="signature">$typeParametersString</span>';
+    }
+    return typeParametersString;
+  }
 }