Skip to content

Commit 2e815c0

Browse files
committed
ok. seriously, got it this time....
1 parent ce3eaff commit 2e815c0

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

lib/src/generator/templates.runtime_renderers.dart

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,7 @@ class _Renderer_Class extends RendererBase<Class> {
15771577
() => {
15781578
..._Renderer_InheritingContainer.propertyMap<CT_>(),
15791579
..._Renderer_Constructable.propertyMap<CT_>(),
1580-
..._Renderer_TypeInterfaces.propertyMap<CT_>(),
1580+
..._Renderer_TypeImplementing.propertyMap<CT_>(),
15811581
..._Renderer_MixedInTypes.propertyMap<CT_>(),
15821582
'allModelElements': Property(
15831583
getValue: (CT_ c) => c.allModelElements,
@@ -9050,7 +9050,7 @@ class _Renderer_Mixin extends RendererBase<Mixin> {
90509050
CT_,
90519051
() => {
90529052
..._Renderer_InheritingContainer.propertyMap<CT_>(),
9053-
..._Renderer_TypeInterfaces.propertyMap<CT_>(),
9053+
..._Renderer_TypeImplementing.propertyMap<CT_>(),
90549054
'fileName': Property(
90559055
getValue: (CT_ c) => c.fileName,
90569056
renderVariable:
@@ -14009,9 +14009,10 @@ class _Renderer_TopLevelVariable extends RendererBase<TopLevelVariable> {
1400914009
}
1401014010
}
1401114011

14012-
class _Renderer_TypeInterfaces extends RendererBase<TypeInterfaces> {
14012+
class _Renderer_TypeImplementing extends RendererBase<TypeImplementing> {
1401314013
static final Map<Type, Object> _propertyMapCache = {};
14014-
static Map<String, Property<CT_>> propertyMap<CT_ extends TypeInterfaces>() =>
14014+
static Map<String, Property<CT_>> propertyMap<
14015+
CT_ extends TypeImplementing>() =>
1401514016
_propertyMapCache.putIfAbsent(
1401614017
CT_,
1401714018
() => {
@@ -14103,14 +14104,14 @@ class _Renderer_TypeInterfaces extends RendererBase<TypeInterfaces> {
1410314104
),
1410414105
});
1410514106

14106-
_Renderer_TypeInterfaces(TypeInterfaces context, RendererBase<Object> parent,
14107-
Template template, StringSink sink)
14107+
_Renderer_TypeImplementing(TypeImplementing context,
14108+
RendererBase<Object> parent, Template template, StringSink sink)
1410814109
: super(context, parent, template, sink);
1410914110

1411014111
@override
14111-
Property<TypeInterfaces> getProperty(String key) {
14112-
if (propertyMap<TypeInterfaces>().containsKey(key)) {
14113-
return propertyMap<TypeInterfaces>()[key];
14112+
Property<TypeImplementing> getProperty(String key) {
14113+
if (propertyMap<TypeImplementing>().containsKey(key)) {
14114+
return propertyMap<TypeImplementing>()[key];
1411414115
} else {
1411514116
return null;
1411614117
}

lib/src/model/class.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import 'comment_referable.dart';
1616
/// **instance**: As with [Container], but also includes inherited children.
1717
/// **inherited**: Filtered getters giving only inherited children.
1818
class Class extends InheritingContainer
19-
with Constructable, TypeInterfaces, MixedInTypes {
19+
with Constructable, TypeImplementing, MixedInTypes {
2020
Class(ClassElement element, Library library, PackageGraph packageGraph)
2121
: super(element, library, packageGraph) {
2222
packageGraph.specialClasses.addSpecial(this);

lib/src/model/inheriting_container.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ mixin MixedInTypes on InheritingContainer {
110110

111111
/// Add the ability for an [InheritingContainer] to be implemented by other
112112
/// InheritingContainers and to reference what it itself implements.
113-
mixin TypeInterfaces on InheritingContainer {
113+
mixin TypeImplementing on InheritingContainer {
114114
List<DefinedElementType> _directInterfaces;
115115
List<DefinedElementType> get directInterfaces =>
116116
_directInterfaces ??
@@ -172,7 +172,7 @@ mixin TypeInterfaces on InheritingContainer {
172172
bool get hasPublicImplementors => publicImplementors.isNotEmpty;
173173

174174
/// Returns all the "immediate" public implementors of this
175-
/// [TypeInterfaces]. For a [Mixin], this is actually the mixin
175+
/// [TypeImplementing]. For a [Mixin], this is actually the mixin
176176
/// applications using the [Mixin].
177177
///
178178
/// If this [InheritingContainer] has a private implementor, then that is

lib/src/model/mixin.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:dartdoc/src/model_utils.dart' as model_utils;
1111
import 'package:dartdoc/src/special_elements.dart';
1212

1313
/// Implements the Dart 2.1 "mixin" style of mixin declarations.
14-
class Mixin extends InheritingContainer with TypeInterfaces {
14+
class Mixin extends InheritingContainer with TypeImplementing {
1515
Mixin(ClassElement element, Library library, PackageGraph packageGraph)
1616
: super(element, library, packageGraph);
1717

0 commit comments

Comments
 (0)