Skip to content

Commit 5b36489

Browse files
srawlinssrawlins
authored
Tidy up generated mustache renderers; remove unused functions (#2606)
1 parent 5c1900d commit 5b36489

File tree

4 files changed

+101
-194
lines changed

4 files changed

+101
-194
lines changed

‎lib/src/generator/templates.renderers.dart

Lines changed: 1 addition & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
// files in the tool/mustachio/ directory.
55

66
// ignore_for_file: camel_case_types, deprecated_member_use_from_same_package
7-
// ignore_for_file: unnecessary_cast, unused_element, unused_import, non_constant_identifier_names
8-
import 'package:analyzer/file_system/file_system.dart';
7+
// ignore_for_file: unused_import
98
import 'package:dartdoc/dartdoc.dart';
109
import 'package:dartdoc/src/generator/template_data.dart';
1110
import 'package:dartdoc/src/model/annotation.dart';
@@ -198,14 +197,6 @@ class _Renderer_Annotation extends RendererBase<Annotation> {
198197
}
199198
}
200199

201-
String _render_Object(
202-
Object context, List<MustachioNode> ast, Template template,
203-
{RendererBase<Object> parent}) {
204-
var renderer = _Renderer_Object(context, parent, template);
205-
renderer.renderBlock(ast);
206-
return renderer.buffer.toString();
207-
}
208-
209200
class _Renderer_Object extends RendererBase<Object> {
210201
static final Map<Type, Object> _propertyMapCache = {};
211202
static Map<String, Property<CT_>> propertyMap<CT_ extends Object>() =>
@@ -4971,14 +4962,6 @@ class _Renderer_ElementType extends RendererBase<ElementType> {
49714962
}
49724963
}
49734964

4974-
String _render_Privacy(
4975-
Privacy context, List<MustachioNode> ast, Template template,
4976-
{RendererBase<Object> parent}) {
4977-
var renderer = _Renderer_Privacy(context, parent, template);
4978-
renderer.renderBlock(ast);
4979-
return renderer.buffer.toString();
4980-
}
4981-
49824965
class _Renderer_Privacy extends RendererBase<Privacy> {
49834966
static final Map<Type, Object> _propertyMapCache = {};
49844967
static Map<String, Property<CT_>> propertyMap<CT_ extends Privacy>() =>
@@ -5009,14 +4992,6 @@ class _Renderer_Privacy extends RendererBase<Privacy> {
50094992
}
50104993
}
50114994

5012-
String _render_Nameable(
5013-
Nameable context, List<MustachioNode> ast, Template template,
5014-
{RendererBase<Object> parent}) {
5015-
var renderer = _Renderer_Nameable(context, parent, template);
5016-
renderer.renderBlock(ast);
5017-
return renderer.buffer.toString();
5018-
}
5019-
50204995
class _Renderer_Nameable extends RendererBase<Nameable> {
50214996
static final Map<Type, Object> _propertyMapCache = {};
50224997
static Map<String, Property<CT_>> propertyMap<CT_ extends Nameable>() =>
@@ -5111,14 +5086,6 @@ class _Renderer_Nameable extends RendererBase<Nameable> {
51115086
}
51125087
}
51135088

5114-
String _render_SourceCodeMixin(
5115-
SourceCodeMixin context, List<MustachioNode> ast, Template template,
5116-
{RendererBase<Object> parent}) {
5117-
var renderer = _Renderer_SourceCodeMixin(context, parent, template);
5118-
renderer.renderBlock(ast);
5119-
return renderer.buffer.toString();
5120-
}
5121-
51225089
class _Renderer_SourceCodeMixin extends RendererBase<SourceCodeMixin> {
51235090
static final Map<Type, Object> _propertyMapCache = {};
51245091
static Map<String, Property<CT_>> propertyMap<
@@ -5226,14 +5193,6 @@ class _Renderer_SourceCodeMixin extends RendererBase<SourceCodeMixin> {
52265193
}
52275194
}
52285195

5229-
String _render_Indexable(
5230-
Indexable context, List<MustachioNode> ast, Template template,
5231-
{RendererBase<Object> parent}) {
5232-
var renderer = _Renderer_Indexable(context, parent, template);
5233-
renderer.renderBlock(ast);
5234-
return renderer.buffer.toString();
5235-
}
5236-
52375196
class _Renderer_Indexable extends RendererBase<Indexable> {
52385197
static final Map<Type, Object> _propertyMapCache = {};
52395198
static Map<String, Property<CT_>> propertyMap<CT_ extends Indexable>() =>
@@ -5307,14 +5266,6 @@ class _Renderer_Indexable extends RendererBase<Indexable> {
53075266
}
53085267
}
53095268

5310-
String _render_FeatureSet(
5311-
FeatureSet context, List<MustachioNode> ast, Template template,
5312-
{RendererBase<Object> parent}) {
5313-
var renderer = _Renderer_FeatureSet(context, parent, template);
5314-
renderer.renderBlock(ast);
5315-
return renderer.buffer.toString();
5316-
}
5317-
53185269
class _Renderer_FeatureSet extends RendererBase<FeatureSet> {
53195270
static final Map<Type, Object> _propertyMapCache = {};
53205271
static Map<String, Property<CT_>> propertyMap<CT_ extends FeatureSet>() =>
@@ -5507,14 +5458,6 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
55075458
}
55085459
}
55095460

5510-
String _render_DocumentationComment(
5511-
DocumentationComment context, List<MustachioNode> ast, Template template,
5512-
{RendererBase<Object> parent}) {
5513-
var renderer = _Renderer_DocumentationComment(context, parent, template);
5514-
renderer.renderBlock(ast);
5515-
return renderer.buffer.toString();
5516-
}
5517-
55185461
class _Renderer_DocumentationComment
55195462
extends RendererBase<DocumentationComment> {
55205463
static final Map<Type, Object> _propertyMapCache = {};
@@ -5810,14 +5753,6 @@ class _Renderer_Documentable extends RendererBase<Documentable> {
58105753
}
58115754
}
58125755

5813-
String _render_Canonicalization(
5814-
Canonicalization context, List<MustachioNode> ast, Template template,
5815-
{RendererBase<Object> parent}) {
5816-
var renderer = _Renderer_Canonicalization(context, parent, template);
5817-
renderer.renderBlock(ast);
5818-
return renderer.buffer.toString();
5819-
}
5820-
58215756
class _Renderer_Canonicalization extends RendererBase<Canonicalization> {
58225757
static final Map<Type, Object> _propertyMapCache = {};
58235758
static Map<String, Property<CT_>> propertyMap<
@@ -6469,14 +6404,6 @@ class _Renderer_CallableElementTypeMixin
64696404
}
64706405
}
64716406

6472-
String _render_TypeParameters(
6473-
TypeParameters context, List<MustachioNode> ast, Template template,
6474-
{RendererBase<Object> parent}) {
6475-
var renderer = _Renderer_TypeParameters(context, parent, template);
6476-
renderer.renderBlock(ast);
6477-
return renderer.buffer.toString();
6478-
}
6479-
64806407
class _Renderer_TypeParameters extends RendererBase<TypeParameters> {
64816408
static final Map<Type, Object> _propertyMapCache = {};
64826409
static Map<String, Property<CT_>> propertyMap<CT_ extends TypeParameters>() =>
@@ -6865,14 +6792,6 @@ class _Renderer_Method extends RendererBase<Method> {
68656792
}
68666793
}
68676794

6868-
String _render_ContainerMember(
6869-
ContainerMember context, List<MustachioNode> ast, Template template,
6870-
{RendererBase<Object> parent}) {
6871-
var renderer = _Renderer_ContainerMember(context, parent, template);
6872-
renderer.renderBlock(ast);
6873-
return renderer.buffer.toString();
6874-
}
6875-
68766795
class _Renderer_ContainerMember extends RendererBase<ContainerMember> {
68776796
static final Map<Type, Object> _propertyMapCache = {};
68786797
static Map<String, Property<CT_>> propertyMap<
@@ -8819,14 +8738,6 @@ class _Renderer_GetterSetterCombo extends RendererBase<GetterSetterCombo> {
88198738
}
88208739
}
88218740

8822-
String _render_Categorization(
8823-
Categorization context, List<MustachioNode> ast, Template template,
8824-
{RendererBase<Object> parent}) {
8825-
var renderer = _Renderer_Categorization(context, parent, template);
8826-
renderer.renderBlock(ast);
8827-
return renderer.buffer.toString();
8828-
}
8829-
88308741
class _Renderer_Categorization extends RendererBase<Categorization> {
88318742
static final Map<Type, Object> _propertyMapCache = {};
88328743
static Map<String, Property<CT_>> propertyMap<CT_ extends Categorization>() =>
@@ -8979,14 +8890,6 @@ class _Renderer_Categorization extends RendererBase<Categorization> {
89798890
}
89808891
}
89818892

8982-
String _render_ExtensionTarget(
8983-
ExtensionTarget context, List<MustachioNode> ast, Template template,
8984-
{RendererBase<Object> parent}) {
8985-
var renderer = _Renderer_ExtensionTarget(context, parent, template);
8986-
renderer.renderBlock(ast);
8987-
return renderer.buffer.toString();
8988-
}
8989-
89908893
class _Renderer_ExtensionTarget extends RendererBase<ExtensionTarget> {
89918894
static final Map<Type, Object> _propertyMapCache = {};
89928895
static Map<String, Property<CT_>> propertyMap<
@@ -10336,14 +10239,6 @@ class _Renderer_FunctionTypedef extends RendererBase<FunctionTypedef> {
1033610239
}
1033710240
}
1033810241

10339-
String _render_MarkdownFileDocumentation(MarkdownFileDocumentation context,
10340-
List<MustachioNode> ast, Template template,
10341-
{RendererBase<Object> parent}) {
10342-
var renderer = _Renderer_MarkdownFileDocumentation(context, parent, template);
10343-
renderer.renderBlock(ast);
10344-
return renderer.buffer.toString();
10345-
}
10346-
1034710242
class _Renderer_MarkdownFileDocumentation
1034810243
extends RendererBase<MarkdownFileDocumentation> {
1034910244
static final Map<Type, Object> _propertyMapCache = {};
@@ -10507,14 +10402,6 @@ class _Renderer_MarkdownFileDocumentation
1050710402
}
1050810403
}
1050910404

10510-
String _render_TopLevelContainer(
10511-
TopLevelContainer context, List<MustachioNode> ast, Template template,
10512-
{RendererBase<Object> parent}) {
10513-
var renderer = _Renderer_TopLevelContainer(context, parent, template);
10514-
renderer.renderBlock(ast);
10515-
return renderer.buffer.toString();
10516-
}
10517-
1051810405
class _Renderer_TopLevelContainer extends RendererBase<TopLevelContainer> {
1051910406
static final Map<Type, Object> _propertyMapCache = {};
1052010407
static Map<String, Property<CT_>> propertyMap<
@@ -11101,14 +10988,6 @@ class _Renderer_CategoryTemplateData
1110110988
}
1110210989
}
1110310990

11104-
String _render_TemplateData<T extends Documentable>(
11105-
TemplateData<T> context, List<MustachioNode> ast, Template template,
11106-
{RendererBase<Object> parent}) {
11107-
var renderer = _Renderer_TemplateData(context, parent, template);
11108-
renderer.renderBlock(ast);
11109-
return renderer.buffer.toString();
11110-
}
11111-
1111210991
class _Renderer_TemplateData<T extends Documentable>
1111310992
extends RendererBase<TemplateData<T>> {
1111410993
static final Map<Type, Object> _propertyMapCache = {};

‎test/mustachio/builder_test.dart

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ class Baz {}
101101
});
102102

103103
test('for a class which implicitly extends Object', () {
104-
// The render function for Foo
105-
expect(
106-
generatedContent,
107-
contains('String _render_FooBase<T extends Baz>(\n'
108-
' FooBase<T> context, List<MustachioNode> ast, Template template,'));
109104
// The renderer class for Foo
110105
expect(
111106
generatedContent,
@@ -114,24 +109,20 @@ class Baz {}
114109
});
115110

116111
test('for Object', () {
117-
// The render function for Object
118-
expect(
119-
generatedContent,
120-
contains('String _render_Object(\n'
121-
' Object context, List<MustachioNode> ast, Template template,'));
122112
// The renderer class for Object
123113
expect(generatedContent,
124114
contains('class _Renderer_Object extends RendererBase<Object> {'));
125115
});
126116

127117
test('for a class which is extended by a rendered class', () {
128-
expect(
129-
renderersLibrary.getTopLevelFunction('_render_FooBase'), isNotNull);
118+
// No render function is necessary.
119+
expect(renderersLibrary.getTopLevelFunction('_render_FooBase'), isNull);
130120
expect(renderersLibrary.getType('_Renderer_FooBase'), isNotNull);
131121
});
132122

133123
test('for a class which is mixed into a rendered class', () {
134-
expect(renderersLibrary.getTopLevelFunction('_render_Mix'), isNotNull);
124+
// No render function is necessary.
125+
expect(renderersLibrary.getTopLevelFunction('_render_Mix'), isNull);
135126
expect(renderersLibrary.getType('_Renderer_Mix'), isNotNull);
136127
});
137128

‎test/mustachio/foo.renderers.dart

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
// files in the tool/mustachio/ directory.
55

66
// ignore_for_file: camel_case_types, deprecated_member_use_from_same_package
7-
// ignore_for_file: unnecessary_cast, unused_element, unused_import, non_constant_identifier_names
8-
import 'package:analyzer/file_system/file_system.dart';
7+
// ignore_for_file: unused_import
98
import 'package:dartdoc/dartdoc.dart';
109
import 'package:dartdoc/src/generator/template_data.dart';
1110
import 'package:dartdoc/src/model/annotation.dart';
@@ -118,14 +117,6 @@ class Renderer_Foo extends RendererBase<Foo> {
118117
}
119118
}
120119

121-
String _render_Object(
122-
Object context, List<MustachioNode> ast, Template template,
123-
{RendererBase<Object> parent}) {
124-
var renderer = Renderer_Object(context, parent, template);
125-
renderer.renderBlock(ast);
126-
return renderer.buffer.toString();
127-
}
128-
129120
class Renderer_Object extends RendererBase<Object> {
130121
static final Map<Type, Object> _propertyMapCache = {};
131122
static Map<String, Property<CT_>> propertyMap<CT_ extends Object>() =>
@@ -264,14 +255,6 @@ class Renderer_Property2 extends RendererBase<Property2> {
264255
}
265256
}
266257

267-
String _render_Mixin1(
268-
Mixin1 context, List<MustachioNode> ast, Template template,
269-
{RendererBase<Object> parent}) {
270-
var renderer = Renderer_Mixin1(context, parent, template);
271-
renderer.renderBlock(ast);
272-
return renderer.buffer.toString();
273-
}
274-
275258
class Renderer_Mixin1 extends RendererBase<Mixin1> {
276259
static final Map<Type, Object> _propertyMapCache = {};
277260
static Map<String, Property<CT_>> propertyMap<CT_ extends Mixin1>() =>
@@ -355,14 +338,6 @@ class Renderer_Property3 extends RendererBase<Property3> {
355338
}
356339
}
357340

358-
String _render_FooBase<T extends Object>(
359-
FooBase<T> context, List<MustachioNode> ast, Template template,
360-
{RendererBase<Object> parent}) {
361-
var renderer = Renderer_FooBase(context, parent, template);
362-
renderer.renderBlock(ast);
363-
return renderer.buffer.toString();
364-
}
365-
366341
class Renderer_FooBase<T extends Object> extends RendererBase<FooBase<T>> {
367342
static final Map<Type, Object> _propertyMapCache = {};
368343
static Map<String, Property<CT_>>

0 commit comments

Comments
 (0)