diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart index 141ea443f5..188a593d15 100644 --- a/lib/src/generator/templates.runtime_renderers.dart +++ b/lib/src/generator/templates.runtime_renderers.dart @@ -21,14 +21,14 @@ import 'package:dartdoc/src/mustachio/renderer_base.dart'; import 'package:dartdoc/src/warnings.dart'; import 'templates.dart'; -void _render_Accessor(Accessor? context, List ast, +void _render_Accessor(Accessor context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Accessor(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Accessor extends RendererBase { +class _Renderer_Accessor extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -151,7 +151,7 @@ class _Renderer_Accessor extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -173,7 +173,7 @@ class _Renderer_Accessor extends RendererBase { isNullValue: (CT_ c) => c.filePath == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.filePath, ast, r.template, sink, + _render_String(c.filePath!, ast, r.template, sink, parent: r); }, ), @@ -202,7 +202,7 @@ class _Renderer_Accessor extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'isCanonical': Property( @@ -316,7 +316,7 @@ class _Renderer_Accessor extends RendererBase { isNullValue: (CT_ c) => c.namePart == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.namePart, ast, r.template, sink, + _render_String(c.namePart!, ast, r.template, sink, parent: r); }, ), @@ -385,12 +385,12 @@ class _Renderer_Accessor extends RendererBase { ), }) as Map>; - _Renderer_Accessor(Accessor? context, RendererBase? parent, + _Renderer_Accessor(Accessor context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -399,14 +399,14 @@ class _Renderer_Accessor extends RendererBase { } } -void _render_Annotation(Annotation? context, List ast, +void _render_Annotation(Annotation context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Annotation(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Annotation extends RendererBase { +class _Renderer_Annotation extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -465,7 +465,7 @@ class _Renderer_Annotation extends RendererBase { isNullValue: (CT_ c) => c.library == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.library, ast, r.template, sink, + _render_Library(c.library!, ast, r.template, sink, parent: r); }, ), @@ -532,7 +532,7 @@ class _Renderer_Annotation extends RendererBase { isNullValue: (CT_ c) => c.modelType == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_ElementType(c.modelType, ast, r.template, sink, + _render_ElementType(c.modelType!, ast, r.template, sink, parent: r); }, ), @@ -573,12 +573,12 @@ class _Renderer_Annotation extends RendererBase { ), }) as Map>; - _Renderer_Annotation(Annotation? context, RendererBase? parent, + _Renderer_Annotation(Annotation context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -587,14 +587,14 @@ class _Renderer_Annotation extends RendererBase { } } -void _render_Callable(Callable? context, List ast, +void _render_Callable(Callable context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Callable(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Callable extends RendererBase { +class _Renderer_Callable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -671,12 +671,12 @@ class _Renderer_Callable extends RendererBase { ), }) as Map>; - _Renderer_Callable(Callable? context, RendererBase? parent, + _Renderer_Callable(Callable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -685,7 +685,7 @@ class _Renderer_Callable extends RendererBase { } } -class _Renderer_Canonicalization extends RendererBase { +class _Renderer_Canonicalization extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends Canonicalization>() => @@ -711,7 +711,7 @@ class _Renderer_Canonicalization extends RendererBase { isNullValue: (CT_ c) => c.canonicalLibrary == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.canonicalLibrary, ast, r.template, sink, + _render_Library(c.canonicalLibrary!, ast, r.template, sink, parent: r); }, ), @@ -749,12 +749,12 @@ class _Renderer_Canonicalization extends RendererBase { ), }) as Map>; - _Renderer_Canonicalization(Canonicalization? context, + _Renderer_Canonicalization(Canonicalization context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -763,7 +763,7 @@ class _Renderer_Canonicalization extends RendererBase { } } -class _Renderer_Categorization extends RendererBase { +class _Renderer_Categorization extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -860,7 +860,7 @@ class _Renderer_Categorization extends RendererBase { isNullValue: (CT_ c) => c.image == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.image, ast, r.template, sink, parent: r); + _render_String(c.image!, ast, r.template, sink, parent: r); }, ), 'samples': Property( @@ -881,7 +881,8 @@ class _Renderer_Categorization extends RendererBase { isNullValue: (CT_ c) => c.samples == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.samples, ast, r.template, sink, parent: r); + _render_String(c.samples!, ast, r.template, sink, + parent: r); }, ), 'subCategoryNames': Property( @@ -899,12 +900,12 @@ class _Renderer_Categorization extends RendererBase { ), }) as Map>; - _Renderer_Categorization(Categorization? context, - RendererBase? parent, Template template, StringSink sink) + _Renderer_Categorization(Categorization context, RendererBase? parent, + Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -913,14 +914,14 @@ class _Renderer_Categorization extends RendererBase { } } -void _render_Category(Category? context, List ast, +void _render_Category(Category context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Category(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Category extends RendererBase { +class _Renderer_Category extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -1276,7 +1277,7 @@ class _Renderer_Category extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'isCanonical': Property( @@ -1479,12 +1480,12 @@ class _Renderer_Category extends RendererBase { ), }) as Map>; - _Renderer_Category(Category? context, RendererBase? parent, + _Renderer_Category(Category context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -1493,13 +1494,13 @@ class _Renderer_Category extends RendererBase { } } -String renderCategory(CategoryTemplateData? context, Template template) { +String renderCategory(CategoryTemplateData context, Template template) { var buffer = StringBuffer(); _render_CategoryTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_CategoryTemplateData(CategoryTemplateData? context, +void _render_CategoryTemplateData(CategoryTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = @@ -1508,7 +1509,7 @@ void _render_CategoryTemplateData(CategoryTemplateData? context, } class _Renderer_CategoryTemplateData - extends RendererBase { + extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends CategoryTemplateData>() => @@ -1661,12 +1662,12 @@ class _Renderer_CategoryTemplateData ), }) as Map>; - _Renderer_CategoryTemplateData(CategoryTemplateData? context, + _Renderer_CategoryTemplateData(CategoryTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -1676,13 +1677,13 @@ class _Renderer_CategoryTemplateData } void _render_Class( - Class? context, List ast, Template template, StringSink sink, + Class context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Class(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Class extends RendererBase { +class _Renderer_Class extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -1736,7 +1737,7 @@ class _Renderer_Class extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -1837,7 +1838,7 @@ class _Renderer_Class extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'inheritanceChain': Property( @@ -1849,7 +1850,7 @@ class _Renderer_Class extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.inheritanceChain.map((e) => - _render_InheritingContainer(e, ast, r.template, sink, + _render_InheritingContainer(e!, ast, r.template, sink, parent: r)); }, ), @@ -1916,12 +1917,12 @@ class _Renderer_Class extends RendererBase { ), }) as Map>; - _Renderer_Class(Class? context, RendererBase? parent, + _Renderer_Class(Class context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -1930,20 +1931,20 @@ class _Renderer_Class extends RendererBase { } } -String renderClass(ClassTemplateData? context, Template template) { +String renderClass(ClassTemplateData context, Template template) { var buffer = StringBuffer(); _render_ClassTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_ClassTemplateData(ClassTemplateData? context, +void _render_ClassTemplateData(ClassTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_ClassTemplateData(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_ClassTemplateData extends RendererBase { +class _Renderer_ClassTemplateData extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends ClassTemplateData>() => @@ -1975,12 +1976,12 @@ class _Renderer_ClassTemplateData extends RendererBase { ), }) as Map>; - _Renderer_ClassTemplateData(ClassTemplateData? context, + _Renderer_ClassTemplateData(ClassTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -1989,7 +1990,7 @@ class _Renderer_ClassTemplateData extends RendererBase { } } -class _Renderer_CommentReferable extends RendererBase { +class _Renderer_CommentReferable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends CommentReferable>() => @@ -2038,7 +2039,7 @@ class _Renderer_CommentReferable extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'library': Property( @@ -2059,7 +2060,7 @@ class _Renderer_CommentReferable extends RendererBase { isNullValue: (CT_ c) => c.library == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.library, ast, r.template, sink, + _render_Library(c.library!, ast, r.template, sink, parent: r); }, ), @@ -2141,12 +2142,12 @@ class _Renderer_CommentReferable extends RendererBase { ), }) as Map>; - _Renderer_CommentReferable(CommentReferable? context, + _Renderer_CommentReferable(CommentReferable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -2155,7 +2156,7 @@ class _Renderer_CommentReferable extends RendererBase { } } -class _Renderer_Constructable extends RendererBase { +class _Renderer_Constructable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -2193,7 +2194,7 @@ class _Renderer_Constructable extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_Constructor( - c.defaultConstructor, ast, r.template, sink, + c.defaultConstructor!, ast, r.template, sink, parent: r); }, ), @@ -2249,18 +2250,18 @@ class _Renderer_Constructable extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_Constructor( - c.unnamedConstructor, ast, r.template, sink, + c.unnamedConstructor!, ast, r.template, sink, parent: r); }, ), }) as Map>; - _Renderer_Constructable(Constructable? context, RendererBase? parent, + _Renderer_Constructable(Constructable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -2269,14 +2270,14 @@ class _Renderer_Constructable extends RendererBase { } } -void _render_Constructor(Constructor? context, List ast, +void _render_Constructor(Constructor context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Constructor(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Constructor extends RendererBase { +class _Renderer_Constructor extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -2569,7 +2570,7 @@ class _Renderer_Constructor extends RendererBase { isNullValue: (CT_ c) => c.shortName == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.shortName, ast, r.template, sink, + _render_String(c.shortName!, ast, r.template, sink, parent: r); }, ), @@ -2588,12 +2589,12 @@ class _Renderer_Constructor extends RendererBase { ), }) as Map>; - _Renderer_Constructor(Constructor? context, RendererBase? parent, + _Renderer_Constructor(Constructor context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -2602,13 +2603,13 @@ class _Renderer_Constructor extends RendererBase { } } -String renderConstructor(ConstructorTemplateData? context, Template template) { +String renderConstructor(ConstructorTemplateData context, Template template) { var buffer = StringBuffer(); _render_ConstructorTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_ConstructorTemplateData(ConstructorTemplateData? context, +void _render_ConstructorTemplateData(ConstructorTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = @@ -2617,7 +2618,7 @@ void _render_ConstructorTemplateData(ConstructorTemplateData? context, } class _Renderer_ConstructorTemplateData - extends RendererBase { + extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends ConstructorTemplateData>() => @@ -2870,12 +2871,12 @@ class _Renderer_ConstructorTemplateData ), }) as Map>; - _Renderer_ConstructorTemplateData(ConstructorTemplateData? context, + _Renderer_ConstructorTemplateData(ConstructorTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -2884,14 +2885,14 @@ class _Renderer_ConstructorTemplateData } } -void _render_Container(Container? context, List ast, +void _render_Container(Container context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Container(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Container extends RendererBase { +class _Renderer_Container extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -3008,7 +3009,7 @@ class _Renderer_Container extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -3521,12 +3522,12 @@ class _Renderer_Container extends RendererBase { ), }) as Map>; - _Renderer_Container(Container? context, RendererBase? parent, + _Renderer_Container(Container context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -3535,14 +3536,14 @@ class _Renderer_Container extends RendererBase { } } -void _render_ContainerAccessor(ContainerAccessor? context, +void _render_ContainerAccessor(ContainerAccessor context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_ContainerAccessor(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_ContainerAccessor extends RendererBase { +class _Renderer_ContainerAccessor extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends ContainerAccessor>() => @@ -3584,7 +3585,8 @@ class _Renderer_ContainerAccessor extends RendererBase { isNullValue: (CT_ c) => c.enclosingElement == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Container(c.enclosingElement, ast, r.template, sink, + _render_Container( + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -3621,18 +3623,18 @@ class _Renderer_ContainerAccessor extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ContainerAccessor( - c.overriddenElement, ast, r.template, sink, + c.overriddenElement!, ast, r.template, sink, parent: r); }, ), }) as Map>; - _Renderer_ContainerAccessor(ContainerAccessor? context, + _Renderer_ContainerAccessor(ContainerAccessor context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -3641,7 +3643,7 @@ class _Renderer_ContainerAccessor extends RendererBase { } } -class _Renderer_ContainerMember extends RendererBase { +class _Renderer_ContainerMember extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends ContainerMember>() => @@ -3667,7 +3669,7 @@ class _Renderer_ContainerMember extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_Container( - c.canonicalEnclosingContainer, ast, r.template, sink, + c.canonicalEnclosingContainer!, ast, r.template, sink, parent: r); }, ), @@ -3690,7 +3692,7 @@ class _Renderer_ContainerMember extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_Container( - c.definingEnclosingContainer, ast, r.template, sink, + c.definingEnclosingContainer!, ast, r.template, sink, parent: r); }, ), @@ -3740,12 +3742,12 @@ class _Renderer_ContainerMember extends RendererBase { ), }) as Map>; - _Renderer_ContainerMember(ContainerMember? context, + _Renderer_ContainerMember(ContainerMember context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -3754,14 +3756,14 @@ class _Renderer_ContainerMember extends RendererBase { } } -void _render_DefinedElementType(DefinedElementType? context, +void _render_DefinedElementType(DefinedElementType context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_DefinedElementType(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_DefinedElementType extends RendererBase { +class _Renderer_DefinedElementType extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends DefinedElementType>() => @@ -3953,12 +3955,12 @@ class _Renderer_DefinedElementType extends RendererBase { ), }) as Map>; - _Renderer_DefinedElementType(DefinedElementType? context, + _Renderer_DefinedElementType(DefinedElementType context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -3967,14 +3969,14 @@ class _Renderer_DefinedElementType extends RendererBase { } } -void _render_Documentable(Documentable? context, List ast, +void _render_Documentable(Documentable context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Documentable(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Documentable extends RendererBase { +class _Renderer_Documentable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -4013,7 +4015,7 @@ class _Renderer_Documentable extends RendererBase { isNullValue: (CT_ c) => c.documentation == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.documentation, ast, r.template, sink, + _render_String(c.documentation!, ast, r.template, sink, parent: r); }, ), @@ -4035,7 +4037,8 @@ class _Renderer_Documentable extends RendererBase { isNullValue: (CT_ c) => c.documentationAsHtml == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.documentationAsHtml, ast, r.template, sink, + _render_String( + c.documentationAsHtml!, ast, r.template, sink, parent: r); }, ), @@ -4071,7 +4074,7 @@ class _Renderer_Documentable extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'isDocumented': Property( @@ -4120,7 +4123,7 @@ class _Renderer_Documentable extends RendererBase { isNullValue: (CT_ c) => c.oneLineDoc == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.oneLineDoc, ast, r.template, sink, + _render_String(c.oneLineDoc!, ast, r.template, sink, parent: r); }, ), @@ -4139,12 +4142,12 @@ class _Renderer_Documentable extends RendererBase { ), }) as Map>; - _Renderer_Documentable(Documentable? context, RendererBase? parent, + _Renderer_Documentable(Documentable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -4154,7 +4157,7 @@ class _Renderer_Documentable extends RendererBase { } class _Renderer_DocumentationComment - extends RendererBase { + extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends DocumentationComment>() => @@ -4179,7 +4182,8 @@ class _Renderer_DocumentationComment isNullValue: (CT_ c) => c.documentationAsHtml == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.documentationAsHtml, ast, r.template, sink, + _render_String( + c.documentationAsHtml!, ast, r.template, sink, parent: r); }, ), @@ -4238,7 +4242,7 @@ class _Renderer_DocumentationComment isNullValue: (CT_ c) => c.documentationLocal == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.documentationLocal, ast, r.template, sink, + _render_String(c.documentationLocal!, ast, r.template, sink, parent: r); }, ), @@ -4275,7 +4279,7 @@ class _Renderer_DocumentationComment c.fullyQualifiedNameWithoutLibrary == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.fullyQualifiedNameWithoutLibrary, ast, + _render_String(c.fullyQualifiedNameWithoutLibrary!, ast, r.template, sink, parent: r); }, @@ -4345,18 +4349,18 @@ class _Renderer_DocumentationComment isNullValue: (CT_ c) => c.sourceFileName == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.sourceFileName, ast, r.template, sink, + _render_String(c.sourceFileName!, ast, r.template, sink, parent: r); }, ), }) as Map>; - _Renderer_DocumentationComment(DocumentationComment? context, + _Renderer_DocumentationComment(DocumentationComment context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -4365,14 +4369,14 @@ class _Renderer_DocumentationComment } } -void _render_ElementType(ElementType? context, List ast, +void _render_ElementType(ElementType context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_ElementType(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_ElementType extends RendererBase { +class _Renderer_ElementType extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -4527,7 +4531,7 @@ class _Renderer_ElementType extends RendererBase { isNullValue: (CT_ c) => c.returnedFrom == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_ElementType(c.returnedFrom, ast, r.template, sink, + _render_ElementType(c.returnedFrom!, ast, r.template, sink, parent: r); }, ), @@ -4558,12 +4562,12 @@ class _Renderer_ElementType extends RendererBase { ), }) as Map>; - _Renderer_ElementType(ElementType? context, RendererBase? parent, + _Renderer_ElementType(ElementType context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -4573,13 +4577,13 @@ class _Renderer_ElementType extends RendererBase { } void _render_Enum( - Enum? context, List ast, Template template, StringSink sink, + Enum context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Enum(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Enum extends RendererBase { +class _Renderer_Enum extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -4596,7 +4600,7 @@ class _Renderer_Enum extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.inheritanceChain.map((e) => - _render_InheritingContainer(e, ast, r.template, sink, + _render_InheritingContainer(e!, ast, r.template, sink, parent: r)); }, ), @@ -4623,12 +4627,12 @@ class _Renderer_Enum extends RendererBase { ), }) as Map>; - _Renderer_Enum(Enum? context, RendererBase? parent, Template template, + _Renderer_Enum(Enum context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -4637,20 +4641,20 @@ class _Renderer_Enum extends RendererBase { } } -String renderEnum(EnumTemplateData? context, Template template) { +String renderEnum(EnumTemplateData context, Template template) { var buffer = StringBuffer(); _render_EnumTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_EnumTemplateData(EnumTemplateData? context, - List ast, Template template, StringSink sink, +void _render_EnumTemplateData(EnumTemplateData context, List ast, + Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_EnumTemplateData(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_EnumTemplateData extends RendererBase { +class _Renderer_EnumTemplateData extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => @@ -4703,12 +4707,12 @@ class _Renderer_EnumTemplateData extends RendererBase { ), }) as Map>; - _Renderer_EnumTemplateData(EnumTemplateData? context, + _Renderer_EnumTemplateData(EnumTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -4717,14 +4721,14 @@ class _Renderer_EnumTemplateData extends RendererBase { } } -void _render_Extension(Extension? context, List ast, +void _render_Extension(Extension context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Extension(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Extension extends RendererBase { +class _Renderer_Extension extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -4810,7 +4814,7 @@ class _Renderer_Extension extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -4928,12 +4932,12 @@ class _Renderer_Extension extends RendererBase { ), }) as Map>; - _Renderer_Extension(Extension? context, RendererBase? parent, + _Renderer_Extension(Extension context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -4942,7 +4946,7 @@ class _Renderer_Extension extends RendererBase { } } -class _Renderer_ExtensionTarget extends RendererBase { +class _Renderer_ExtensionTarget extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends ExtensionTarget>() => @@ -5015,12 +5019,12 @@ class _Renderer_ExtensionTarget extends RendererBase { ), }) as Map>; - _Renderer_ExtensionTarget(ExtensionTarget? context, + _Renderer_ExtensionTarget(ExtensionTarget context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -5030,14 +5034,14 @@ class _Renderer_ExtensionTarget extends RendererBase { } String renderExtension( - ExtensionTemplateData? context, Template template) { + ExtensionTemplateData context, Template template) { var buffer = StringBuffer(); _render_ExtensionTemplateData(context, template.ast, template, buffer); return buffer.toString(); } void _render_ExtensionTemplateData( - ExtensionTemplateData? context, + ExtensionTemplateData context, List ast, Template template, StringSink sink, @@ -5048,7 +5052,7 @@ void _render_ExtensionTemplateData( } class _Renderer_ExtensionTemplateData - extends RendererBase?> { + extends RendererBase> { static final Map _propertyMapCache = {}; static Map> propertyMap() => @@ -5289,12 +5293,12 @@ class _Renderer_ExtensionTemplateData ), }) as Map>; - _Renderer_ExtensionTemplateData(ExtensionTemplateData? context, + _Renderer_ExtensionTemplateData(ExtensionTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property?>? getProperty(String key) { + Property>? getProperty(String key) { if (propertyMap>().containsKey(key)) { return propertyMap>()[key]; } else { @@ -5303,7 +5307,7 @@ class _Renderer_ExtensionTemplateData } } -class _Renderer_Feature extends RendererBase { +class _Renderer_Feature extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -5357,7 +5361,7 @@ class _Renderer_Feature extends RendererBase { isNullValue: (CT_ c) => c.linkedName == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.linkedName, ast, r.template, sink, + _render_String(c.linkedName!, ast, r.template, sink, parent: r); }, ), @@ -5380,7 +5384,7 @@ class _Renderer_Feature extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_String( - c.linkedNameWithParameters, ast, r.template, sink, + c.linkedNameWithParameters!, ast, r.template, sink, parent: r); }, ), @@ -5402,7 +5406,7 @@ class _Renderer_Feature extends RendererBase { isNullValue: (CT_ c) => c.name == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.name, ast, r.template, sink, parent: r); + _render_String(c.name!, ast, r.template, sink, parent: r); }, ), 'sortGroup': Property( @@ -5419,12 +5423,12 @@ class _Renderer_Feature extends RendererBase { ), }) as Map>; - _Renderer_Feature(Feature? context, RendererBase? parent, + _Renderer_Feature(Feature context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -5433,7 +5437,7 @@ class _Renderer_Feature extends RendererBase { } } -class _Renderer_FeatureSet extends RendererBase { +class _Renderer_FeatureSet extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -5484,7 +5488,7 @@ class _Renderer_FeatureSet extends RendererBase { isNullValue: (CT_ c) => c.library == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.library, ast, r.template, sink, + _render_Library(c.library!, ast, r.template, sink, parent: r); }, ), @@ -5503,12 +5507,12 @@ class _Renderer_FeatureSet extends RendererBase { ), }) as Map>; - _Renderer_FeatureSet(FeatureSet? context, RendererBase? parent, + _Renderer_FeatureSet(FeatureSet context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -5518,13 +5522,13 @@ class _Renderer_FeatureSet extends RendererBase { } void _render_Field( - Field? context, List ast, Template template, StringSink sink, + Field context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Field(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Field extends RendererBase { +class _Renderer_Field extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -5688,7 +5692,7 @@ class _Renderer_Field extends RendererBase { isNullValue: (CT_ c) => c.getter == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_ContainerAccessor(c.getter, ast, r.template, sink, + _render_ContainerAccessor(c.getter!, ast, r.template, sink, parent: r); }, ), @@ -5710,7 +5714,7 @@ class _Renderer_Field extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'isConst': Property( @@ -5853,7 +5857,7 @@ class _Renderer_Field extends RendererBase { isNullValue: (CT_ c) => c.setter == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_ContainerAccessor(c.setter, ast, r.template, sink, + _render_ContainerAccessor(c.setter!, ast, r.template, sink, parent: r); }, ), @@ -5881,12 +5885,12 @@ class _Renderer_Field extends RendererBase { ), }) as Map>; - _Renderer_Field(Field? context, RendererBase? parent, + _Renderer_Field(Field context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -5895,13 +5899,13 @@ class _Renderer_Field extends RendererBase { } } -String renderFunction(FunctionTemplateData? context, Template template) { +String renderFunction(FunctionTemplateData context, Template template) { var buffer = StringBuffer(); _render_FunctionTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_FunctionTemplateData(FunctionTemplateData? context, +void _render_FunctionTemplateData(FunctionTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = @@ -5910,7 +5914,7 @@ void _render_FunctionTemplateData(FunctionTemplateData? context, } class _Renderer_FunctionTemplateData - extends RendererBase { + extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends FunctionTemplateData>() => @@ -6108,12 +6112,12 @@ class _Renderer_FunctionTemplateData ), }) as Map>; - _Renderer_FunctionTemplateData(FunctionTemplateData? context, + _Renderer_FunctionTemplateData(FunctionTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -6122,14 +6126,14 @@ class _Renderer_FunctionTemplateData } } -void _render_FunctionTypedef(FunctionTypedef? context, List ast, +void _render_FunctionTypedef(FunctionTypedef context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_FunctionTypedef(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_FunctionTypedef extends RendererBase { +class _Renderer_FunctionTypedef extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends FunctionTypedef>() => @@ -6174,12 +6178,12 @@ class _Renderer_FunctionTypedef extends RendererBase { ), }) as Map>; - _Renderer_FunctionTypedef(FunctionTypedef? context, + _Renderer_FunctionTypedef(FunctionTypedef context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -6188,7 +6192,7 @@ class _Renderer_FunctionTypedef extends RendererBase { } } -class _Renderer_GetterSetterCombo extends RendererBase { +class _Renderer_GetterSetterCombo extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends GetterSetterCombo>() => @@ -6391,7 +6395,7 @@ class _Renderer_GetterSetterCombo extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -6413,7 +6417,7 @@ class _Renderer_GetterSetterCombo extends RendererBase { isNullValue: (CT_ c) => c.getter == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Accessor(c.getter, ast, r.template, sink, + _render_Accessor(c.getter!, ast, r.template, sink, parent: r); }, ), @@ -6548,7 +6552,7 @@ class _Renderer_GetterSetterCombo extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_String( - c.linkedParamsNoMetadata, ast, r.template, sink, + c.linkedParamsNoMetadata!, ast, r.template, sink, parent: r); }, ), @@ -6592,7 +6596,7 @@ class _Renderer_GetterSetterCombo extends RendererBase { isNullValue: (CT_ c) => c.oneLineDoc == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.oneLineDoc, ast, r.template, sink, + _render_String(c.oneLineDoc!, ast, r.template, sink, parent: r); }, ), @@ -6653,7 +6657,7 @@ class _Renderer_GetterSetterCombo extends RendererBase { isNullValue: (CT_ c) => c.setter == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Accessor(c.setter, ast, r.template, sink, + _render_Accessor(c.setter!, ast, r.template, sink, parent: r); }, ), @@ -6666,12 +6670,12 @@ class _Renderer_GetterSetterCombo extends RendererBase { ), }) as Map>; - _Renderer_GetterSetterCombo(GetterSetterCombo? context, + _Renderer_GetterSetterCombo(GetterSetterCombo context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -6680,7 +6684,7 @@ class _Renderer_GetterSetterCombo extends RendererBase { } } -class _Renderer_Indexable extends RendererBase { +class _Renderer_Indexable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -6705,7 +6709,7 @@ class _Renderer_Indexable extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'kind': Property( @@ -6743,12 +6747,12 @@ class _Renderer_Indexable extends RendererBase { ), }) as Map>; - _Renderer_Indexable(Indexable? context, RendererBase? parent, + _Renderer_Indexable(Indexable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -6757,7 +6761,7 @@ class _Renderer_Indexable extends RendererBase { } } -class _Renderer_Inheritable extends RendererBase { +class _Renderer_Inheritable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -6781,7 +6785,7 @@ class _Renderer_Inheritable extends RendererBase { isNullValue: (CT_ c) => c.canonicalLibrary == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.canonicalLibrary, ast, r.template, sink, + _render_Library(c.canonicalLibrary!, ast, r.template, sink, parent: r); }, ), @@ -6807,7 +6811,7 @@ class _Renderer_Inheritable extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.inheritance.map((e) => _render_InheritingContainer( - e, ast, r.template, sink, + e!, ast, r.template, sink, parent: r)); }, ), @@ -6868,12 +6872,12 @@ class _Renderer_Inheritable extends RendererBase { ), }) as Map>; - _Renderer_Inheritable(Inheritable? context, RendererBase? parent, + _Renderer_Inheritable(Inheritable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -6882,14 +6886,14 @@ class _Renderer_Inheritable extends RendererBase { } } -void _render_InheritingContainer(InheritingContainer? context, +void _render_InheritingContainer(InheritingContainer context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_InheritingContainer(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_InheritingContainer extends RendererBase { +class _Renderer_InheritingContainer extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends InheritingContainer>() => @@ -7016,7 +7020,7 @@ class _Renderer_InheritingContainer extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -7094,7 +7098,7 @@ class _Renderer_InheritingContainer extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.inheritanceChain.map((e) => - _render_InheritingContainer(e, ast, r.template, sink, + _render_InheritingContainer(e!, ast, r.template, sink, parent: r)); }, ), @@ -7321,7 +7325,7 @@ class _Renderer_InheritingContainer extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_DefinedElementType( - c.supertype, ast, r.template, sink, + c.supertype!, ast, r.template, sink, parent: r); }, ), @@ -7340,12 +7344,12 @@ class _Renderer_InheritingContainer extends RendererBase { ), }) as Map>; - _Renderer_InheritingContainer(InheritingContainer? context, + _Renderer_InheritingContainer(InheritingContainer context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -7355,7 +7359,7 @@ class _Renderer_InheritingContainer extends RendererBase { } class _Renderer_InheritingContainerTemplateData - extends RendererBase?> { + extends RendererBase> { static final Map _propertyMapCache = {}; static Map> propertyMap() => @@ -7549,7 +7553,7 @@ class _Renderer_InheritingContainerTemplateData isNullValue: (CT_ c) => c.objectType == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Class(c.objectType, ast, r.template, sink, + _render_Class(c.objectType!, ast, r.template, sink, parent: r); }, ), @@ -7644,14 +7648,14 @@ class _Renderer_InheritingContainerTemplateData }) as Map>; _Renderer_InheritingContainerTemplateData( - InheritingContainerTemplateData? context, + InheritingContainerTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property?>? getProperty(String key) { + Property>? getProperty(String key) { if (propertyMap>().containsKey(key)) { return propertyMap>()[key]; } else { @@ -7660,14 +7664,14 @@ class _Renderer_InheritingContainerTemplateData } } -void _render_LanguageFeature(LanguageFeature? context, List ast, +void _render_LanguageFeature(LanguageFeature context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_LanguageFeature(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_LanguageFeature extends RendererBase { +class _Renderer_LanguageFeature extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends LanguageFeature>() => @@ -7693,7 +7697,7 @@ class _Renderer_LanguageFeature extends RendererBase { isNullValue: (CT_ c) => c.featureDescription == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.featureDescription, ast, r.template, sink, + _render_String(c.featureDescription!, ast, r.template, sink, parent: r); }, ), @@ -7737,7 +7741,7 @@ class _Renderer_LanguageFeature extends RendererBase { isNullValue: (CT_ c) => c.featureUrl == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.featureUrl, ast, r.template, sink, + _render_String(c.featureUrl!, ast, r.template, sink, parent: r); }, ), @@ -7764,12 +7768,12 @@ class _Renderer_LanguageFeature extends RendererBase { ), }) as Map>; - _Renderer_LanguageFeature(LanguageFeature? context, + _Renderer_LanguageFeature(LanguageFeature context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -7778,14 +7782,14 @@ class _Renderer_LanguageFeature extends RendererBase { } } -void _render_Library(Library? context, List ast, +void _render_Library(Library context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Library(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Library extends RendererBase { +class _Renderer_Library extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -7841,7 +7845,7 @@ class _Renderer_Library extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.canonicalFor.map((e) => - _render_String(e, ast, r.template, sink, parent: r)); + _render_String(e!, ast, r.template, sink, parent: r)); }, ), 'characterLocation': Property( @@ -7952,7 +7956,7 @@ class _Renderer_Library extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -8067,7 +8071,7 @@ class _Renderer_Library extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'inheritanceManager': Property( @@ -8385,12 +8389,12 @@ class _Renderer_Library extends RendererBase { ), }) as Map>; - _Renderer_Library(Library? context, RendererBase? parent, + _Renderer_Library(Library context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -8399,14 +8403,14 @@ class _Renderer_Library extends RendererBase { } } -void _render_LibraryContainer(LibraryContainer? context, - List ast, Template template, StringSink sink, +void _render_LibraryContainer(LibraryContainer context, List ast, + Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_LibraryContainer(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_LibraryContainer extends RendererBase { +class _Renderer_LibraryContainer extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends LibraryContainer>() => @@ -8423,7 +8427,7 @@ class _Renderer_LibraryContainer extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.containerOrder.map((e) => - _render_String(e, ast, r.template, sink, parent: r)); + _render_String(e!, ast, r.template, sink, parent: r)); }, ), 'enclosingName': Property( @@ -8529,17 +8533,18 @@ class _Renderer_LibraryContainer extends RendererBase { isNullValue: (CT_ c) => c.sortKey == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.sortKey, ast, r.template, sink, parent: r); + _render_String(c.sortKey!, ast, r.template, sink, + parent: r); }, ), }) as Map>; - _Renderer_LibraryContainer(LibraryContainer? context, + _Renderer_LibraryContainer(LibraryContainer context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -8548,20 +8553,20 @@ class _Renderer_LibraryContainer extends RendererBase { } } -String renderLibrary(LibraryTemplateData? context, Template template) { +String renderLibrary(LibraryTemplateData context, Template template) { var buffer = StringBuffer(); _render_LibraryTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_LibraryTemplateData(LibraryTemplateData? context, +void _render_LibraryTemplateData(LibraryTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_LibraryTemplateData(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_LibraryTemplateData extends RendererBase { +class _Renderer_LibraryTemplateData extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends LibraryTemplateData>() => @@ -8736,12 +8741,12 @@ class _Renderer_LibraryTemplateData extends RendererBase { ), }) as Map>; - _Renderer_LibraryTemplateData(LibraryTemplateData? context, + _Renderer_LibraryTemplateData(LibraryTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -8750,7 +8755,7 @@ class _Renderer_LibraryTemplateData extends RendererBase { } } -class _Renderer_Locatable extends RendererBase { +class _Renderer_Locatable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -8817,7 +8822,7 @@ class _Renderer_Locatable extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'location': Property( @@ -8844,12 +8849,12 @@ class _Renderer_Locatable extends RendererBase { ), }) as Map>; - _Renderer_Locatable(Locatable? context, RendererBase? parent, + _Renderer_Locatable(Locatable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -8859,7 +8864,7 @@ class _Renderer_Locatable extends RendererBase { } class _Renderer_MarkdownFileDocumentation - extends RendererBase { + extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends MarkdownFileDocumentation>() => @@ -8906,7 +8911,8 @@ class _Renderer_MarkdownFileDocumentation isNullValue: (CT_ c) => c.documentationAsHtml == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.documentationAsHtml, ast, r.template, sink, + _render_String( + c.documentationAsHtml!, ast, r.template, sink, parent: r); }, ), @@ -9009,18 +9015,18 @@ class _Renderer_MarkdownFileDocumentation isNullValue: (CT_ c) => c.oneLineDoc == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.oneLineDoc, ast, r.template, sink, + _render_String(c.oneLineDoc!, ast, r.template, sink, parent: r); }, ), }) as Map>; - _Renderer_MarkdownFileDocumentation(MarkdownFileDocumentation? context, + _Renderer_MarkdownFileDocumentation(MarkdownFileDocumentation context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -9029,14 +9035,14 @@ class _Renderer_MarkdownFileDocumentation } } -void _render_Method(Method? context, List ast, Template template, - StringSink sink, +void _render_Method( + Method context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Method(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Method extends RendererBase { +class _Renderer_Method extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -9093,7 +9099,7 @@ class _Renderer_Method extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -9172,7 +9178,7 @@ class _Renderer_Method extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'isCovariant': Property( @@ -9278,7 +9284,7 @@ class _Renderer_Method extends RendererBase { isNullValue: (CT_ c) => c.overriddenElement == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Method(c.overriddenElement, ast, r.template, sink, + _render_Method(c.overriddenElement!, ast, r.template, sink, parent: r); }, ), @@ -9310,12 +9316,12 @@ class _Renderer_Method extends RendererBase { ), }) as Map>; - _Renderer_Method(Method? context, RendererBase? parent, + _Renderer_Method(Method context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -9324,20 +9330,20 @@ class _Renderer_Method extends RendererBase { } } -String renderMethod(MethodTemplateData? context, Template template) { +String renderMethod(MethodTemplateData context, Template template) { var buffer = StringBuffer(); _render_MethodTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_MethodTemplateData(MethodTemplateData? context, +void _render_MethodTemplateData(MethodTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_MethodTemplateData(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_MethodTemplateData extends RendererBase { +class _Renderer_MethodTemplateData extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends MethodTemplateData>() => @@ -9567,12 +9573,12 @@ class _Renderer_MethodTemplateData extends RendererBase { ), }) as Map>; - _Renderer_MethodTemplateData(MethodTemplateData? context, + _Renderer_MethodTemplateData(MethodTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -9581,7 +9587,7 @@ class _Renderer_MethodTemplateData extends RendererBase { } } -class _Renderer_MixedInTypes extends RendererBase { +class _Renderer_MixedInTypes extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -9629,12 +9635,12 @@ class _Renderer_MixedInTypes extends RendererBase { ), }) as Map>; - _Renderer_MixedInTypes(MixedInTypes? context, RendererBase? parent, + _Renderer_MixedInTypes(MixedInTypes context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -9644,13 +9650,13 @@ class _Renderer_MixedInTypes extends RendererBase { } void _render_Mixin( - Mixin? context, List ast, Template template, StringSink sink, + Mixin context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Mixin(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Mixin extends RendererBase { +class _Renderer_Mixin extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -9703,7 +9709,7 @@ class _Renderer_Mixin extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.inheritanceChain.map((e) => - _render_InheritingContainer(e, ast, r.template, sink, + _render_InheritingContainer(e!, ast, r.template, sink, parent: r)); }, ), @@ -9757,12 +9763,12 @@ class _Renderer_Mixin extends RendererBase { ), }) as Map>; - _Renderer_Mixin(Mixin? context, RendererBase? parent, + _Renderer_Mixin(Mixin context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -9771,20 +9777,20 @@ class _Renderer_Mixin extends RendererBase { } } -String renderMixin(MixinTemplateData? context, Template template) { +String renderMixin(MixinTemplateData context, Template template) { var buffer = StringBuffer(); _render_MixinTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_MixinTemplateData(MixinTemplateData? context, +void _render_MixinTemplateData(MixinTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_MixinTemplateData(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_MixinTemplateData extends RendererBase { +class _Renderer_MixinTemplateData extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends MixinTemplateData>() => @@ -9837,12 +9843,12 @@ class _Renderer_MixinTemplateData extends RendererBase { ), }) as Map>; - _Renderer_MixinTemplateData(MixinTemplateData? context, + _Renderer_MixinTemplateData(MixinTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -9851,7 +9857,7 @@ class _Renderer_MixinTemplateData extends RendererBase { } } -class _Renderer_ModelBuilder extends RendererBase { +class _Renderer_ModelBuilder extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -9886,12 +9892,12 @@ class _Renderer_ModelBuilder extends RendererBase { ), }) as Map>; - _Renderer_ModelBuilder(ModelBuilder? context, RendererBase? parent, + _Renderer_ModelBuilder(ModelBuilder context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -9900,14 +9906,14 @@ class _Renderer_ModelBuilder extends RendererBase { } } -void _render_ModelElement(ModelElement? context, List ast, +void _render_ModelElement(ModelElement context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_ModelElement(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_ModelElement extends RendererBase { +class _Renderer_ModelElement extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -9967,7 +9973,7 @@ class _Renderer_ModelElement extends RendererBase { isNullValue: (CT_ c) => c.canonicalLibrary == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.canonicalLibrary, ast, r.template, sink, + _render_Library(c.canonicalLibrary!, ast, r.template, sink, parent: r); }, ), @@ -9990,7 +9996,7 @@ class _Renderer_ModelElement extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.canonicalModelElement, ast, r.template, sink, + c.canonicalModelElement!, ast, r.template, sink, parent: r); }, ), @@ -10105,7 +10111,7 @@ class _Renderer_ModelElement extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.displayedCategories.map((e) => - _render_Category(e, ast, r.template, sink, parent: r)); + _render_Category(e!, ast, r.template, sink, parent: r)); }, ), 'documentation': Property( @@ -10275,7 +10281,7 @@ class _Renderer_ModelElement extends RendererBase { isNullValue: (CT_ c) => c.filePath == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.filePath, ast, r.template, sink, + _render_String(c.filePath!, ast, r.template, sink, parent: r); }, ), @@ -10420,7 +10426,7 @@ class _Renderer_ModelElement extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'htmlId': Property( @@ -10588,7 +10594,7 @@ class _Renderer_ModelElement extends RendererBase { isNullValue: (CT_ c) => c.library == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.library, ast, r.template, sink, + _render_Library(c.library!, ast, r.template, sink, parent: r); }, ), @@ -10677,7 +10683,7 @@ class _Renderer_ModelElement extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_String( - c.linkedParamsNoMetadata, ast, r.template, sink, + c.linkedParamsNoMetadata!, ast, r.template, sink, parent: r); }, ), @@ -10789,7 +10795,7 @@ class _Renderer_ModelElement extends RendererBase { isNullValue: (CT_ c) => c.oneLineDoc == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.oneLineDoc, ast, r.template, sink, + _render_String(c.oneLineDoc!, ast, r.template, sink, parent: r); }, ), @@ -10823,7 +10829,7 @@ class _Renderer_ModelElement extends RendererBase { isNullValue: (CT_ c) => c.package == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Package(c.package, ast, r.template, sink, + _render_Package(c.package!, ast, r.template, sink, parent: r); }, ), @@ -10932,12 +10938,12 @@ class _Renderer_ModelElement extends RendererBase { ), }) as Map>; - _Renderer_ModelElement(ModelElement? context, RendererBase? parent, + _Renderer_ModelElement(ModelElement context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -10946,14 +10952,14 @@ class _Renderer_ModelElement extends RendererBase { } } -void _render_ModelFunction(ModelFunction? context, List ast, +void _render_ModelFunction(ModelFunction context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_ModelFunction(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_ModelFunction extends RendererBase { +class _Renderer_ModelFunction extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -11005,12 +11011,12 @@ class _Renderer_ModelFunction extends RendererBase { ), }) as Map>; - _Renderer_ModelFunction(ModelFunction? context, RendererBase? parent, + _Renderer_ModelFunction(ModelFunction context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -11019,14 +11025,14 @@ class _Renderer_ModelFunction extends RendererBase { } } -void _render_ModelFunctionTyped(ModelFunctionTyped? context, +void _render_ModelFunctionTyped(ModelFunctionTyped context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_ModelFunctionTyped(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_ModelFunctionTyped extends RendererBase { +class _Renderer_ModelFunctionTyped extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends ModelFunctionTyped>() => @@ -11068,7 +11074,7 @@ class _Renderer_ModelFunctionTyped extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -11112,7 +11118,7 @@ class _Renderer_ModelFunctionTyped extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'isInherited': Property( @@ -11229,12 +11235,12 @@ class _Renderer_ModelFunctionTyped extends RendererBase { ), }) as Map>; - _Renderer_ModelFunctionTyped(ModelFunctionTyped? context, + _Renderer_ModelFunctionTyped(ModelFunctionTyped context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -11243,7 +11249,7 @@ class _Renderer_ModelFunctionTyped extends RendererBase { } } -class _Renderer_Nameable extends RendererBase { +class _Renderer_Nameable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -11311,7 +11317,7 @@ class _Renderer_Nameable extends RendererBase { isNullValue: (CT_ c) => c.namePart == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.namePart, ast, r.template, sink, + _render_String(c.namePart!, ast, r.template, sink, parent: r); }, ), @@ -11330,12 +11336,12 @@ class _Renderer_Nameable extends RendererBase { ), }) as Map>; - _Renderer_Nameable(Nameable? context, RendererBase? parent, + _Renderer_Nameable(Nameable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -11344,7 +11350,7 @@ class _Renderer_Nameable extends RendererBase { } } -class _Renderer_Object extends RendererBase { +class _Renderer_Object extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -11364,12 +11370,12 @@ class _Renderer_Object extends RendererBase { ), }) as Map>; - _Renderer_Object(Object? context, RendererBase? parent, + _Renderer_Object(Object context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -11378,14 +11384,14 @@ class _Renderer_Object extends RendererBase { } } -void _render_Operator(Operator? context, List ast, +void _render_Operator(Operator context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Operator(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Operator extends RendererBase { +class _Renderer_Operator extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -11488,12 +11494,12 @@ class _Renderer_Operator extends RendererBase { ), }) as Map>; - _Renderer_Operator(Operator? context, RendererBase? parent, + _Renderer_Operator(Operator context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -11502,14 +11508,14 @@ class _Renderer_Operator extends RendererBase { } } -void _render_Package(Package? context, List ast, +void _render_Package(Package context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Package(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Package extends RendererBase { +class _Renderer_Package extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -11552,7 +11558,7 @@ class _Renderer_Package extends RendererBase { isNullValue: (CT_ c) => c.baseHref == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.baseHref, ast, r.template, sink, + _render_String(c.baseHref!, ast, r.template, sink, parent: r); }, ), @@ -11574,7 +11580,7 @@ class _Renderer_Package extends RendererBase { isNullValue: (CT_ c) => c.canonicalLibrary == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.canonicalLibrary, ast, r.template, sink, + _render_Library(c.canonicalLibrary!, ast, r.template, sink, parent: r); }, ), @@ -11638,7 +11644,7 @@ class _Renderer_Package extends RendererBase { renderIterable: (CT_ c, RendererBase r, List ast, StringSink sink) { return c.containerOrder.map((e) => - _render_String(e, ast, r.template, sink, parent: r)); + _render_String(e!, ast, r.template, sink, parent: r)); }, ), 'defaultCategory': Property( @@ -11660,7 +11666,7 @@ class _Renderer_Package extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_LibraryContainer( - c.defaultCategory, ast, r.template, sink, + c.defaultCategory!, ast, r.template, sink, parent: r); }, ), @@ -11682,7 +11688,7 @@ class _Renderer_Package extends RendererBase { isNullValue: (CT_ c) => c.documentation == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.documentation, ast, r.template, sink, + _render_String(c.documentation!, ast, r.template, sink, parent: r); }, ), @@ -11704,7 +11710,8 @@ class _Renderer_Package extends RendererBase { isNullValue: (CT_ c) => c.documentationAsHtml == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.documentationAsHtml, ast, r.template, sink, + _render_String( + c.documentationAsHtml!, ast, r.template, sink, parent: r); }, ), @@ -12190,7 +12197,7 @@ class _Renderer_Package extends RendererBase { isNullValue: (CT_ c) => c.packagePath == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.packagePath, ast, r.template, sink, + _render_String(c.packagePath!, ast, r.template, sink, parent: r); }, ), @@ -12304,12 +12311,12 @@ class _Renderer_Package extends RendererBase { ), }) as Map>; - _Renderer_Package(Package? context, RendererBase? parent, + _Renderer_Package(Package context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -12318,20 +12325,20 @@ class _Renderer_Package extends RendererBase { } } -String renderIndex(PackageTemplateData? context, Template template) { +String renderIndex(PackageTemplateData context, Template template) { var buffer = StringBuffer(); _render_PackageTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_PackageTemplateData(PackageTemplateData? context, +void _render_PackageTemplateData(PackageTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_PackageTemplateData(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_PackageTemplateData extends RendererBase { +class _Renderer_PackageTemplateData extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends PackageTemplateData>() => @@ -12520,12 +12527,12 @@ class _Renderer_PackageTemplateData extends RendererBase { ), }) as Map>; - _Renderer_PackageTemplateData(PackageTemplateData? context, + _Renderer_PackageTemplateData(PackageTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -12534,20 +12541,20 @@ class _Renderer_PackageTemplateData extends RendererBase { } } -String renderError(PackageTemplateData? context, Template template) { +String renderError(PackageTemplateData context, Template template) { var buffer = StringBuffer(); _render_PackageTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_Parameter(Parameter? context, List ast, +void _render_Parameter(Parameter context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Parameter(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Parameter extends RendererBase { +class _Renderer_Parameter extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -12572,7 +12579,7 @@ class _Renderer_Parameter extends RendererBase { isNullValue: (CT_ c) => c.defaultValue == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.defaultValue, ast, r.template, sink, + _render_String(c.defaultValue!, ast, r.template, sink, parent: r); }, ), @@ -12672,7 +12679,7 @@ class _Renderer_Parameter extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'htmlId': Property( @@ -12817,12 +12824,12 @@ class _Renderer_Parameter extends RendererBase { ), }) as Map>; - _Renderer_Parameter(Parameter? context, RendererBase? parent, + _Renderer_Parameter(Parameter context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -12831,7 +12838,7 @@ class _Renderer_Parameter extends RendererBase { } } -void _render_ParameterizedElementType(ParameterizedElementType? context, +void _render_ParameterizedElementType(ParameterizedElementType context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = @@ -12840,7 +12847,7 @@ void _render_ParameterizedElementType(ParameterizedElementType? context, } class _Renderer_ParameterizedElementType - extends RendererBase { + extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => @@ -12878,12 +12885,12 @@ class _Renderer_ParameterizedElementType ), }) as Map>; - _Renderer_ParameterizedElementType(ParameterizedElementType? context, + _Renderer_ParameterizedElementType(ParameterizedElementType context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -12892,7 +12899,7 @@ class _Renderer_ParameterizedElementType } } -class _Renderer_Privacy extends RendererBase { +class _Renderer_Privacy extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -12908,12 +12915,12 @@ class _Renderer_Privacy extends RendererBase { ), }) as Map>; - _Renderer_Privacy(Privacy? context, RendererBase? parent, + _Renderer_Privacy(Privacy context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -12922,13 +12929,13 @@ class _Renderer_Privacy extends RendererBase { } } -String renderProperty(PropertyTemplateData? context, Template template) { +String renderProperty(PropertyTemplateData context, Template template) { var buffer = StringBuffer(); _render_PropertyTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_PropertyTemplateData(PropertyTemplateData? context, +void _render_PropertyTemplateData(PropertyTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = @@ -12937,7 +12944,7 @@ void _render_PropertyTemplateData(PropertyTemplateData? context, } class _Renderer_PropertyTemplateData - extends RendererBase { + extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends PropertyTemplateData>() => @@ -13167,12 +13174,12 @@ class _Renderer_PropertyTemplateData ), }) as Map>; - _Renderer_PropertyTemplateData(PropertyTemplateData? context, + _Renderer_PropertyTemplateData(PropertyTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -13181,7 +13188,7 @@ class _Renderer_PropertyTemplateData } } -class _Renderer_Rendered extends RendererBase { +class _Renderer_Rendered extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -13233,12 +13240,12 @@ class _Renderer_Rendered extends RendererBase { ), }) as Map>; - _Renderer_Rendered(Rendered? context, RendererBase? parent, + _Renderer_Rendered(Rendered context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -13247,7 +13254,7 @@ class _Renderer_Rendered extends RendererBase { } } -class _Renderer_SourceCodeMixin extends RendererBase { +class _Renderer_SourceCodeMixin extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends SourceCodeMixin>() => @@ -13306,7 +13313,7 @@ class _Renderer_SourceCodeMixin extends RendererBase { isNullValue: (CT_ c) => c.library == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.library, ast, r.template, sink, + _render_Library(c.library!, ast, r.template, sink, parent: r); }, ), @@ -13346,12 +13353,12 @@ class _Renderer_SourceCodeMixin extends RendererBase { ), }) as Map>; - _Renderer_SourceCodeMixin(SourceCodeMixin? context, + _Renderer_SourceCodeMixin(SourceCodeMixin context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -13360,14 +13367,14 @@ class _Renderer_SourceCodeMixin extends RendererBase { } } -void _render_String(String? context, List ast, Template template, - StringSink sink, +void _render_String( + String context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_String(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_String extends RendererBase { +class _Renderer_String extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -13438,12 +13445,12 @@ class _Renderer_String extends RendererBase { ), }) as Map>; - _Renderer_String(String? context, RendererBase? parent, + _Renderer_String(String context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -13453,7 +13460,7 @@ class _Renderer_String extends RendererBase { } class _Renderer_TemplateData - extends RendererBase?> { + extends RendererBase> { static final Map _propertyMapCache = {}; static Map> propertyMap() => @@ -13603,7 +13610,7 @@ class _Renderer_TemplateData isNullValue: (CT_ c) => c.homepage == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.homepage, ast, r.template, sink, + _render_String(c.homepage!, ast, r.template, sink, parent: r); }, ), @@ -13749,7 +13756,7 @@ class _Renderer_TemplateData isNullValue: (CT_ c) => c.parent == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Documentable(c.parent, ast, r.template, sink, + _render_Documentable(c.parent!, ast, r.template, sink, parent: r); }, ), @@ -13771,7 +13778,7 @@ class _Renderer_TemplateData isNullValue: (CT_ c) => c.relCanonicalPrefix == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.relCanonicalPrefix, ast, r.template, sink, + _render_String(c.relCanonicalPrefix!, ast, r.template, sink, parent: r); }, ), @@ -13848,12 +13855,12 @@ class _Renderer_TemplateData ), }) as Map>; - _Renderer_TemplateData(TemplateData? context, RendererBase? parent, + _Renderer_TemplateData(TemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property?>? getProperty(String key) { + Property>? getProperty(String key) { if (propertyMap>().containsKey(key)) { return propertyMap>()[key]; } else { @@ -13863,14 +13870,14 @@ class _Renderer_TemplateData } String renderSidebarForContainer( - TemplateDataWithContainer? context, Template template) { + TemplateDataWithContainer context, Template template) { var buffer = StringBuffer(); _render_TemplateDataWithContainer(context, template.ast, template, buffer); return buffer.toString(); } void _render_TemplateDataWithContainer( - TemplateDataWithContainer? context, + TemplateDataWithContainer context, List ast, Template template, StringSink sink, @@ -13881,7 +13888,7 @@ void _render_TemplateDataWithContainer( } class _Renderer_TemplateDataWithContainer - extends RendererBase?> { + extends RendererBase> { static final Map _propertyMapCache = {}; static Map> propertyMap() => @@ -13913,12 +13920,12 @@ class _Renderer_TemplateDataWithContainer ), }) as Map>; - _Renderer_TemplateDataWithContainer(TemplateDataWithContainer? context, + _Renderer_TemplateDataWithContainer(TemplateDataWithContainer context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property?>? getProperty(String key) { + Property>? getProperty(String key) { if (propertyMap>().containsKey(key)) { return propertyMap>()[key]; } else { @@ -13928,14 +13935,14 @@ class _Renderer_TemplateDataWithContainer } String renderSidebarForLibrary( - TemplateDataWithLibrary? context, Template template) { + TemplateDataWithLibrary context, Template template) { var buffer = StringBuffer(); _render_TemplateDataWithLibrary(context, template.ast, template, buffer); return buffer.toString(); } void _render_TemplateDataWithLibrary( - TemplateDataWithLibrary? context, + TemplateDataWithLibrary context, List ast, Template template, StringSink sink, @@ -13946,7 +13953,7 @@ void _render_TemplateDataWithLibrary( } class _Renderer_TemplateDataWithLibrary - extends RendererBase?> { + extends RendererBase> { static final Map _propertyMapCache = {}; static Map> propertyMap() => @@ -13978,12 +13985,12 @@ class _Renderer_TemplateDataWithLibrary ), }) as Map>; - _Renderer_TemplateDataWithLibrary(TemplateDataWithLibrary? context, + _Renderer_TemplateDataWithLibrary(TemplateDataWithLibrary context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property?>? getProperty(String key) { + Property>? getProperty(String key) { if (propertyMap>().containsKey(key)) { return propertyMap>()[key]; } else { @@ -13992,7 +13999,7 @@ class _Renderer_TemplateDataWithLibrary } } -class _Renderer_TopLevelContainer extends RendererBase { +class _Renderer_TopLevelContainer extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends TopLevelContainer>() => @@ -14398,12 +14405,12 @@ class _Renderer_TopLevelContainer extends RendererBase { ), }) as Map>; - _Renderer_TopLevelContainer(TopLevelContainer? context, + _Renderer_TopLevelContainer(TopLevelContainer context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -14413,13 +14420,13 @@ class _Renderer_TopLevelContainer extends RendererBase { } String renderTopLevelProperty( - TopLevelPropertyTemplateData? context, Template template) { + TopLevelPropertyTemplateData context, Template template) { var buffer = StringBuffer(); _render_TopLevelPropertyTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_TopLevelPropertyTemplateData(TopLevelPropertyTemplateData? context, +void _render_TopLevelPropertyTemplateData(TopLevelPropertyTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = @@ -14428,7 +14435,7 @@ void _render_TopLevelPropertyTemplateData(TopLevelPropertyTemplateData? context, } class _Renderer_TopLevelPropertyTemplateData - extends RendererBase { + extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends TopLevelPropertyTemplateData>() => @@ -14626,12 +14633,12 @@ class _Renderer_TopLevelPropertyTemplateData ), }) as Map>; - _Renderer_TopLevelPropertyTemplateData(TopLevelPropertyTemplateData? context, + _Renderer_TopLevelPropertyTemplateData(TopLevelPropertyTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -14640,14 +14647,14 @@ class _Renderer_TopLevelPropertyTemplateData } } -void _render_TopLevelVariable(TopLevelVariable? context, - List ast, Template template, StringSink sink, +void _render_TopLevelVariable(TopLevelVariable context, List ast, + Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_TopLevelVariable(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_TopLevelVariable extends RendererBase { +class _Renderer_TopLevelVariable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends TopLevelVariable>() => @@ -14698,7 +14705,7 @@ class _Renderer_TopLevelVariable extends RendererBase { renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { _render_ModelElement( - c.enclosingElement, ast, r.template, sink, + c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -14777,7 +14784,7 @@ class _Renderer_TopLevelVariable extends RendererBase { isNullValue: (CT_ c) => c.getter == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Accessor(c.getter, ast, r.template, sink, + _render_Accessor(c.getter!, ast, r.template, sink, parent: r); }, ), @@ -14799,7 +14806,7 @@ class _Renderer_TopLevelVariable extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'isConst': Property( @@ -14927,18 +14934,18 @@ class _Renderer_TopLevelVariable extends RendererBase { isNullValue: (CT_ c) => c.setter == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Accessor(c.setter, ast, r.template, sink, + _render_Accessor(c.setter!, ast, r.template, sink, parent: r); }, ), }) as Map>; - _Renderer_TopLevelVariable(TopLevelVariable? context, + _Renderer_TopLevelVariable(TopLevelVariable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -14947,7 +14954,7 @@ class _Renderer_TopLevelVariable extends RendererBase { } } -class _Renderer_TypeImplementing extends RendererBase { +class _Renderer_TypeImplementing extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends TypeImplementing>() => @@ -15042,12 +15049,12 @@ class _Renderer_TypeImplementing extends RendererBase { ), }) as Map>; - _Renderer_TypeImplementing(TypeImplementing? context, + _Renderer_TypeImplementing(TypeImplementing context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -15056,14 +15063,14 @@ class _Renderer_TypeImplementing extends RendererBase { } } -void _render_TypeParameter(TypeParameter? context, List ast, +void _render_TypeParameter(TypeParameter context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_TypeParameter(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_TypeParameter extends RendererBase { +class _Renderer_TypeParameter extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -15088,7 +15095,7 @@ class _Renderer_TypeParameter extends RendererBase { isNullValue: (CT_ c) => c.boundType == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_ElementType(c.boundType, ast, r.template, sink, + _render_ElementType(c.boundType!, ast, r.template, sink, parent: r); }, ), @@ -15176,7 +15183,7 @@ class _Renderer_TypeParameter extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'kind': Property( @@ -15294,12 +15301,12 @@ class _Renderer_TypeParameter extends RendererBase { ), }) as Map>; - _Renderer_TypeParameter(TypeParameter? context, RendererBase? parent, + _Renderer_TypeParameter(TypeParameter context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -15308,7 +15315,7 @@ class _Renderer_TypeParameter extends RendererBase { } } -class _Renderer_TypeParameters extends RendererBase { +class _Renderer_TypeParameters extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -15426,12 +15433,12 @@ class _Renderer_TypeParameters extends RendererBase { ), }) as Map>; - _Renderer_TypeParameters(TypeParameters? context, - RendererBase? parent, Template template, StringSink sink) + _Renderer_TypeParameters(TypeParameters context, RendererBase? parent, + Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -15440,14 +15447,14 @@ class _Renderer_TypeParameters extends RendererBase { } } -void _render_Typedef(Typedef? context, List ast, +void _render_Typedef(Typedef context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_Typedef(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_Typedef extends RendererBase { +class _Renderer_Typedef extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -15522,7 +15529,7 @@ class _Renderer_Typedef extends RendererBase { isNullValue: (CT_ c) => c.enclosingElement == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Library(c.enclosingElement, ast, r.template, sink, + _render_Library(c.enclosingElement!, ast, r.template, sink, parent: r); }, ), @@ -15588,7 +15595,7 @@ class _Renderer_Typedef extends RendererBase { isNullValue: (CT_ c) => c.href == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_String(c.href, ast, r.template, sink, parent: r); + _render_String(c.href!, ast, r.template, sink, parent: r); }, ), 'isInherited': Property( @@ -15772,12 +15779,12 @@ class _Renderer_Typedef extends RendererBase { ), }) as Map>; - _Renderer_Typedef(Typedef? context, RendererBase? parent, + _Renderer_Typedef(Typedef context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -15786,20 +15793,20 @@ class _Renderer_Typedef extends RendererBase { } } -String renderTypedef(TypedefTemplateData? context, Template template) { +String renderTypedef(TypedefTemplateData context, Template template) { var buffer = StringBuffer(); _render_TypedefTemplateData(context, template.ast, template, buffer); return buffer.toString(); } -void _render_TypedefTemplateData(TypedefTemplateData? context, +void _render_TypedefTemplateData(TypedefTemplateData context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = _Renderer_TypedefTemplateData(context, parent, template, sink); renderer.renderBlock(ast); } -class _Renderer_TypedefTemplateData extends RendererBase { +class _Renderer_TypedefTemplateData extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap< CT_ extends TypedefTemplateData>() => @@ -15996,12 +16003,12 @@ class _Renderer_TypedefTemplateData extends RendererBase { ), }) as Map>; - _Renderer_TypedefTemplateData(TypedefTemplateData? context, + _Renderer_TypedefTemplateData(TypedefTemplateData context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -16010,7 +16017,7 @@ class _Renderer_TypedefTemplateData extends RendererBase { } } -class _Renderer_Warnable extends RendererBase { +class _Renderer_Warnable extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -16068,18 +16075,18 @@ class _Renderer_Warnable extends RendererBase { isNullValue: (CT_ c) => c.package == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Package(c.package, ast, r.template, sink, + _render_Package(c.package!, ast, r.template, sink, parent: r); }, ), }) as Map>; - _Renderer_Warnable(Warnable? context, RendererBase? parent, + _Renderer_Warnable(Warnable context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { diff --git a/lib/src/mustachio/renderer_base.dart b/lib/src/mustachio/renderer_base.dart index 10b4f70e17..ebf048b7ce 100644 --- a/lib/src/mustachio/renderer_base.dart +++ b/lib/src/mustachio/renderer_base.dart @@ -342,7 +342,7 @@ class SimpleRenderer extends RendererBase { /// An individual property of objects of type [T], including functions for /// rendering various types of Mustache nodes. @immutable -class Property { +class Property { /// Gets the value of this property on the object [context]. final Object? Function(T context) getValue; diff --git a/test/mustachio/aot_compiler_render_test.dart b/test/mustachio/aot_compiler_render_test.dart index 470de5e807..47cd8e63bb 100644 --- a/test/mustachio/aot_compiler_render_test.dart +++ b/test/mustachio/aot_compiler_render_test.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// @dart=2.9 - import 'dart:async'; import 'dart:convert' show json, utf8; import 'dart:io'; @@ -62,9 +60,9 @@ class Property3 { String? s; } '''; - InMemoryAssetWriter writer; - Directory tempDir; - File renderScript; + late InMemoryAssetWriter writer; + late Directory tempDir; + late File renderScript; setUp(() { writer = InMemoryAssetWriter(); @@ -87,7 +85,7 @@ import 'package:mustachio/annotations.dart'; additionalAssets: additionalAssets, ); var rendererAsset = AssetId('foo', 'lib/foo.aot_renderers_for_html.dart'); - var generatedContent = utf8.decode(writer.assets[rendererAsset]); + var generatedContent = utf8.decode(writer.assets[rendererAsset]!); renderScript.writeAsStringSync(''' import 'dart:io'; diff --git a/test/mustachio/foo.runtime_renderers.dart b/test/mustachio/foo.runtime_renderers.dart index bb44c210a2..c4a0935092 100644 --- a/test/mustachio/foo.runtime_renderers.dart +++ b/test/mustachio/foo.runtime_renderers.dart @@ -21,20 +21,20 @@ import 'package:dartdoc/src/mustachio/renderer_base.dart'; import 'package:dartdoc/src/warnings.dart'; import 'foo.dart'; -String renderBar(Bar? context, Template template) { +String renderBar(Bar context, Template template) { var buffer = StringBuffer(); _render_Bar(context, template.ast, template, buffer); return buffer.toString(); } void _render_Bar( - Bar? context, List ast, Template template, StringSink sink, + Bar context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = Renderer_Bar(context, parent, template, sink); renderer.renderBlock(ast); } -class Renderer_Bar extends RendererBase { +class Renderer_Bar extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -57,7 +57,7 @@ class Renderer_Bar extends RendererBase { isNullValue: (CT_ c) => c.baz == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Baz(c.baz, ast, r.template, sink, parent: r); + _render_Baz(c.baz!, ast, r.template, sink, parent: r); }, ), 'foo': Property( @@ -76,7 +76,7 @@ class Renderer_Bar extends RendererBase { isNullValue: (CT_ c) => c.foo == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Foo(c.foo, ast, r.template, sink, parent: r); + _render_Foo(c.foo!, ast, r.template, sink, parent: r); }, ), 'l1': Property( @@ -100,12 +100,12 @@ class Renderer_Bar extends RendererBase { ), }) as Map>; - Renderer_Bar(Bar? context, RendererBase? parent, Template template, + Renderer_Bar(Bar context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -114,20 +114,20 @@ class Renderer_Bar extends RendererBase { } } -String renderBaz(Baz? context, Template template) { +String renderBaz(Baz context, Template template) { var buffer = StringBuffer(); _render_Baz(context, template.ast, template, buffer); return buffer.toString(); } void _render_Baz( - Baz? context, List ast, Template template, StringSink sink, + Baz context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = Renderer_Baz(context, parent, template, sink); renderer.renderBlock(ast); } -class Renderer_Baz extends RendererBase { +class Renderer_Baz extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -150,17 +150,17 @@ class Renderer_Baz extends RendererBase { isNullValue: (CT_ c) => c.bar == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Bar(c.bar, ast, r.template, sink, parent: r); + _render_Bar(c.bar!, ast, r.template, sink, parent: r); }, ), }) as Map>; - Renderer_Baz(Baz? context, RendererBase? parent, Template template, + Renderer_Baz(Baz context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -169,20 +169,20 @@ class Renderer_Baz extends RendererBase { } } -String renderFoo(Foo? context, Template template) { +String renderFoo(Foo context, Template template) { var buffer = StringBuffer(); _render_Foo(context, template.ast, template, buffer); return buffer.toString(); } void _render_Foo( - Foo? context, List ast, Template template, StringSink sink, + Foo context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = Renderer_Foo(context, parent, template, sink); renderer.renderBlock(ast); } -class Renderer_Foo extends RendererBase { +class Renderer_Foo extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -212,7 +212,7 @@ class Renderer_Foo extends RendererBase { isNullValue: (CT_ c) => c.baz == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Baz(c.baz, ast, r.template, sink, parent: r); + _render_Baz(c.baz!, ast, r.template, sink, parent: r); }, ), 'l1': Property( @@ -257,7 +257,7 @@ class Renderer_Foo extends RendererBase { isNullValue: (CT_ c) => c.p1 == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Property1(c.p1, ast, r.template, sink, parent: r); + _render_Property1(c.p1!, ast, r.template, sink, parent: r); }, ), 's1': Property( @@ -274,12 +274,12 @@ class Renderer_Foo extends RendererBase { ), }) as Map>; - Renderer_Foo(Foo? context, RendererBase? parent, Template template, + Renderer_Foo(Foo context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -288,7 +288,7 @@ class Renderer_Foo extends RendererBase { } } -class Renderer_FooBase extends RendererBase?> { +class Renderer_FooBase extends RendererBase> { static final Map _propertyMapCache = {}; static Map> propertyMap() => @@ -320,12 +320,12 @@ class Renderer_FooBase extends RendererBase?> { ), }) as Map>; - Renderer_FooBase(FooBase? context, RendererBase? parent, + Renderer_FooBase(FooBase context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property?>? getProperty(String key) { + Property>? getProperty(String key) { if (propertyMap>().containsKey(key)) { return propertyMap>()[key]; } else { @@ -334,7 +334,7 @@ class Renderer_FooBase extends RendererBase?> { } } -class Renderer_Mixin1 extends RendererBase { +class Renderer_Mixin1 extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -358,17 +358,17 @@ class Renderer_Mixin1 extends RendererBase { isNullValue: (CT_ c) => c.p3 == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Property3(c.p3, ast, r.template, sink, parent: r); + _render_Property3(c.p3!, ast, r.template, sink, parent: r); }, ), }) as Map>; - Renderer_Mixin1(Mixin1? context, RendererBase? parent, + Renderer_Mixin1(Mixin1 context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -377,7 +377,7 @@ class Renderer_Mixin1 extends RendererBase { } } -class Renderer_Object extends RendererBase { +class Renderer_Object extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -397,12 +397,12 @@ class Renderer_Object extends RendererBase { ), }) as Map>; - Renderer_Object(Object? context, RendererBase? parent, + Renderer_Object(Object context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -411,14 +411,14 @@ class Renderer_Object extends RendererBase { } } -void _render_Property1(Property1? context, List ast, +void _render_Property1(Property1 context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = Renderer_Property1(context, parent, template, sink); renderer.renderBlock(ast); } -class Renderer_Property1 extends RendererBase { +class Renderer_Property1 extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -443,17 +443,17 @@ class Renderer_Property1 extends RendererBase { isNullValue: (CT_ c) => c.p2 == null, renderValue: (CT_ c, RendererBase r, List ast, StringSink sink) { - _render_Property2(c.p2, ast, r.template, sink, parent: r); + _render_Property2(c.p2!, ast, r.template, sink, parent: r); }, ), }) as Map>; - Renderer_Property1(Property1? context, RendererBase? parent, + Renderer_Property1(Property1 context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -462,14 +462,14 @@ class Renderer_Property1 extends RendererBase { } } -void _render_Property2(Property2? context, List ast, +void _render_Property2(Property2 context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = Renderer_Property2(context, parent, template, sink); renderer.renderBlock(ast); } -class Renderer_Property2 extends RendererBase { +class Renderer_Property2 extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -491,12 +491,12 @@ class Renderer_Property2 extends RendererBase { ), }) as Map>; - Renderer_Property2(Property2? context, RendererBase? parent, + Renderer_Property2(Property2 context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { @@ -505,14 +505,14 @@ class Renderer_Property2 extends RendererBase { } } -void _render_Property3(Property3? context, List ast, +void _render_Property3(Property3 context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = Renderer_Property3(context, parent, template, sink); renderer.renderBlock(ast); } -class Renderer_Property3 extends RendererBase { +class Renderer_Property3 extends RendererBase { static final Map _propertyMapCache = {}; static Map> propertyMap() => _propertyMapCache.putIfAbsent( @@ -533,12 +533,12 @@ class Renderer_Property3 extends RendererBase { ), }) as Map>; - Renderer_Property3(Property3? context, RendererBase? parent, + Renderer_Property3(Property3 context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); @override - Property? getProperty(String key) { + Property? getProperty(String key) { if (propertyMap().containsKey(key)) { return propertyMap()[key]; } else { diff --git a/test/mustachio/renderers_output_test.dart b/test/mustachio/renderers_output_test.dart index d124393a8a..148d76e596 100644 --- a/test/mustachio/renderers_output_test.dart +++ b/test/mustachio/renderers_output_test.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// @dart=2.9 - library dartdoc.dartdoc_test; import 'dart:async'; @@ -86,8 +84,7 @@ void main() { if (aotResource.shortName == '.') continue; if (aotResource.shortName == '..') continue; if (aotResource.shortName == 'static-assets') continue; - expect(runtimeResource is Folder, true); - checkDirectories(aotResource, runtimeResource); + checkDirectories(aotResource, runtimeResource as Folder); } else if (aotResource is File) { expect(runtimeResource is File, true); var contentInAot = aotResource.readAsStringSync(); diff --git a/test/mustachio/runtime_renderer_builder_test.dart b/test/mustachio/runtime_renderer_builder_test.dart index 704a944386..7ee365daf0 100644 --- a/test/mustachio/runtime_renderer_builder_test.dart +++ b/test/mustachio/runtime_renderer_builder_test.dart @@ -62,13 +62,13 @@ class Baz {} expect( generatedContent, contains( - 'class _Renderer_FooBase extends RendererBase?>')); + 'class _Renderer_FooBase extends RendererBase>')); }); test('for Object', () { // The renderer class for Object expect(generatedContent, - contains('class _Renderer_Object extends RendererBase {')); + contains('class _Renderer_Object extends RendererBase {')); }); test('for a class which is extended by a rendered class', () { @@ -203,20 +203,19 @@ import 'package:mustachio/annotations.dart'; test('with a corresponding public API function', () async { expect(generatedContent, - contains('String renderFoo(Foo? context, Template template)')); + contains('String renderFoo(Foo context, Template template)')); }); test('with a corresponding render function', () async { expect( generatedContent, - contains( - 'void _render_Foo(Foo? context, List ast, Template template,\n' - ' StringSink sink,\n')); + contains('void _render_Foo(\n' + ' Foo context, List ast, Template template, StringSink sink,\n')); }); test('with a generic supertype type argument', () async { expect(generatedContent, - contains('class _Renderer_Foo extends RendererBase?>')); + contains('class _Renderer_Foo extends RendererBase>')); }); test( diff --git a/test/mustachio/runtime_renderer_render_test.dart b/test/mustachio/runtime_renderer_render_test.dart index 07a3439aa7..6ceadb3b1a 100644 --- a/test/mustachio/runtime_renderer_render_test.dart +++ b/test/mustachio/runtime_renderer_render_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// @dart=2.9 import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/memory_file_system.dart'; import 'package:dartdoc/src/mustachio/renderer_base.dart'; @@ -12,9 +11,9 @@ import 'foo.dart'; import 'foo.runtime_renderers.dart'; void main() { - /*late*/ MemoryResourceProvider resourceProvider; + late MemoryResourceProvider resourceProvider; - /*late*/ p.Context pathContext; + late p.Context pathContext; File getFile(String path) => resourceProvider .getFile(pathContext.canonicalize(resourceProvider.convertPath(path))); @@ -38,7 +37,7 @@ void main() { test('property map contains valid bool Properties', () { var propertyMap = Renderer_Foo.propertyMap(); - var b1 = propertyMap['b1'] /*!*/; + var b1 = propertyMap['b1']!; expect(b1.getValue, isNotNull); expect(b1.renderVariable, isNotNull); expect(b1.getBool, isNotNull); @@ -49,7 +48,7 @@ void main() { test('property map contains valid Iterable Properties', () { var propertyMap = Renderer_Foo.propertyMap(); - var l1 = propertyMap['l1'] /*!*/; + var l1 = propertyMap['l1']!; expect(l1.getValue, isNotNull); expect(l1.renderVariable, isNotNull); expect(l1.getBool, isNull); @@ -60,7 +59,7 @@ void main() { test('property map contains valid non-bool, non-Iterable Properties', () { var propertyMap = Renderer_Foo.propertyMap(); - var s1 = propertyMap['s1'] /*!*/; + var s1 = propertyMap['s1']!; expect(s1.getValue, isNotNull); expect(s1.renderVariable, isNotNull); expect(s1.getBool, isNull); @@ -72,37 +71,37 @@ void main() { test('Property returns a field value by name', () { var propertyMap = Renderer_Foo.propertyMap(); var foo = Foo()..s1 = 'hello'; - expect(propertyMap['s1'] /*!*/ .getValue(foo), equals('hello')); + expect(propertyMap['s1']!.getValue(foo), equals('hello')); }); test('Property returns a bool field value by name', () { var propertyMap = Renderer_Foo.propertyMap(); var foo = Foo()..b1 = true; - expect(propertyMap['b1'] /*!*/ .getBool /*!*/ (foo), isTrue); + expect(propertyMap['b1']!.getBool!(foo), isTrue); }); test('isNullValue returns true when a value is null', () { var propertyMap = Renderer_Foo.propertyMap(); var foo = Foo()..length = null; - expect(propertyMap['length'] /*!*/ .isNullValue(foo), isTrue); + expect(propertyMap['length']!.isNullValue(foo), isTrue); }); test('isNullValue returns false when a value is not null', () { var propertyMap = Renderer_Foo.propertyMap(); var foo = Foo()..s1 = 'hello'; - expect(propertyMap['s1'] /*!*/ .isNullValue(foo), isFalse); + expect(propertyMap['s1']!.isNullValue(foo), isFalse); }); test('isNullValue returns false for a non-nullable field', () { var propertyMap = Renderer_Foo.propertyMap(); var foo = Foo()..b1 = true; - expect(propertyMap['b1'] /*!*/ .isNullValue(foo), isFalse); + expect(propertyMap['b1']!.isNullValue(foo), isFalse); }); test('Property returns false for a null bool field value', () { var propertyMap = Renderer_Bar.propertyMap(); var bar = Bar()..l1 = null; - expect(propertyMap['l1'] /*!*/ .getBool /*!*/ (bar), isFalse); + expect(propertyMap['l1']!.getBool!(bar), isFalse); }); test('Renderer renders a non-bool variable node, escaped', () async { @@ -326,7 +325,7 @@ void main() { ..writeAsStringSync('Text {{#bar}}{{bar.foo.baz.bar.foo.s1}}{{/bar}}'); var baz = Baz()..bar = (Bar()..foo = (Foo()..s1 = 'hello')); var bazTemplate = await Template.parse(bazTemplateFile); - baz.bar /*!*/ .foo /*!*/ .baz = baz; + baz.bar!.foo!.baz = baz; expect(renderBaz(baz, bazTemplate), equals('Text hello')); }); @@ -478,7 +477,7 @@ World () => renderFoo(foo, fooTemplate), throwsA(const TypeMatcher() .having((e) => e.message, 'message', contains(''' -line 1, column 8 of ${fooTemplateFile.path}: Failed to resolve 's2' as a property on any types in the context chain: Foo? +line 1, column 8 of ${fooTemplateFile.path}: Failed to resolve 's2' as a property on any types in the context chain: Foo ╷ 1 │ Text {{s2}} │ ^^ @@ -513,8 +512,8 @@ line 1, column 9 of ${fooTemplateFile.path}: Failed to resolve 's2' as a propert (e) => e.message, 'message', contains("Failed to resolve 'x' on Foo while resolving [x] as a " - 'property chain on any types in the context chain: Bar?, after ' - "first resolving 'foo' to a property on Bar?")))); + 'property chain on any types in the context chain: Bar, after ' + "first resolving 'foo' to a property on Bar")))); }); test('Renderer throws when it cannot resolve a multi-name section key', diff --git a/tool/mustachio/codegen_runtime_renderer.dart b/tool/mustachio/codegen_runtime_renderer.dart index 417efe3dfb..39b3c0e736 100644 --- a/tool/mustachio/codegen_runtime_renderer.dart +++ b/tool/mustachio/codegen_runtime_renderer.dart @@ -337,14 +337,12 @@ import '${p.basename(_sourceUri.path)}'; void _buildRenderer(_RendererInfo renderer, {required bool buildOnlyPublicFunction}) { var typeName = renderer._typeName; - var typeWithVariablesNullable = - '$typeName${renderer._typeVariablesString}?'; var typeWithVariables = '$typeName${renderer._typeVariablesString}'; if (renderer.publicApiFunctionName != null) { _buffer.writeln(''' String ${renderer.publicApiFunctionName}${renderer._typeParametersString}( - $typeWithVariablesNullable context, Template template) { + $typeWithVariables context, Template template) { var buffer = StringBuffer(); ${renderer._renderFunctionName}(context, template.ast, template, buffer); return buffer.toString(); @@ -358,7 +356,7 @@ String ${renderer.publicApiFunctionName}${renderer._typeParametersString}( if (renderer.includeRenderFunction) { _buffer.writeln(''' void ${renderer._renderFunctionName}${renderer._typeParametersString}( - $typeWithVariablesNullable context, List ast, + $typeWithVariables context, List ast, Template template, StringSink sink, {RendererBase? parent}) { var renderer = ${renderer._rendererClassName}(context, parent, template, sink); @@ -370,13 +368,13 @@ void ${renderer._renderFunctionName}${renderer._typeParametersString}( // Write out the renderer class. _buffer.write(''' class ${renderer._rendererClassName}${renderer._typeParametersString} - extends RendererBase<$typeWithVariablesNullable> { + extends RendererBase<$typeWithVariables> { '''); _writePropertyMap(renderer); // Write out the constructor. _buffer.writeln(''' ${renderer._rendererClassName}( - $typeWithVariablesNullable context, RendererBase? parent, + $typeWithVariables context, RendererBase? parent, Template template, StringSink sink) : super(context, parent, template, sink); '''); @@ -386,7 +384,7 @@ class ${renderer._rendererClassName}${renderer._typeParametersString} // Write out `getProperty`. _buffer.writeln(''' @override - Property<$typeWithVariablesNullable>? getProperty(String key) { + Property<$typeWithVariables>? getProperty(String key) { if ($propertyMapName().containsKey(key)) { return $propertyMapName()[key]; } else { @@ -531,8 +529,9 @@ renderVariable: renderCall = 'renderSimple(e, ast, r.template, sink, parent: r, ' "getters: _invisibleGetters['$typeName']!)"; } else { + var bang = _typeSystem.isPotentiallyNullable(innerType) ? '!' : ''; renderCall = - '$renderFunctionName(e, ast, r.template, sink, parent: r)'; + '$renderFunctionName(e$bang, ast, r.template, sink, parent: r)'; } _buffer.writeln(''' renderIterable: @@ -560,8 +559,9 @@ renderIterable: 'renderSimple(c.$getterName, ast, r.template, sink, parent: r, ' "getters: _invisibleGetters['$typeName']!)"; } else { + var bang = _typeSystem.isPotentiallyNullable(getterType) ? '!' : ''; renderCall = - '$renderFunctionName(c.$getterName, ast, r.template, sink, parent: r)'; + '$renderFunctionName(c.$getterName$bang, ast, r.template, sink, parent: r)'; } var nullValueGetter = getterType.nullabilitySuffix == NullabilitySuffix.none