From de3616b1ace546725974b104dd5d5cdbed963b7c Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Fri, 30 Aug 2024 09:33:20 -0700 Subject: [PATCH] Trim blank lines from generated renderers --- .../templates.aot_renderers_for_html.dart | 1254 +++++------------ test/mustachio/aot_compiler_render_test.dart | 1 - .../mustachio/foo.aot_renderers_for_html.dart | 22 +- tool/mustachio/codegen_aot_compiler.dart | 35 +- 4 files changed, 426 insertions(+), 886 deletions(-) diff --git a/lib/src/generator/templates.aot_renderers_for_html.dart b/lib/src/generator/templates.aot_renderers_for_html.dart index 51a555c35b..69ba1ffb10 100644 --- a/lib/src/generator/templates.aot_renderers_for_html.dart +++ b/lib/src/generator/templates.aot_renderers_for_html.dart @@ -42,13 +42,10 @@ String renderCategory(CategoryTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderCategory_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); + buffer.write('''
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -

'''); + buffer.write('''

'''); buffer.writeEscaped(context1.name); buffer.write(''' '''); buffer.writeEscaped(context1.kind.toString()); @@ -58,10 +55,8 @@ String renderCategory(CategoryTemplateData context0) { buffer.writeln(); if (context1.hasPublicLibraries) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Libraries

-
'''); var context2 = context1.publicLibrariesSorted; for (var context3 in context2) { @@ -69,17 +64,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_library_2(context3)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicClasses) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Classes

-
'''); var context4 = context1.publicClassesSorted; for (var context5 in context4) { @@ -87,17 +79,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_container_3(context5)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicMixins) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Mixins

-
'''); var context6 = context1.publicMixinsSorted; for (var context7 in context6) { @@ -105,17 +94,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_container_3(context7)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicExtensions) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Extensions

-
'''); var context8 = context1.publicExtensionsSorted; for (var context9 in context8) { @@ -123,17 +109,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_extension_4(context9)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicConstants) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Constants

-
'''); var context10 = context1.publicConstantsSorted; for (var context11 in context10) { @@ -141,17 +124,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_constant_5(context11)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicProperties) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Properties

-
'''); var context12 = context1.publicPropertiesSorted; for (var context13 in context12) { @@ -159,17 +139,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_property_6(context13)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicFunctions) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Functions

-
'''); var context14 = context1.publicFunctionsSorted; for (var context15 in context14) { @@ -177,17 +154,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_callable_7(context15)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicEnums) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Enums

-
'''); var context16 = context1.publicEnumsSorted; for (var context17 in context16) { @@ -195,17 +169,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_container_3(context17)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicTypedefs) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Typedefs

-
'''); var context18 = context1.publicTypedefsSorted; for (var context19 in context18) { @@ -213,17 +184,14 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_typedef_8(context19)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context1.hasPublicExceptions) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Exceptions / Errors

-
'''); var context20 = context1.publicExceptionsSorted; for (var context21 in context20) { @@ -231,21 +199,16 @@ String renderCategory(CategoryTemplateData context0) { buffer.write(_renderCategory_partial_container_3(context21)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); - buffer.write(''' - -

- + buffer.write('''
- + buffer.write(''' + buffer.write(''' '''); buffer.write(_renderCategory_partial_footer_12(context0)); @@ -279,9 +239,7 @@ String renderClass(ClassTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderClass_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderClass_partial_source_link_1(context1)); buffer.write('''

'''); buffer.write(context1.nameWithGenerics); @@ -311,8 +268,7 @@ String renderClass(ClassTemplateData context0) { buffer.writeln(); if (context2.hasModifiers) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderClass_partial_super_chain_5(context2)); @@ -323,28 +279,24 @@ String renderClass(ClassTemplateData context0) { buffer.writeln(); if (context2.hasPublicImplementers) { buffer.writeln(); - buffer.write(''' -
Implementers
+ buffer.write('''
Implementers
    '''); var context3 = context2.publicImplementersSorted; for (var context4 in context3) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context4.linkedName); buffer.write('''
  • '''); } buffer.writeln(); - buffer.write(''' -
'''); + buffer.write(''' '''); } buffer.write('\n\n '); buffer.write(_renderClass_partial_available_extensions_8(context2)); buffer.write('\n '); buffer.write(_renderClass_partial_container_annotations_9(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.write('\n\n '); @@ -362,26 +314,20 @@ String renderClass(ClassTemplateData context0) { buffer.write('\n '); buffer.write(_renderClass_partial_static_constants_16(context2)); buffer.writeln(); - buffer.write(''' - -

- + buffer.write('''
- - '''); buffer.write(_renderClass_partial_footer_18(context0)); buffer.writeln(); @@ -393,9 +339,7 @@ String renderConstructor(ConstructorTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderConstructor_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderConstructor_partial_source_link_1(context1)); buffer.write('''

'''); buffer.write(context1.nameWithGenerics); @@ -419,16 +362,14 @@ String renderConstructor(ConstructorTemplateData context0) { buffer.writeln(); var context2 = context0.constructor; buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderConstructor_partial_annotations_3(context2)); if (context2.isConst) { buffer.write('''const'''); } buffer.writeln(); - buffer.write(''' - - '''); buffer.write(_renderConstructor_partial_documentation_4(context2)); buffer.write('\n\n '); buffer.write(_renderConstructor_partial_source_code_5(context2)); buffer.writeln(); buffer.writeln(); - buffer.write(''' -

- + buffer.write('''
- - '''); buffer.write(_renderConstructor_partial_footer_7(context0)); buffer.writeln(); @@ -477,9 +412,7 @@ String renderEnum(EnumTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderEnum_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderEnum_partial_source_link_1(context1)); buffer.writeln(); - buffer.write(''' -

+ buffer.write('''

'''); buffer.write(context1.nameWithGenerics); buffer.write(''' @@ -506,8 +437,7 @@ String renderEnum(EnumTemplateData context0) { buffer.write(' '); buffer.write(_renderEnum_partial_categorization_3(context1)); buffer.writeln(); - buffer.write(''' -

+ buffer.write('''
'''); buffer.writeln(); var context2 = context0.eNum; @@ -516,8 +446,7 @@ String renderEnum(EnumTemplateData context0) { buffer.writeln(); if (context2.hasModifiers) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderEnum_partial_super_chain_5(context2)); @@ -530,17 +459,14 @@ String renderEnum(EnumTemplateData context0) { buffer.write('\n '); buffer.write(_renderEnum_partial_container_annotations_9(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); if (context2.hasPublicEnumValues) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Values

-
'''); var context3 = context2.publicEnumValues; for (var context4 in context3) { @@ -548,8 +474,7 @@ String renderEnum(EnumTemplateData context0) { buffer.write(_renderEnum_partial_constant_10(context4)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.write('\n\n '); @@ -565,25 +490,20 @@ String renderEnum(EnumTemplateData context0) { buffer.write('\n '); buffer.write(_renderEnum_partial_static_constants_16(context2)); buffer.writeln(); - buffer.write(''' -
- + buffer.write('''
- - '''); buffer.write(_renderEnum_partial_footer_18(context0)); buffer.writeln(); @@ -595,11 +515,8 @@ String renderError(PackageTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderError_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
+ buffer.write('''

404: Something\'s gone wrong :-(

-

You\'ve tried to visit a page that doesn\'t exist. Luckily this site has other pages.

@@ -608,16 +525,13 @@ String renderError(PackageTemplateData context0) {

-
- - + buffer.write('''
- '''); buffer.write(_renderError_partial_footer_3(context0)); buffer.writeln(); @@ -642,8 +553,7 @@ String renderExtension(ExtensionTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderExtension_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderExtension_partial_source_link_1(context1)); buffer.write('''

'''); buffer.write(context1.nameWithGenerics); @@ -671,8 +580,7 @@ String renderExtension(ExtensionTemplateData context0) { buffer.write('\n '); buffer.write(_renderExtension_partial_documentation_4(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
on
@@ -686,9 +594,7 @@ String renderExtension(ExtensionTemplateData context0) { '''); buffer.write(_renderExtension_partial_container_annotations_5(context2)); buffer.writeln(); - buffer.write(''' -
- + buffer.write('''
'''); buffer.write(_renderExtension_partial_instance_fields_6(context2)); buffer.write('\n '); @@ -703,26 +609,20 @@ String renderExtension(ExtensionTemplateData context0) { buffer.write(_renderExtension_partial_static_constants_11(context2)); var context3 = context0.extension; buffer.writeln(); - buffer.write(''' - -

- + buffer.write('''
- - '''); buffer.write(_renderExtension_partial_footer_13(context0)); buffer.writeln(); @@ -737,8 +637,7 @@ String renderExtensionType( final buffer = StringBuffer(); buffer.write(_renderExtensionType_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderExtensionType_partial_source_link_1(context1)); buffer.write('''

'''); buffer.write(context1.nameWithGenerics); @@ -767,53 +665,44 @@ String renderExtensionType( buffer.write('\n '); buffer.write(_renderExtensionType_partial_documentation_4(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
on
    '''); var context3 = context2.representationType; buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context3.linkedName); buffer.write('''
  • '''); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderExtensionType_partial_interfaces_5(context2)); buffer.writeln(); if (context2.hasPublicImplementers) { buffer.writeln(); - buffer.write(''' -
Implementers
+ buffer.write('''
Implementers
    '''); var context4 = context2.publicImplementersSorted; for (var context5 in context4) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context5.linkedName); buffer.write('''
  • '''); } buffer.writeln(); - buffer.write(''' -
'''); + buffer.write(''' '''); } buffer.write('\n '); buffer.write(_renderExtensionType_partial_available_extensions_6(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write(''' '''); buffer.write(_renderExtensionType_partial_container_annotations_7(context2)); buffer.writeln(); - buffer.write(''' -
- + buffer.write('''
'''); buffer.write(_renderExtensionType_partial_constructors_8(context2)); buffer.write('\n '); @@ -830,25 +719,20 @@ String renderExtensionType( buffer.write(_renderExtensionType_partial_static_constants_14(context2)); buffer.writeln(); buffer.writeln(); - buffer.write(''' -

- + buffer.write('''
- - '''); buffer.write(_renderExtensionType_partial_footer_16(context0)); buffer.writeln(); @@ -860,9 +744,7 @@ String renderFunction(FunctionTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderFunction_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderFunction_partial_source_link_1(context1)); buffer.write('''

'''); buffer.write(context1.nameWithGenerics); @@ -888,40 +769,33 @@ String renderFunction(FunctionTemplateData context0) { buffer.writeln(); var context2 = context0.function; buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderFunction_partial_callable_multiline_4(context2)); buffer.write('\n '); buffer.write(_renderFunction_partial_attributes_5(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderFunction_partial_documentation_6(context2)); buffer.write('\n\n '); buffer.write(_renderFunction_partial_source_code_7(context2)); buffer.writeln(); buffer.writeln(); - buffer.write(''' -

- + buffer.write('''
- - '''); buffer.write(_renderFunction_partial_footer_9(context0)); buffer.writeln(); @@ -933,9 +807,7 @@ String renderIndex(PackageTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderIndex_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); + buffer.write('''
'''); var context1 = context0.defaultPackage; buffer.write('\n '); buffer.write(_renderIndex_partial_documentation_1(context1)); @@ -943,23 +815,19 @@ String renderIndex(PackageTemplateData context0) { var context2 = context0.localPackages; for (var context3 in context2) { buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); if (context3.isFirstPackage) { buffer.writeln(); - buffer.write(''' -

Libraries

'''); + buffer.write('''

Libraries

'''); } if (!context3.isFirstPackage) { buffer.writeln(); - buffer.write(''' -

'''); + buffer.write('''

'''); buffer.writeEscaped(context3.name); buffer.write('''

'''); } buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); var context4 = context3.defaultCategory; var context5 = context4.publicLibrariesSorted; for (var context6 in context5) { @@ -969,22 +837,19 @@ String renderIndex(PackageTemplateData context0) { var context7 = context3.categoriesWithPublicLibraries; for (var context8 in context7) { buffer.writeln(); - buffer.write(''' -

'''); + buffer.write('''

'''); buffer.writeEscaped(context8.name); buffer.write('''

'''); if (context8.isDocumented) { buffer.writeln(); - buffer.write(''' -

'''); + buffer.write('''

'''); buffer.write(context8.oneLineDoc); buffer.write('''

'''); } var context9 = context8.externalItems; for (var context10 in context9) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
open_in_new + buffer.write( + ''' open_in_new
@@ -1008,21 +873,16 @@ String renderIndex(PackageTemplateData context0) { } } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); - buffer.write(''' - -
- + buffer.write('''
- + buffer.write('''
- '''); buffer.write(_renderIndex_partial_footer_5(context0)); buffer.writeln(); @@ -1047,9 +904,7 @@ String renderLibrary(LibraryTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderLibrary_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); buffer.write(context1.displayName); buffer.write(''' @@ -1078,8 +931,7 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(' '); buffer.write(_renderLibrary_partial_categorization_3(context1)); buffer.writeln(); - buffer.write(''' - + buffer.write('''
'''); buffer.writeln(); var context2 = context0.library; @@ -1089,10 +941,8 @@ String renderLibrary(LibraryTemplateData context0) { var context3 = context0.library; if (context3.hasPublicClasses) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Classes

-
'''); var context4 = context3.library; var context5 = context4.publicClassesSorted; @@ -1101,18 +951,15 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_container_5(context6)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context7 = context0.library; if (context7.hasPublicEnums) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Enums

-
'''); var context8 = context7.library; var context9 = context8.publicEnumsSorted; @@ -1121,18 +968,15 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_container_5(context10)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context11 = context0.library; if (context11.hasPublicMixins) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Mixins

-
'''); var context12 = context11.library; var context13 = context12.publicMixinsSorted; @@ -1141,18 +985,16 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_container_5(context14)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context15 = context0.library; if (context15.hasPublicExtensionTypes) { buffer.writeln(); - buffer.write(''' -
+ buffer.write( + '''

Extension Types

-
'''); var context16 = context15.library; var context17 = context16.publicExtensionTypesSorted; @@ -1161,18 +1003,15 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_extension_type_6(context18)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context19 = context0.library; if (context19.hasPublicExtensions) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Extensions

-
'''); var context20 = context19.library; var context21 = context20.publicExtensionsSorted; @@ -1181,18 +1020,15 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_extension_7(context22)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context23 = context0.library; if (context23.hasPublicConstants) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Constants

-
'''); var context24 = context23.library; var context25 = context24.publicConstantsSorted; @@ -1201,18 +1037,15 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_constant_8(context26)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context27 = context0.library; if (context27.hasPublicProperties) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Properties

-
'''); var context28 = context27.library; var context29 = context28.publicPropertiesSorted; @@ -1221,18 +1054,15 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_property_9(context30)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context31 = context0.library; if (context31.hasPublicFunctions) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Functions

-
'''); var context32 = context31.library; var context33 = context32.publicFunctionsSorted; @@ -1241,18 +1071,15 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_callable_10(context34)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context35 = context0.library; if (context35.hasPublicTypedefs) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Typedefs

-
'''); var context36 = context35.library; var context37 = context36.publicTypedefsSorted; @@ -1261,18 +1088,15 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_typedef_11(context38)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); var context39 = context0.library; if (context39.hasPublicExceptions) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''

Exceptions / Errors

-
'''); var context40 = context39.library; var context41 = context40.publicExceptionsSorted; @@ -1281,21 +1105,16 @@ String renderLibrary(LibraryTemplateData context0) { buffer.write(_renderLibrary_partial_container_5(context42)); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.writeln(); - buffer.write(''' - -
- + buffer.write('''
- + buffer.write('''
- '''); buffer.write(_renderLibrary_partial_footer_14(context0)); buffer.writeln(); @@ -1325,9 +1141,7 @@ String renderMethod(MethodTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderMethod_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderMethod_partial_source_link_1(context1)); buffer.write('''

'''); buffer.write(context1.nameWithGenerics); @@ -1351,31 +1164,26 @@ String renderMethod(MethodTemplateData context0) { buffer.writeln(); var context2 = context0.method; buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderMethod_partial_callable_multiline_3(context2)); buffer.write('\n '); buffer.write(_renderMethod_partial_attributes_4(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderMethod_partial_documentation_5(context2)); buffer.write('\n\n '); buffer.write(_renderMethod_partial_source_code_6(context2)); buffer.writeln(); buffer.writeln(); - buffer.write(''' -

- + buffer.write('''
- - '''); buffer.write(_renderMethod_partial_footer_8(context0)); buffer.writeln(); @@ -1411,9 +1215,7 @@ String renderMixin(MixinTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderMixin_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderMixin_partial_source_link_1(context1)); buffer.write('''

'''); buffer.write(context1.nameWithGenerics); @@ -1443,25 +1244,21 @@ String renderMixin(MixinTemplateData context0) { buffer.writeln(); if (context2.hasModifiers) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); if (context2.hasPublicSuperclassConstraints) { buffer.writeln(); - buffer.write(''' -
Superclass constraints
+ buffer.write('''
Superclass constraints
    '''); var context3 = context2.publicSuperclassConstraints; for (var context4 in context3) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context4.linkedName); buffer.write('''
  • '''); } buffer.writeln(); - buffer.write(''' -
'''); + buffer.write(''' '''); } buffer.write('\n\n '); buffer.write(_renderMixin_partial_super_chain_5(context2)); @@ -1470,21 +1267,18 @@ String renderMixin(MixinTemplateData context0) { buffer.writeln(); if (context2.hasPublicImplementers) { buffer.writeln(); - buffer.write(''' -
Mixin applications
+ buffer.write('''
Mixin applications
    '''); var context5 = context2.publicImplementersSorted; for (var context6 in context5) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context6.linkedName); buffer.write('''
  • '''); } buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.write('\n '); @@ -1492,8 +1286,7 @@ String renderMixin(MixinTemplateData context0) { buffer.write('\n\n '); buffer.write(_renderMixin_partial_annotations_8(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); } buffer.write('\n\n '); @@ -1509,25 +1302,20 @@ String renderMixin(MixinTemplateData context0) { buffer.write('\n '); buffer.write(_renderMixin_partial_static_constants_14(context2)); buffer.writeln(); - buffer.write(''' -

- + buffer.write('''
- - '''); buffer.write(_renderMixin_partial_footer_16(context0)); buffer.writeln(); @@ -1539,9 +1327,7 @@ String renderProperty(PropertyTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderProperty_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
'''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
'''); + buffer.write('''
'''); buffer.write(_renderProperty_partial_source_link_1(context1)); buffer.write('''

'''); buffer.writeEscaped(context1.name); @@ -1567,8 +1352,7 @@ String renderProperty(PropertyTemplateData context0) { buffer.write('\n '); if (!context2.hasGetterOrSetter) { buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderProperty_partial_annotations_3(context2)); buffer.write('\n '); @@ -1578,8 +1362,7 @@ String renderProperty(PropertyTemplateData context0) { buffer.write('\n '); buffer.write(_renderProperty_partial_attributes_5(context2)); buffer.writeln(); - buffer.write(''' -
+ buffer.write('''
'''); buffer.write(_renderProperty_partial_documentation_6(context2)); buffer.write('\n '); @@ -1598,16 +1381,13 @@ String renderProperty(PropertyTemplateData context0) { } } buffer.writeln(); - buffer.write(''' -

- + buffer.write('''
- - '''); buffer.write(_renderProperty_partial_footer_11(context0)); buffer.writeln(); @@ -1643,17 +1419,13 @@ String renderSearchPage(PackageTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderSearchPage_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
+ buffer.write('''
- - + buffer.write('''
- '''); buffer.write(_renderSearchPage_partial_footer_3(context0)); buffer.writeln(); @@ -1682,15 +1451,13 @@ String renderSidebarForContainer( buffer.writeln(); if (context1.hasPublicConstructors) { buffer.writeln(); - buffer.write(''' -
  • Constructors
  • '''); var context2 = context1.publicConstructorsSorted; for (var context3 in context2) { buffer.writeln(); - buffer.write(''' -
  • ( if (context1.isEnum) { if (context1.hasPublicEnumValues) { buffer.writeln(); - buffer.write(''' -
  • Values
  • '''); var context4 = context1.publicEnumValues; for (var context5 in context4) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context5.linkedName); buffer.write('''
  • '''); } @@ -1723,8 +1488,7 @@ String renderSidebarForContainer( if (context1.isInterface) { if (context1.hasPublicInstanceFields) { buffer.writeln(); - buffer.write(''' -
  • ( var context6 = context1.publicInstanceFieldsSorted; for (var context7 in context6) { buffer.writeln(); - buffer.write(''' - ( buffer.writeln(); if (context1.hasPublicInstanceMethods) { buffer.writeln(); - buffer.write(''' -
  • ( var context8 = context1.publicInstanceMethodsSorted; for (var context9 in context8) { buffer.writeln(); - buffer.write(''' - ( buffer.writeln(); if (context1.hasPublicInstanceOperators) { buffer.writeln(); - buffer.write(''' -
  • ( var context10 = context1.publicInstanceOperatorsSorted; for (var context11 in context10) { buffer.writeln(); - buffer.write(''' - ( if (context1.isExtension) { if (context1.hasPublicInstanceFields) { buffer.writeln(); - buffer.write(''' -
  • Properties
  • '''); var context12 = context1.publicInstanceFieldsSorted; for (var context13 in context12) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context13.linkedName); buffer.write('''
  • '''); } @@ -1815,15 +1572,13 @@ String renderSidebarForContainer( buffer.writeln(); if (context1.hasPublicInstanceMethods) { buffer.writeln(); - buffer.write(''' -
  • Methods
  • '''); var context14 = context1.publicInstanceMethodsSorted; for (var context15 in context14) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context15.linkedName); buffer.write('''
  • '''); } @@ -1831,15 +1586,13 @@ String renderSidebarForContainer( buffer.writeln(); if (context1.hasPublicInstanceOperators) { buffer.writeln(); - buffer.write(''' -
  • Operators
  • '''); var context16 = context1.publicInstanceOperatorsSorted; for (var context17 in context16) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context17.linkedName); buffer.write('''
  • '''); } @@ -1848,15 +1601,13 @@ String renderSidebarForContainer( buffer.write('\n\n '); if (context1.hasPublicVariableStaticFields) { buffer.writeln(); - buffer.write(''' -
  • Static properties
  • '''); var context18 = context1.publicVariableStaticFieldsSorted; for (var context19 in context18) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context19.linkedName); buffer.write('''
  • '''); } @@ -1864,15 +1615,13 @@ String renderSidebarForContainer( buffer.writeln(); if (context1.hasPublicStaticMethods) { buffer.writeln(); - buffer.write(''' -
  • Static methods
  • '''); var context20 = context1.publicStaticMethodsSorted; for (var context21 in context20) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context21.linkedName); buffer.write('''
  • '''); } @@ -1880,22 +1629,19 @@ String renderSidebarForContainer( buffer.writeln(); if (context1.hasPublicConstantFields) { buffer.writeln(); - buffer.write(''' -
  • Constants
  • '''); var context22 = context1.publicConstantFieldsSorted; for (var context23 in context22) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context23.linkedName); buffer.write('''
  • '''); } } buffer.writeln(); - buffer.write(''' - + buffer.write(''' '''); return buffer.toString(); @@ -1908,15 +1654,13 @@ String renderSidebarForLibrary( var context1 = context0.library; if (context1.hasPublicClasses) { buffer.writeln(); - buffer.write(''' -
  • Classes
  • '''); var context2 = context1.publicClassesSorted; for (var context3 in context2) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context3.linkedName); buffer.write('''
  • '''); } @@ -1924,15 +1668,13 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicEnums) { buffer.writeln(); - buffer.write(''' -
  • Enums
  • '''); var context4 = context1.publicEnumsSorted; for (var context5 in context4) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context5.linkedName); buffer.write('''
  • '''); } @@ -1940,15 +1682,13 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicMixins) { buffer.writeln(); - buffer.write(''' -
  • Mixins
  • '''); var context6 = context1.publicMixinsSorted; for (var context7 in context6) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context7.linkedName); buffer.write('''
  • '''); } @@ -1956,15 +1696,13 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicExtensionTypes) { buffer.writeln(); - buffer.write(''' -
  • Extension Types
  • '''); var context8 = context1.publicExtensionTypesSorted; for (var context9 in context8) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context9.linkedName); buffer.write('''
  • '''); } @@ -1972,15 +1710,13 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicConstants) { buffer.writeln(); - buffer.write(''' -
  • Constants
  • '''); var context10 = context1.publicConstantsSorted; for (var context11 in context10) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context11.linkedName); buffer.write('''
  • '''); } @@ -1988,15 +1724,13 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicProperties) { buffer.writeln(); - buffer.write(''' -
  • Properties
  • '''); var context12 = context1.publicPropertiesSorted; for (var context13 in context12) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context13.linkedName); buffer.write('''
  • '''); } @@ -2004,15 +1738,13 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicFunctions) { buffer.writeln(); - buffer.write(''' -
  • Functions
  • '''); var context14 = context1.publicFunctionsSorted; for (var context15 in context14) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context15.linkedName); buffer.write('''
  • '''); } @@ -2020,15 +1752,13 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicTypedefs) { buffer.writeln(); - buffer.write(''' -
  • Typedefs
  • '''); var context16 = context1.publicTypedefsSorted; for (var context17 in context16) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context17.linkedName); buffer.write('''
  • '''); } @@ -2036,15 +1766,13 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicExceptions) { buffer.writeln(); - buffer.write(''' -
  • Exceptions
  • '''); var context18 = context1.publicExceptionsSorted; for (var context19 in context18) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context19.linkedName); buffer.write('''
  • '''); } @@ -2052,22 +1780,19 @@ String renderSidebarForLibrary( buffer.writeln(); if (context1.hasPublicExtensions) { buffer.writeln(); - buffer.write(''' -
  • Extensions
  • '''); var context20 = context1.publicExtensionsSorted; for (var context21 in context20) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context21.linkedName); buffer.write('''
  • '''); } } buffer.writeln(); - buffer.write(''' - + buffer.write(''' '''); return buffer.toString(); @@ -2077,9 +1802,7 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderTopLevelProperty_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
    '''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); buffer.write(_renderTopLevelProperty_partial_source_link_1(context1)); buffer.write('''

    '''); buffer.write(context1.name); @@ -2105,8 +1827,7 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) { '''); if (!context1.hasGetterOrSetter) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); buffer.write(_renderTopLevelProperty_partial_annotations_4(context1)); buffer.write('\n '); @@ -2116,8 +1837,7 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) { buffer.write('\n '); buffer.write(_renderTopLevelProperty_partial_attributes_6(context1)); buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); buffer.write(_renderTopLevelProperty_partial_documentation_7(context1)); buffer.write('\n '); @@ -2134,25 +1854,20 @@ String renderTopLevelProperty(TopLevelPropertyTemplateData context0) { buffer.write(_renderTopLevelProperty_partial_accessor_setter_10(context1)); } buffer.writeln(); - buffer.write(''' -

    - + buffer.write('''
    - - '''); buffer.write(_renderTopLevelProperty_partial_footer_12(context0)); buffer.writeln(); @@ -2164,9 +1879,7 @@ String renderTypedef(TypedefTemplateData context0) { final buffer = StringBuffer(); buffer.write(_renderTypedef_partial_head_0(context0)); buffer.writeln(); - buffer.write(''' - -
    '''); var context1 = context0.self; buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); buffer.write(_renderTypedef_partial_source_link_1(context1)); buffer.write('''

    '''); buffer.write(context1.nameWithGenerics); @@ -2190,15 +1902,12 @@ String renderTypedef(TypedefTemplateData context0) { buffer.write(_renderTypedef_partial_categorization_3(context1)); buffer.write('''

    '''); buffer.writeln(); - buffer.write(''' - -
    '''); + buffer.write('''
    '''); var context2 = context0.typeDef; buffer.write('\n '); buffer.write(_renderTypedef_partial_typedef_multiline_4(context2)); buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); var context3 = context0.typeDef; buffer.write('\n '); @@ -2206,26 +1915,20 @@ String renderTypedef(TypedefTemplateData context0) { buffer.write('\n '); buffer.write(_renderTypedef_partial_source_code_6(context3)); buffer.writeln(); - buffer.write(''' - -
    - + buffer.write('''
    - - '''); buffer.write(_renderTypedef_partial_footer_8(context0)); buffer.writeln(); @@ -2282,8 +1985,7 @@ String _renderCategory_partial_callable_7(ModelFunctionTyped context2) { buffer.write( __renderCategory_partial_callable_7_partial_categorization_0(context2)); buffer.writeln(); - buffer.write(''' - + buffer.write(''' + buffer.write(''' '''); return buffer.toString(); @@ -2327,16 +2028,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context1 = context0.self; if (context1.hasPublicLibraries) { buffer.writeln(); - buffer.write(''' -
  • Libraries
  • '''); var context2 = context0.self; var context3 = context2.publicLibrariesSorted; for (var context4 in context3) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context4.linkedName); buffer.write('''
  • '''); } @@ -2345,16 +2044,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context5 = context0.self; if (context5.hasPublicClasses) { buffer.writeln(); - buffer.write(''' -
  • Classes
  • '''); var context6 = context0.self; var context7 = context6.publicClassesSorted; for (var context8 in context7) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context8.linkedName); buffer.write('''
  • '''); } @@ -2363,16 +2060,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context9 = context0.self; if (context9.hasPublicEnums) { buffer.writeln(); - buffer.write(''' -
  • Enums
  • '''); var context10 = context0.self; var context11 = context10.publicEnumsSorted; for (var context12 in context11) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context12.linkedName); buffer.write('''
  • '''); } @@ -2381,16 +2076,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context13 = context0.self; if (context13.hasPublicMixins) { buffer.writeln(); - buffer.write(''' -
  • Mixins
  • '''); var context14 = context0.self; var context15 = context14.publicMixinsSorted; for (var context16 in context15) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context16.linkedName); buffer.write('''
  • '''); } @@ -2399,16 +2092,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context17 = context0.self; if (context17.hasPublicExtensionTypes) { buffer.writeln(); - buffer.write(''' -
  • Extension Types
  • '''); var context18 = context0.self; var context19 = context18.publicExtensionTypesSorted; for (var context20 in context19) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context20.linkedName); buffer.write('''
  • '''); } @@ -2417,16 +2108,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context21 = context0.self; if (context21.hasPublicConstants) { buffer.writeln(); - buffer.write(''' -
  • Constants
  • '''); var context22 = context0.self; var context23 = context22.publicConstantsSorted; for (var context24 in context23) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context24.linkedName); buffer.write('''
  • '''); } @@ -2435,16 +2124,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context25 = context0.self; if (context25.hasPublicProperties) { buffer.writeln(); - buffer.write(''' -
  • Properties
  • '''); var context26 = context0.self; var context27 = context26.publicPropertiesSorted; for (var context28 in context27) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context28.linkedName); buffer.write('''
  • '''); } @@ -2453,16 +2140,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context29 = context0.self; if (context29.hasPublicFunctions) { buffer.writeln(); - buffer.write(''' -
  • Functions
  • '''); var context30 = context0.self; var context31 = context30.publicFunctionsSorted; for (var context32 in context31) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context32.linkedName); buffer.write('''
  • '''); } @@ -2471,16 +2156,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context33 = context0.self; if (context33.hasPublicTypedefs) { buffer.writeln(); - buffer.write(''' -
  • Typedefs
  • '''); var context34 = context0.self; var context35 = context34.publicTypedefsSorted; for (var context36 in context35) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context36.linkedName); buffer.write('''
  • '''); } @@ -2489,16 +2172,14 @@ String _renderCategory_partial_sidebar_for_category_11( var context37 = context0.self; if (context37.hasPublicExceptions) { buffer.writeln(); - buffer.write(''' -
  • Exceptions
  • '''); var context38 = context0.self; var context39 = context38.publicExceptionsSorted; for (var context40 in context39) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context40.linkedName); buffer.write('''
  • '''); } @@ -2507,23 +2188,20 @@ String _renderCategory_partial_sidebar_for_category_11( var context41 = context0.self; if (context41.hasPublicExtensions) { buffer.writeln(); - buffer.write(''' -
  • Extensions
  • '''); var context42 = context0.self; var context43 = context42.publicExtensionsSorted; for (var context44 in context43) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context44.linkedName); buffer.write('''
  • '''); } } buffer.writeln(); - buffer.write(''' - + buffer.write(''' '''); return buffer.toString(); @@ -2557,8 +2235,7 @@ String _renderClass_partial_mixed_in_types_7(Class context1) { final buffer = StringBuffer(); if (context1.hasPublicMixedInTypes) { buffer.writeln(); - buffer.write(''' -
    Mixed-in types
    + buffer.write('''
    Mixed-in types
      '''); + buffer.write('''
    • '''); buffer.write(context3.linkedName); buffer.write('''
    • '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } @@ -2854,9 +2526,7 @@ String _renderFunction_partial_callable_multiline_4(ModelFunction context1) { __renderFunction_partial_callable_multiline_4_partial_annotations_0( context1)); buffer.writeln(); - buffer.write(''' - -'''); + buffer.write(''''''); buffer.write(context1.modelType.returnType.linkedName); buffer.write(''' '''); @@ -2950,15 +2620,12 @@ String _renderLibrary_partial_extension_type_6(ExtensionType context3) { __renderLibrary_partial_extension_type_6_partial_categorization_0( context3)); buffer.writeln(); - buffer.write(''' - + buffer.write('''
    '''); buffer.write(context3.oneLineDoc); buffer.writeln(); - buffer.write(''' -
    - + buffer.write(''' '''); return buffer.toString(); @@ -3005,8 +2672,7 @@ String _renderLibrary_partial_callable_10(ModelFunctionTyped context3) { buffer.write( __renderLibrary_partial_callable_10_partial_categorization_0(context3)); buffer.writeln(); - buffer.write(''' - + buffer.write(''' + buffer.write(''' '''); return buffer.toString(); @@ -3060,9 +2725,7 @@ String _renderMethod_partial_callable_multiline_3(Method context1) { __renderMethod_partial_callable_multiline_3_partial_annotations_0( context1)); buffer.writeln(); - buffer.write(''' - -'''); + buffer.write(''''''); buffer.write(context1.modelType.returnType.linkedName); buffer.write(''' '''); @@ -3274,20 +2937,17 @@ String _renderTypedef_partial_typedef_multiline_4(Typedef context1) { var context2 = context1.asCallable; if (context2.hasAnnotations) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
      '''); var context3 = context2.annotations; for (var context4 in context3) { buffer.writeln(); - buffer.write(''' -
    1. '''); + buffer.write('''
    2. '''); buffer.write(context4.linkedNameWithParameters); buffer.write('''
    3. '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } if (context2.isConst) { @@ -3322,20 +2982,17 @@ String __renderTypedef_partial_typedef_multiline_4_partial_type_multiline_0( final buffer = StringBuffer(); if (context1.hasAnnotations) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
      '''); var context2 = context1.annotations; for (var context3 in context2) { buffer.writeln(); - buffer.write(''' -
    1. '''); + buffer.write('''
    2. '''); buffer.write(context3.linkedNameWithParameters); buffer.write('''
    3. '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } buffer.writeln(); @@ -3385,8 +3042,7 @@ String _deduplicated_lib_templates__head_html(TemplateDataBase context0) { var context1 = context0.relCanonicalPrefix; if (context1 != null) { buffer.writeln(); - buffer.write(''' - '''); } buffer.write('\n\n '); buffer.writeln(); - buffer.write(''' - + buffer.write(''' '''); buffer.writeln(); - buffer.write(''' - - '''); buffer.write(context0.customHeader); buffer.writeln(); - buffer.write(''' - - + buffer.write(''' '''); buffer.writeln(); - buffer.write(''' - -
    -
    menu + buffer.write('''
    '''); buffer.writeEscaped(context0.self.name); buffer.write('''
    @@ -3518,13 +3161,11 @@ String _deduplicated_lib_templates__documentation_html(Warnable context0) { final buffer = StringBuffer(); if (context0.hasDocumentation) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); buffer.write(context0.documentationAsHtml); buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); } buffer.writeln(); @@ -3543,15 +3184,13 @@ String _deduplicated_lib_templates__library_html(Library context0) { __deduplicated_lib_templates__library_html_partial_categorization_0( context0)); buffer.writeln(); - buffer.write(''' - + buffer.write('''
    '''); if (context0.isDocumented) { buffer.write(context0.oneLineDoc); } buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' '''); return buffer.toString(); @@ -3603,14 +3242,12 @@ String _deduplicated_lib_templates__container_html(Container context0) { __deduplicated_lib_templates__container_html_partial_categorization_0( context0)); buffer.writeln(); - buffer.write(''' - + buffer.write('''
    '''); buffer.write(context0.oneLineDoc); buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' '''); return buffer.toString(); @@ -3650,15 +3287,12 @@ String _deduplicated_lib_templates__extension_html(Extension context0) { __deduplicated_lib_templates__extension_html_partial_categorization_0( context0)); buffer.writeln(); - buffer.write(''' - + buffer.write('''
    '''); buffer.write(context0.oneLineDoc); buffer.writeln(); - buffer.write(''' -
    - + buffer.write(''' '''); return buffer.toString(); @@ -3686,8 +3320,7 @@ String _deduplicated_lib_templates__constant_html(GetterSetterCombo context0) { buffer.write('''" class="constant">'''); if (context0.isEnumValue) { buffer.writeln(); - buffer.write(''' - '''); } buffer.writeln(); - buffer.write(''' - → const '''); + buffer.write(''' → const '''); buffer.write(context0.modelType.linkedName); buffer.write(''' '''); @@ -3716,8 +3347,7 @@ String _deduplicated_lib_templates__constant_html(GetterSetterCombo context0) { __deduplicated_lib_templates__constant_html_partial_categorization_0( context0)); buffer.writeln(); - buffer.write(''' - + buffer.write('''
    '''); buffer.write(context0.oneLineDoc); @@ -3726,16 +3356,14 @@ String _deduplicated_lib_templates__constant_html(GetterSetterCombo context0) { context0)); if (context0.hasConstantValueForDisplay) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); buffer.write(context0.constantValueTruncated); buffer.write('''
    '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' '''); return buffer.toString(); @@ -3803,8 +3431,7 @@ String _deduplicated_lib_templates__property_html(GetterSetterCombo context0) { __deduplicated_lib_templates__property_html_partial_categorization_0( context0)); buffer.writeln(); - buffer.write(''' - + buffer.write(''' + buffer.write(''' '''); return buffer.toString(); @@ -3856,8 +3482,7 @@ String _deduplicated_lib_templates__typedef_html(Typedef context0) { if (context0.isCallable) { var context1 = context0.asCallable; buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write(''' '''); } if (!context0.isCallable) { buffer.write('\n '); @@ -3956,19 +3579,16 @@ String __deduplicated_lib_templates__typedef_html_partial_type_2( buffer.write(''''''); buffer.write(context0.linkedGenericParameters); buffer.writeln(); - buffer.write(''' - = '''); + buffer.write(''' = '''); buffer.write(context0.modelType.linkedName); buffer.writeln(); - buffer.write(''' - + buffer.write(''' '''); buffer.write( ___deduplicated_lib_templates__typedef_html_partial_type_2_partial_categorization_0( context0)); buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' + buffer.write(''' '''); return buffer.toString(); @@ -4036,18 +3655,15 @@ String _deduplicated_lib_templates__type_html(Typedef context0) { buffer.write('''
    '''); buffer.write(context0.linkedGenericParameters); buffer.writeln(); - buffer.write(''' - = '''); + buffer.write(''' = '''); buffer.write(context0.modelType.linkedName); buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' '''); buffer.write(__deduplicated_lib_templates__type_html_partial_categorization_0( context0)); buffer.writeln(); - buffer.write(''' - + buffer.write(''' + buffer.write(''' '''); return buffer.toString(); @@ -4104,13 +3719,11 @@ String _deduplicated_lib_templates__search_sidebar_html(
    - - + buffer.write(''' '''); return buffer.toString(); @@ -4164,25 +3772,21 @@ String _deduplicated_lib_templates__packages_html(TemplateDataBase context0) { if (context2.isFirstPackage) { if (context2.hasDocumentedCategories) { buffer.writeln(); - buffer.write(''' -
  • Topics
  • '''); + buffer.write('''
  • Topics
  • '''); var context3 = context2.documentedCategoriesSorted; for (var context4 in context3) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context4.linkedName); buffer.write('''
  • '''); } } buffer.writeln(); - buffer.write(''' -
  • Libraries
  • '''); + buffer.write('''
  • Libraries
  • '''); } if (!context2.isFirstPackage) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.writeEscaped(context2.name); buffer.write('''
  • '''); } @@ -4190,47 +3794,42 @@ String _deduplicated_lib_templates__packages_html(TemplateDataBase context0) { var context6 = context5.publicLibrariesSorted; for (var context7 in context6) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context7.linkedName); buffer.write('''
  • '''); } var context8 = context2.categoriesWithPublicLibraries; for (var context9 in context8) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.writeEscaped(context9.name); buffer.write('''
  • '''); var context10 = context9.externalItems; for (var context11 in context10) { buffer.writeln(); - buffer.write(''' -
  • + buffer.write('''
  • '''); buffer.writeEscaped(context11.name); buffer.writeln(); - buffer.write(''' - open_in_new + buffer.write( + ''' open_in_new
  • '''); } var context12 = context9.publicLibrariesSorted; for (var context13 in context12) { buffer.writeln(); - buffer.write(''' -
  • '''); + buffer.write('''
  • '''); buffer.write(context13.linkedName); buffer.write('''
  • '''); } } } buffer.writeln(); - buffer.write(''' - + buffer.write(''' '''); return buffer.toString(); @@ -4239,7 +3838,6 @@ String _deduplicated_lib_templates__packages_html(TemplateDataBase context0) { String _deduplicated_lib_templates__footer_html(TemplateDataBase context0) { final buffer = StringBuffer(); buffer.write(''' -
    '''); @@ -4249,20 +3847,15 @@ String _deduplicated_lib_templates__footer_html(TemplateDataBase context0) { buffer.writeEscaped(context0.defaultPackage.version); } buffer.writeln(); - buffer.write(''' - - + buffer.write(''' '''); buffer.write(context0.customInnerFooter); buffer.writeln(); - buffer.write(''' -
    - + buffer.write(''' '''); buffer.writeln(); buffer.writeln(); - buffer.write(''' - - '''); buffer.write(context0.customFooter); buffer.writeln(); - buffer.write(''' - - - + buffer.write(''' '''); @@ -4290,8 +3879,8 @@ String _deduplicated_lib_templates__source_link_html(ModelElement context0) { final buffer = StringBuffer(); if (context0.hasSourceHref) { buffer.writeln(); - buffer.write(''' - '''); @@ -4320,8 +3909,7 @@ String _deduplicated_lib_templates__super_chain_html( final buffer = StringBuffer(); if (context0.hasPublicSuperChainReversed) { buffer.writeln(); - buffer.write(''' -
    Inheritance
    + buffer.write('''
    Inheritance
      '''); + buffer.write('''
    • '''); buffer.write(context2.linkedName); buffer.write('''
    • '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } @@ -4383,20 +3966,17 @@ String _deduplicated_lib_templates__available_extensions_html( final buffer = StringBuffer(); if (context0.hasPotentiallyApplicableExtensions) { buffer.writeln(); - buffer.write(''' -
    Available extensions
    + buffer.write('''
    Available extensions
      '''); var context1 = context0.potentiallyApplicableExtensionsSorted; for (var context2 in context1) { buffer.writeln(); - buffer.write(''' -
    • '''); + buffer.write('''
    • '''); buffer.write(context2.linkedName); buffer.write('''
    • '''); } buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write(''' '''); } return buffer.toString(); @@ -4407,8 +3987,7 @@ String _deduplicated_lib_templates__container_annotations_html( final buffer = StringBuffer(); if (context0.hasAnnotations) { buffer.writeln(); - buffer.write(''' -
    Annotations
    + buffer.write('''
    Annotations
      + buffer.write('''

      Constructors

      -
      '''); var context1 = context0.publicConstructorsSorted; for (var context2 in context1) { buffer.writeln(); - buffer.write(''' -
      '''); @@ -4458,21 +4032,19 @@ String _deduplicated_lib_templates__constructors_html(Constructable context0) { buffer.write(context2.oneLineDoc); if (context2.isConst) { buffer.writeln(); - buffer.write(''' -
      const
      '''); + buffer.write( + '''
      const
      '''); } if (context2.isFactory) { buffer.writeln(); - buffer.write(''' -
      factory
      '''); + buffer.write( + '''
      factory
      '''); } buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write(''' '''); } buffer.writeln(); - buffer.write(''' - + buffer.write(''' '''); } @@ -4483,8 +4055,7 @@ String _deduplicated_lib_templates__instance_fields_html(Container context0) { final buffer = StringBuffer(); if (context0.hasPublicInstanceFields) { buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' '''); return buffer.toString(); @@ -4587,8 +4155,7 @@ String _deduplicated_lib_templates__instance_methods_html(Container context0) { final buffer = StringBuffer(); if (context0.hasPublicInstanceMethods) { buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' '''); return buffer.toString(); @@ -4699,8 +4263,7 @@ String _deduplicated_lib_templates__instance_operators_html( final buffer = StringBuffer(); if (context0.hasPublicInstanceOperators) { buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' '''); return buffer.toString(); @@ -4810,10 +4370,9 @@ String _deduplicated_lib_templates__static_properties_html(Container context0) { final buffer = StringBuffer(); if (context0.hasPublicVariableStaticFields) { buffer.writeln(); - buffer.write(''' -
    + buffer.write( + '''

    Static Properties

    -
    '''); var context1 = context0.publicVariableStaticFieldsSorted; for (var context2 in context1) { @@ -4823,8 +4382,7 @@ String _deduplicated_lib_templates__static_properties_html(Container context0) { context2)); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } @@ -4854,8 +4412,7 @@ String __deduplicated_lib_templates__static_properties_html_partial_property_0( ___deduplicated_lib_templates__static_properties_html_partial_property_0_partial_categorization_0( context1)); buffer.writeln(); - buffer.write(''' - + buffer.write(''' + buffer.write(''' '''); return buffer.toString(); @@ -4909,8 +4465,8 @@ String _deduplicated_lib_templates__static_methods_html(Container context0) { final buffer = StringBuffer(); if (context0.hasPublicStaticMethods) { buffer.writeln(); - buffer.write(''' -
    + buffer + .write('''

    Static Methods

    '''); var context1 = context0.publicStaticMethodsSorted; @@ -4921,8 +4477,7 @@ String _deduplicated_lib_templates__static_methods_html(Container context0) { context2)); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } @@ -4959,8 +4514,7 @@ String __deduplicated_lib_templates__static_methods_html_partial_callable_0( ___deduplicated_lib_templates__static_methods_html_partial_callable_0_partial_categorization_0( context1)); buffer.writeln(); - buffer.write(''' - + buffer.write(''' + buffer.write(''' '''); return buffer.toString(); @@ -5015,10 +4568,8 @@ String _deduplicated_lib_templates__static_constants_html(Container context0) { buffer.writeln(); if (context0.hasPublicConstantFields) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''

    Constants

    -
    '''); var context1 = context0.publicConstantFieldsSorted; for (var context2 in context1) { @@ -5028,8 +4579,7 @@ String _deduplicated_lib_templates__static_constants_html(Container context0) { context2)); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } @@ -5044,8 +4594,7 @@ String __deduplicated_lib_templates__static_constants_html_partial_constant_0( buffer.write('''" class="constant">'''); if (context1.isEnumValue) { buffer.writeln(); - buffer.write(''' - '''); } buffer.writeln(); - buffer.write(''' - → const '''); + buffer.write(''' → const '''); buffer.write(context1.modelType.linkedName); buffer.write(''' '''); @@ -5074,8 +4621,7 @@ String __deduplicated_lib_templates__static_constants_html_partial_constant_0( ___deduplicated_lib_templates__static_constants_html_partial_constant_0_partial_categorization_0( context1)); buffer.writeln(); - buffer.write(''' - + buffer.write('''
    '''); buffer.write(context1.oneLineDoc); @@ -5085,16 +4631,14 @@ String __deduplicated_lib_templates__static_constants_html_partial_constant_0( context1)); if (context1.hasConstantValueForDisplay) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); buffer.write(context1.constantValueTruncated); buffer.write('''
    '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write(''' '''); return buffer.toString(); @@ -5134,20 +4678,17 @@ String _deduplicated_lib_templates__annotations_html(ModelElement context0) { final buffer = StringBuffer(); if (context0.hasAnnotations) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
      '''); var context1 = context0.annotations; for (var context2 in context1) { buffer.writeln(); - buffer.write(''' -
    1. '''); + buffer.write('''
    2. '''); buffer.write(context2.linkedNameWithParameters); buffer.write('''
    3. '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } @@ -5158,8 +4699,7 @@ String _deduplicated_lib_templates__source_code_html(ModelElement context0) { final buffer = StringBuffer(); if (context0.hasSourceCode) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''

    Implementation

    ''');
         buffer.write(context0.sourceCode);
    @@ -5193,17 +4733,14 @@ String _deduplicated_lib_templates__accessor_getter_html(
       var context1 = context0.getter;
       if (context1 != null) {
         buffer.writeln();
    -    buffer.write('''
    -  
    - + buffer.write('''
    '''); buffer.write( __deduplicated_lib_templates__accessor_getter_html_partial_annotations_0( context1)); buffer.writeln(); - buffer.write(''' - '''); + buffer.write(''' '''); buffer.write(context1.modelType.returnType.linkedName); buffer.write(''' '''); @@ -5215,9 +4752,7 @@ String _deduplicated_lib_templates__accessor_getter_html( __deduplicated_lib_templates__accessor_getter_html_partial_attributes_2( context1)); buffer.writeln(); - buffer.write(''' -
    - + buffer.write('''
    '''); buffer.write( __deduplicated_lib_templates__accessor_getter_html_partial_documentation_3( @@ -5227,8 +4762,7 @@ String _deduplicated_lib_templates__accessor_getter_html( __deduplicated_lib_templates__accessor_getter_html_partial_source_code_4( context1)); buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); } buffer.writeln(); @@ -5240,20 +4774,17 @@ String __deduplicated_lib_templates__accessor_getter_html_partial_annotations_0( final buffer = StringBuffer(); if (context1.hasAnnotations) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
      '''); var context2 = context1.annotations; for (var context3 in context2) { buffer.writeln(); - buffer.write(''' -
    1. '''); + buffer.write('''
    2. '''); buffer.write(context3.linkedNameWithParameters); buffer.write('''
    3. '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } @@ -5297,13 +4828,11 @@ String final buffer = StringBuffer(); if (context1.hasDocumentation) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); buffer.write(context1.documentationAsHtml); buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); } buffer.writeln(); @@ -5315,8 +4844,7 @@ String __deduplicated_lib_templates__accessor_getter_html_partial_source_code_4( final buffer = StringBuffer(); if (context1.hasSourceCode) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''

    Implementation

    ''');
         buffer.write(context1.sourceCode);
    @@ -5334,17 +4862,14 @@ String _deduplicated_lib_templates__accessor_setter_html(
       var context1 = context0.setter;
       if (context1 != null) {
         buffer.writeln();
    -    buffer.write('''
    -  
    - + buffer.write('''
    '''); buffer.write( __deduplicated_lib_templates__accessor_setter_html_partial_annotations_0( context1)); buffer.writeln(); - buffer.write(''' - void + buffer.write(''' void '''); buffer.write( __deduplicated_lib_templates__accessor_setter_html_partial_name_summary_1( @@ -5357,9 +4882,7 @@ String _deduplicated_lib_templates__accessor_setter_html( __deduplicated_lib_templates__accessor_setter_html_partial_attributes_2( context1)); buffer.writeln(); - buffer.write(''' -
    - + buffer.write('''
    '''); buffer.write( __deduplicated_lib_templates__accessor_setter_html_partial_documentation_3( @@ -5369,8 +4892,7 @@ String _deduplicated_lib_templates__accessor_setter_html( __deduplicated_lib_templates__accessor_setter_html_partial_source_code_4( context1)); buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); } buffer.writeln(); @@ -5382,20 +4904,17 @@ String __deduplicated_lib_templates__accessor_setter_html_partial_annotations_0( final buffer = StringBuffer(); if (context1.hasAnnotations) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
      '''); var context2 = context1.annotations; for (var context3 in context2) { buffer.writeln(); - buffer.write(''' -
    1. '''); + buffer.write('''
    2. '''); buffer.write(context3.linkedNameWithParameters); buffer.write('''
    3. '''); } buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); } @@ -5439,13 +4958,11 @@ String final buffer = StringBuffer(); if (context1.hasDocumentation) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''
    '''); buffer.write(context1.documentationAsHtml); buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); } buffer.writeln(); @@ -5457,8 +4974,7 @@ String __deduplicated_lib_templates__accessor_setter_html_partial_source_code_4( final buffer = StringBuffer(); if (context1.hasSourceCode) { buffer.writeln(); - buffer.write(''' -
    + buffer.write('''

    Implementation

    ''');
         buffer.write(context1.sourceCode);
    diff --git a/test/mustachio/aot_compiler_render_test.dart b/test/mustachio/aot_compiler_render_test.dart
    index 03ff8fd62b..5930f72399 100644
    --- a/test/mustachio/aot_compiler_render_test.dart
    +++ b/test/mustachio/aot_compiler_render_test.dart
    @@ -168,7 +168,6 @@ void main() {
         
    l1: [1, 2, 3]
    - s1: hello b1? no l1:item: 1item: 2item: 3 diff --git a/test/mustachio/foo.aot_renderers_for_html.dart b/test/mustachio/foo.aot_renderers_for_html.dart index ab528cd19d..aaf0fbc2c7 100644 --- a/test/mustachio/foo.aot_renderers_for_html.dart +++ b/test/mustachio/foo.aot_renderers_for_html.dart @@ -22,13 +22,10 @@ String renderFoo(Foo context0) { '''); buffer.write(_renderFoo_partial_foo_header_0(context0)); buffer.writeln(); - buffer.write(''' - - s1: '''); + buffer.write(''' s1: '''); buffer.writeEscaped(context0.s1); buffer.writeln(); - buffer.write(''' - b1? '''); + buffer.write(''' b1? '''); if (context0.b1) { buffer.write('''yes'''); } @@ -36,8 +33,7 @@ String renderFoo(Foo context0) { buffer.write('''no'''); } buffer.writeln(); - buffer.write(''' - l1:'''); + buffer.write(''' l1:'''); var context1 = context0.l1; for (var context2 in context1) { buffer.write('''item: '''); @@ -47,21 +43,18 @@ String renderFoo(Foo context0) { buffer.write('''no items'''); } buffer.writeln(); - buffer.write(''' - baz:'''); + buffer.write(''' baz:'''); var context3 = context0.baz; if (context3 != null) { buffer.writeln(); - buffer.write(''' - Baz has a '''); + buffer.write(''' Baz has a '''); buffer.writeEscaped(context3.bar!.s2); } if (context0.baz == null) { buffer.write('''baz is null'''); } buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); return buffer.toString(); } @@ -84,8 +77,7 @@ String _renderFoo_partial_foo_header_0(Foo context0) { l1: '''); buffer.writeEscaped(context0.l1.toString()); buffer.writeln(); - buffer.write(''' -
    '''); + buffer.write('''
    '''); return buffer.toString(); } diff --git a/tool/mustachio/codegen_aot_compiler.dart b/tool/mustachio/codegen_aot_compiler.dart index 6db45cd4f1..2cdf2e6b9b 100644 --- a/tool/mustachio/codegen_aot_compiler.dart +++ b/tool/mustachio/codegen_aot_compiler.dart @@ -397,7 +397,7 @@ class _BlockCompiler { /// The set of URIs of elements that need to be imported. final Set _referenceUris = {}; - final _buffer = StringBuffer(); + final _buffer = _CompressingBuffer(); _BlockCompiler(this._templateCompiler, this._contextStack); @@ -779,3 +779,36 @@ extension on TypeSystem { return contextStackTypes; } } + +/// A wrapper around a [StringBuffer] that removes blank lines. +final class _CompressingBuffer { + final StringBuffer _buffer = StringBuffer(); + + bool _prevEndsWithNewline = false; + + void write(String text) { + if (text.isEmpty) return; + text = text + // Strip any trailing spaces on each line. + .replaceAll(RegExp(r'\s+\n'), '\n') + // Compress consecutive newlines. + .replaceAll(RegExp(r'\n+'), '\n'); + if (_prevEndsWithNewline) { + var first = text.codeUnits.first; + if (first == 0x0A /* '\n' */) { + text = text.substring(1); + } + } + if (text.isEmpty) return; + var last = text.codeUnits.last; + if (last == 0x0A /* '\n' */) { + _prevEndsWithNewline = true; + } + _buffer.write(text); + } + + void writeln(String text) => write('$text\n'); + + @override + String toString() => _buffer.toString(); +}