Remove HtmlRenderFactory. (#3666)

kallentu · web-flow · commit 13ca5bc1afd6 · 2024-02-21T15:50:35.000-08:00
diff --git a/lib/resources/docs.dart.js.map b/lib/resources/docs.dart.js.map
diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
@@ -166,7 +166,7 @@ class FunctionTypeElementType extends UndefinedElementType
 
   @override
   ElementTypeRenderer get _renderer =>
-      packageGraph.rendererFactory.functionTypeElementTypeRenderer;
+      const FunctionTypeElementTypeRendererHtml();
 }
 
 /// A [RecordType] which does not have an underpinning Element.
@@ -178,8 +178,7 @@ class RecordElementType extends UndefinedElementType with Rendered {
   String get name => 'Record';
 
   @override
-  ElementTypeRenderer get _renderer =>
-      packageGraph.rendererFactory.recordElementTypeRenderer;
+  ElementTypeRenderer get _renderer => const RecordElementTypeRendererHtml();
 
   List<RecordTypeField> get positionalFields => type.positionalFields;
 
@@ -204,7 +203,7 @@ class AliasedUndefinedElementType extends UndefinedElementType
 
   @override
   ElementTypeRenderer get _renderer =>
-      packageGraph.rendererFactory.aliasedUndefinedElementTypeRenderer;
+      const AliasedUndefinedElementTypeRendererHtml();
 }
 
 class ParameterizedElementType extends DefinedElementType with Rendered {
@@ -217,7 +216,7 @@ class ParameterizedElementType extends DefinedElementType with Rendered {
 
   @override
   ElementTypeRenderer<ParameterizedElementType> get _renderer =>
-      packageGraph.rendererFactory.parameterizedElementTypeRenderer;
+      const ParameterizedElementTypeRendererHtml();
 
   @override
   late final List<ElementType> typeArguments = type.typeArguments
@@ -254,7 +253,7 @@ class AliasedElementType extends ParameterizedElementType with Aliased {
 
   @override
   ElementTypeRenderer<AliasedElementType> get _renderer =>
-      packageGraph.rendererFactory.aliasedElementTypeRenderer;
+      const AliasedElementTypeRendererHtml();
 }
 
 class TypeParameterElementType extends DefinedElementType {
@@ -419,7 +418,7 @@ class CallableElementType extends DefinedElementType with Rendered, Callable {
 
   @override
   ElementTypeRenderer<CallableElementType> get _renderer =>
-      packageGraph.rendererFactory.callableElementTypeRenderer;
+      const CallableElementTypeRendererHtml();
 
   @override
   late final List<ElementType> typeArguments = type.alias?.typeArguments
diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart
@@ -16923,7 +16923,6 @@ const _invisibleGetters = {
     'publicPackages',
     'referenceChildren',
     'referenceParents',
-    'rendererFactory',
     'resourceProvider',
     'runtimeType',
     'sdkLibrarySources',
diff --git a/lib/src/model/accessor.dart b/lib/src/model/accessor.dart
@@ -49,8 +49,7 @@ class Accessor extends ModelElement implements EnclosedElement {
 
   bool get isSynthetic => element.isSynthetic;
 
-  SourceCodeRenderer get _sourceCodeRenderer =>
-      packageGraph.rendererFactory.sourceCodeRenderer;
+  SourceCodeRenderer get _sourceCodeRenderer => const SourceCodeRendererHtml();
 
   // The [enclosingCombo] where this element was defined.
   late final GetterSetterCombo definingCombo =
diff --git a/lib/src/model/documentation.dart b/lib/src/model/documentation.dart
@@ -78,6 +78,5 @@ class Documentation {
     return document.parseMarkdownText(text, processFullText: processFullText);
   }
 
-  DocumentationRenderer get _renderer =>
-      _element.packageGraph.rendererFactory.documentationRenderer;
+  DocumentationRenderer get _renderer => const DocumentationRendererHtml();
 }
diff --git a/lib/src/model/enum.dart b/lib/src/model/enum.dart
@@ -141,6 +141,5 @@ class EnumField extends Field {
   @override
   Inheritable? get overriddenElement => null;
 
-  EnumFieldRenderer get _fieldRenderer =>
-      packageGraph.rendererFactory.enumFieldRenderer;
+  EnumFieldRenderer get _fieldRenderer => const EnumFieldRendererHtml();
 }
diff --git a/lib/src/model/field.dart b/lib/src/model/field.dart
@@ -149,8 +149,7 @@ class Field extends ModelElement
   @override
   String? get belowSidebarPath => null;
 
-  SourceCodeRenderer get _sourceCodeRenderer =>
-      packageGraph.rendererFactory.sourceCodeRenderer;
+  SourceCodeRenderer get _sourceCodeRenderer => const SourceCodeRendererHtml();
 
   late final String _sourceCode = () {
     // We could use a set to figure the dupes out, but that would lose ordering.
diff --git a/lib/src/model/inheriting_container.dart b/lib/src/model/inheriting_container.dart
@@ -11,6 +11,7 @@ import 'package:dartdoc/src/model/container_modifiers.dart';
 import 'package:dartdoc/src/model/language_feature.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart' as model_utils;
+import 'package:dartdoc/src/render/language_feature_renderer.dart';
 import 'package:meta/meta.dart';
 
 /// A mixin to build an [InheritingContainer] capable of being constructed
@@ -100,8 +101,7 @@ abstract class InheritingContainer extends Container
   @override
   late final List<LanguageFeature> displayedLanguageFeatures =
       containerModifiers
-          .asLanguageFeatureSet(
-              packageGraph.rendererFactory.languageFeatureRenderer)
+          .asLanguageFeatureSet(const LanguageFeatureRendererHtml())
           .toList();
 
   late final List<ModelElement> _allModelElements = () {
diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart
@@ -721,16 +721,14 @@ abstract class ModelElement extends Canonicalization
   @visibleForTesting
   @override
   ModelElementRenderer get modelElementRenderer =>
-      packageGraph.rendererFactory.modelElementRenderer;
+      const ModelElementRendererHtml();
 
-  ParameterRenderer get _parameterRenderer =>
-      packageGraph.rendererFactory.parameterRenderer;
+  ParameterRenderer get _parameterRenderer => const ParameterRendererHtml();
 
   ParameterRenderer get _parameterRendererDetailed =>
-      packageGraph.rendererFactory.parameterRendererDetailed;
+      const ParameterRendererHtmlList();
 
-  SourceCodeRenderer get _sourceCodeRenderer =>
-      packageGraph.rendererFactory.sourceCodeRenderer;
+  SourceCodeRenderer get _sourceCodeRenderer => const SourceCodeRendererHtml();
 
   String get linkedParams => _parameterRenderer.renderLinkedParams(parameters);
 
diff --git a/lib/src/model/package_builder.dart b/lib/src/model/package_builder.dart
@@ -27,7 +27,6 @@ import 'package:dartdoc/src/model/model.dart' hide Package;
 import 'package:dartdoc/src/package_config_provider.dart';
 import 'package:dartdoc/src/package_meta.dart'
     show PackageMeta, PackageMetaProvider;
-import 'package:dartdoc/src/render/renderer_factory.dart';
 import 'package:dartdoc/src/runtime_stats.dart';
 import 'package:dartdoc/src/special_elements.dart';
 import 'package:meta/meta.dart';
@@ -63,7 +62,6 @@ class PubPackageBuilder implements PackageBuilder {
       }
     }
 
-    var rendererFactory = const HtmlRenderFactory();
     runtimeStats.resetAccumulators([
       'elementTypeInstantiation',
       'modelElementCacheInsertion',
@@ -78,7 +76,6 @@ class PubPackageBuilder implements PackageBuilder {
       _config,
       _sdk,
       _embedderSdkUris.isNotEmpty,
-      rendererFactory,
       _packageMetaProvider,
     );
     await _getLibraries(newGraph);
diff --git a/lib/src/model/package_graph.dart b/lib/src/model/package_graph.dart
@@ -26,7 +26,6 @@ import 'package:dartdoc/src/model/model_object_builder.dart';
 import 'package:dartdoc/src/model_utils.dart' as utils;
 import 'package:dartdoc/src/package_meta.dart'
     show PackageMeta, PackageMetaProvider;
-import 'package:dartdoc/src/render/renderer_factory.dart';
 import 'package:dartdoc/src/special_elements.dart';
 import 'package:dartdoc/src/tool_definition.dart';
 import 'package:dartdoc/src/tool_runner.dart';
@@ -38,7 +37,6 @@ class PackageGraph with CommentReferable, Nameable, ModelBuilder {
     this.config,
     DartSdk sdk,
     this.hasEmbedderSdk,
-    this.rendererFactory,
     this.packageMetaProvider,
   )   : packageMeta = config.topLevelPackageMeta,
         sdkLibrarySources = {
@@ -346,9 +344,6 @@ class PackageGraph with CommentReferable, Nameable, ModelBuilder {
   /// Dartdoc's configuration flags.
   final DartdocOptionContext config;
 
-  /// Factory for HTML rendering.
-  final HtmlRenderFactory rendererFactory;
-
   /// PackageMeta Provider for building [PackageMeta]s.
   final PackageMetaProvider packageMetaProvider;
 
diff --git a/lib/src/model/type_parameter.dart b/lib/src/model/type_parameter.dart
@@ -82,5 +82,5 @@ mixin TypeParameters implements ModelElement {
   List<TypeParameter> get typeParameters;
 
   TypeParametersRenderer get _typeParametersRenderer =>
-      packageGraph.rendererFactory.typeParametersRenderer;
+      const TypeParametersRendererHtml();
 }
diff --git a/lib/src/model/typedef.dart b/lib/src/model/typedef.dart
@@ -68,7 +68,7 @@ abstract class Typedef extends ModelElement
       .map((f) => modelBuilder.from(f, library) as TypeParameter)
       .toList(growable: false);
 
-  TypedefRenderer get _renderer => packageGraph.rendererFactory.typedefRenderer;
+  TypedefRenderer get _renderer => const TypedefRendererHtml();
 
   @override
   Iterable<CommentReferable> get referenceParents => [definingLibrary];
diff --git a/lib/src/render/renderer_factory.dart b/lib/src/render/renderer_factory.dart

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,5 @@ class Documentation {`
`78`	`78`	`return document.parseMarkdownText(text, processFullText: processFullText);`
`79`	`79`	`}`
`80`	`80`
`81`		`- DocumentationRenderer get _renderer =>`
`82`		`- _element.packageGraph.rendererFactory.documentationRenderer;`
	`81`	`+ DocumentationRenderer get _renderer => const DocumentationRendererHtml();`
`83`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,5 @@ class EnumField extends Field {`
`141`	`141`	`@override`
`142`	`142`	`Inheritable? get overriddenElement => null;`
`143`	`143`
`144`		`- EnumFieldRenderer get _fieldRenderer =>`
`145`		`- packageGraph.rendererFactory.enumFieldRenderer;`
	`144`	`+ EnumFieldRenderer get _fieldRenderer => const EnumFieldRendererHtml();`
`146`	`145`	`}`