Skip to content

Commit 37a024f

Browse files
srawlinssrawlins
committed
Add ElementType to visibleTypes
1 parent 3eb0e34 commit 37a024f

File tree

2 files changed

+33
-43
lines changed

2 files changed

+33
-43
lines changed

‎lib/src/generator/templates.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const _visibleTypes = {
4747
Constructor,
4848
DefinedElementType,
4949
Documentable,
50+
ElementType,
5051
Enum,
5152
Extension,
5253
FeatureSet,

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

Lines changed: 32 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@ class _Renderer_Annotation extends RendererBase<Annotation> {
438438
isNullValue: (CT_ c) => c.modelType == null,
439439
renderValue:
440440
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
441-
return renderSimple(c.modelType, ast, r.template,
442-
parent: r, getters: _invisibleGetters['ElementType']);
441+
return _render_ElementType(c.modelType, ast, r.template,
442+
parent: r);
443443
},
444444
),
445445
'packageGraph': Property(
@@ -533,8 +533,8 @@ class _Renderer_Callable extends RendererBase<Callable> {
533533
isNullValue: (CT_ c) => c.returnType == null,
534534
renderValue:
535535
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
536-
return renderSimple(c.returnType, ast, r.template,
537-
parent: r, getters: _invisibleGetters['ElementType']);
536+
return _render_ElementType(c.returnType, ast, r.template,
537+
parent: r);
538538
},
539539
),
540540
'type': Property(
@@ -4103,9 +4103,8 @@ class _Renderer_DefinedElementType extends RendererBase<DefinedElementType> {
41034103
c, remainingNames, 'Iterable<ElementType>'),
41044104
renderIterable:
41054105
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
4106-
return c.typeArguments.map((e) => renderSimple(
4107-
e, ast, r.template,
4108-
parent: r, getters: _invisibleGetters['ElementType']));
4106+
return c.typeArguments.map((e) =>
4107+
_render_ElementType(e, ast, r.template, parent: r));
41094108
},
41104109
),
41114110
});
@@ -4422,6 +4421,14 @@ class _Renderer_DocumentationComment
44224421
}
44234422
}
44244423

4424+
String _render_ElementType(
4425+
ElementType context, List<MustachioNode> ast, Template template,
4426+
{RendererBase<Object> parent}) {
4427+
var renderer = _Renderer_ElementType(context, parent, template);
4428+
renderer.renderBlock(ast);
4429+
return renderer.buffer.toString();
4430+
}
4431+
44254432
class _Renderer_ElementType extends RendererBase<ElementType> {
44264433
static final Map<Type, Object> _propertyMapCache = {};
44274434
static Map<String, Property<CT_>> propertyMap<CT_ extends ElementType>() =>
@@ -4566,8 +4573,8 @@ class _Renderer_ElementType extends RendererBase<ElementType> {
45664573
isNullValue: (CT_ c) => c.returnedFrom == null,
45674574
renderValue:
45684575
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
4569-
return renderSimple(c.returnedFrom, ast, r.template,
4570-
parent: r, getters: _invisibleGetters['ElementType']);
4576+
return _render_ElementType(c.returnedFrom, ast, r.template,
4577+
parent: r);
45714578
},
45724579
),
45734580
'type': Property(
@@ -4590,9 +4597,8 @@ class _Renderer_ElementType extends RendererBase<ElementType> {
45904597
c, remainingNames, 'Iterable<ElementType>'),
45914598
renderIterable:
45924599
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
4593-
return c.typeArguments.map((e) => renderSimple(
4594-
e, ast, r.template,
4595-
parent: r, getters: _invisibleGetters['ElementType']));
4600+
return c.typeArguments.map((e) =>
4601+
_render_ElementType(e, ast, r.template, parent: r));
45964602
},
45974603
),
45984604
});
@@ -4829,8 +4835,8 @@ class _Renderer_Extension extends RendererBase<Extension> {
48294835
isNullValue: (CT_ c) => c.extendedType == null,
48304836
renderValue:
48314837
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
4832-
return renderSimple(c.extendedType, ast, r.template,
4833-
parent: r, getters: _invisibleGetters['ElementType']);
4838+
return _render_ElementType(c.extendedType, ast, r.template,
4839+
parent: r);
48344840
},
48354841
),
48364842
'filePath': Property(
@@ -5008,8 +5014,8 @@ class _Renderer_ExtensionTarget extends RendererBase<ExtensionTarget> {
50085014
isNullValue: (CT_ c) => c.modelType == null,
50095015
renderValue:
50105016
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
5011-
return renderSimple(c.modelType, ast, r.template,
5012-
parent: r, getters: _invisibleGetters['ElementType']);
5017+
return _render_ElementType(c.modelType, ast, r.template,
5018+
parent: r);
50135019
},
50145020
),
50155021
'potentiallyApplicableExtensions': Property(
@@ -6495,8 +6501,8 @@ class _Renderer_GetterSetterCombo extends RendererBase<GetterSetterCombo> {
64956501
isNullValue: (CT_ c) => c.modelType == null,
64966502
renderValue:
64976503
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
6498-
return renderSimple(c.modelType, ast, r.template,
6499-
parent: r, getters: _invisibleGetters['ElementType']);
6504+
return _render_ElementType(c.modelType, ast, r.template,
6505+
parent: r);
65006506
},
65016507
),
65026508
'oneLineDoc': Property(
@@ -11576,8 +11582,8 @@ class _Renderer_Parameter extends RendererBase<Parameter> {
1157611582
isNullValue: (CT_ c) => c.modelType == null,
1157711583
renderValue:
1157811584
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
11579-
return renderSimple(c.modelType, ast, r.template,
11580-
parent: r, getters: _invisibleGetters['ElementType']);
11585+
return _render_ElementType(c.modelType, ast, r.template,
11586+
parent: r);
1158111587
},
1158211588
),
1158311589
'originalMember': Property(
@@ -13602,8 +13608,8 @@ class _Renderer_TypeParameter extends RendererBase<TypeParameter> {
1360213608
isNullValue: (CT_ c) => c.boundType == null,
1360313609
renderValue:
1360413610
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
13605-
return renderSimple(c.boundType, ast, r.template,
13606-
parent: r, getters: _invisibleGetters['ElementType']);
13611+
return _render_ElementType(c.boundType, ast, r.template,
13612+
parent: r);
1360713613
},
1360813614
),
1360913615
'element': Property(
@@ -14110,8 +14116,8 @@ class _Renderer_Typedef extends RendererBase<Typedef> {
1411014116
isNullValue: (CT_ c) => c.modelType == null,
1411114117
renderValue:
1411214118
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
14113-
return renderSimple(c.modelType, ast, r.template,
14114-
parent: r, getters: _invisibleGetters['ElementType']);
14119+
return _render_ElementType(c.modelType, ast, r.template,
14120+
parent: r);
1411514121
},
1411614122
),
1411714123
'nameWithGenerics': Property(
@@ -14529,9 +14535,8 @@ class _Renderer_UndefinedElementType
1452914535
c, remainingNames, 'Iterable<ElementType>'),
1453014536
renderIterable:
1453114537
(CT_ c, RendererBase<CT_> r, List<MustachioNode> ast) {
14532-
return c.typeArguments.map((e) => renderSimple(
14533-
e, ast, r.template,
14534-
parent: r, getters: _invisibleGetters['ElementType']));
14538+
return c.typeArguments.map((e) =>
14539+
_render_ElementType(e, ast, r.template, parent: r));
1453514540
},
1453614541
),
1453714542
});
@@ -14842,22 +14847,6 @@ const _invisibleGetters = {
1484214847
'isVisibleForTemplate',
1484314848
'isVisibleForTesting'
1484414849
},
14845-
'ElementType': {
14846-
'hashCode',
14847-
'runtimeType',
14848-
'isPublic',
14849-
'packageGraph',
14850-
'returnedFrom',
14851-
'library',
14852-
'canHaveParameters',
14853-
'isTypedef',
14854-
'linkedName',
14855-
'nameWithGenerics',
14856-
'nullabilitySuffix',
14857-
'instantiatedType',
14858-
'typeArguments',
14859-
'type'
14860-
},
1486114850
'ExecutableMember': {
1486214851
'hashCode',
1486314852
'runtimeType',

0 commit comments

Comments
 (0)