Skip to content

Commit e8ee798

Browse files
authored
Remove EnumFieldRenderer. (#3716)
1 parent 89a3b4a commit e8ee798

File tree

3 files changed

+13
-35
lines changed

3 files changed

+13
-35
lines changed

lib/src/model/enum.dart

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:analyzer/dart/analysis/features.dart';
66
import 'package:analyzer/dart/element/element.dart';
77
import 'package:dartdoc/src/model/model.dart';
88
import 'package:dartdoc/src/model_utils.dart' as model_utils;
9-
import 'package:dartdoc/src/render/enum_field_renderer.dart';
9+
import 'package:meta/meta.dart';
1010

1111
class Enum extends InheritingContainer with Constructable, MixedInTypes {
1212
@override
@@ -97,7 +97,7 @@ class EnumField extends Field {
9797
String get constantValueBase =>
9898
element.library.featureSet.isEnabled(Feature.enhanced_enums)
9999
? super.constantValueBase
100-
: _fieldRenderer.renderValue(this);
100+
: renderedName;
101101

102102
@override
103103
List<DocumentationComment> get documentationFrom {
@@ -118,7 +118,10 @@ class EnumField extends Field {
118118
}
119119

120120
@override
121-
String get linkedName => _fieldRenderer.renderLinkedName(this);
121+
String get linkedName {
122+
var cssClass = isDeprecated ? ' class="deprecated"' : '';
123+
return '<a$cssClass href="$href#$htmlId">$name</a>';
124+
}
122125

123126
@override
124127
bool get isCanonical {
@@ -137,5 +140,10 @@ class EnumField extends Field {
137140
@override
138141
Inheritable? get overriddenElement => null;
139142

140-
EnumFieldRenderer get _fieldRenderer => const EnumFieldRendererHtml();
143+
@visibleForTesting
144+
String get renderedName => name == 'values'
145+
? 'const List&lt;<wbr>'
146+
'<span class="type-parameter">${enclosingElement.name}</span>'
147+
'&gt;'
148+
: constantValue;
141149
}

lib/src/render/enum_field_renderer.dart

Lines changed: 0 additions & 28 deletions
This file was deleted.

test/enum_test.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import 'package:dartdoc/src/model/model.dart';
66
import 'package:dartdoc/src/model_utils.dart';
7-
import 'package:dartdoc/src/render/enum_field_renderer.dart';
87
import 'package:test/test.dart';
98
import 'package:test_reflective_loader/test_reflective_loader.dart';
109

@@ -603,8 +602,7 @@ enum E {
603602
var oneValue =
604603
library.enums.named('E').publicEnumValues.named('one') as EnumField;
605604
expect(oneValue.linkedName, '<a href="$linkPrefix/E.html#one">one</a>');
606-
expect(oneValue.constantValue,
607-
equals(EnumFieldRendererHtml().renderValue(oneValue)));
605+
expect(oneValue.constantValue, equals(oneValue.renderedName));
608606
}
609607

610608
void test_values_haveIndices() async {

0 commit comments

Comments
 (0)