Skip to content

Commit 173132e

Browse files
jcollins-gjcollins-g
committed
Merge branch 'master' into constructor-tearoffs+typeparams
2 parents a788c66 + 9f81df5 commit 173132e

File tree

3 files changed

+38
-83
lines changed

3 files changed

+38
-83
lines changed

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

Lines changed: 37 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2459,7 +2459,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
24592459
if (context9 != null) {
24602460
for (var context10 in context9) {
24612461
buffer.writeln();
2462-
buffer.write(_renderLibrary_partial_mixin_6(
2462+
buffer.write(_renderLibrary_partial_container_5(
24632463
context10, context8, context7, context0));
24642464
buffer.writeln();
24652465
}
@@ -2481,7 +2481,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
24812481
if (context13 != null) {
24822482
for (var context14 in context13) {
24832483
buffer.writeln();
2484-
buffer.write(_renderLibrary_partial_extension_7(
2484+
buffer.write(_renderLibrary_partial_extension_6(
24852485
context14, context12, context11, context0));
24862486
buffer.writeln();
24872487
}
@@ -2503,7 +2503,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
25032503
if (context17 != null) {
25042504
for (var context18 in context17) {
25052505
buffer.writeln();
2506-
buffer.write(_renderLibrary_partial_constant_8(
2506+
buffer.write(_renderLibrary_partial_constant_7(
25072507
context18, context16, context15, context0));
25082508
buffer.writeln();
25092509
}
@@ -2525,7 +2525,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
25252525
if (context21 != null) {
25262526
for (var context22 in context21) {
25272527
buffer.writeln();
2528-
buffer.write(_renderLibrary_partial_property_9(
2528+
buffer.write(_renderLibrary_partial_property_8(
25292529
context22, context20, context19, context0));
25302530
buffer.writeln();
25312531
}
@@ -2547,7 +2547,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
25472547
if (context25 != null) {
25482548
for (var context26 in context25) {
25492549
buffer.writeln();
2550-
buffer.write(_renderLibrary_partial_callable_10(
2550+
buffer.write(_renderLibrary_partial_callable_9(
25512551
context26, context24, context23, context0));
25522552
buffer.writeln();
25532553
}
@@ -2591,7 +2591,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
25912591
if (context33 != null) {
25922592
for (var context34 in context33) {
25932593
buffer.writeln();
2594-
buffer.write(_renderLibrary_partial_typedef_11(
2594+
buffer.write(_renderLibrary_partial_typedef_10(
25952595
context34, context32, context31, context0));
25962596
buffer.writeln();
25972597
}
@@ -2622,7 +2622,7 @@ String renderLibrary(_i1.LibraryTemplateData context0) {
26222622
}
26232623
}
26242624
buffer.write('\n\n');
2625-
buffer.write(_renderLibrary_partial_footer_12(context0));
2625+
buffer.write(_renderLibrary_partial_footer_11(context0));
26262626
buffer.writeln();
26272627

26282628
return buffer.toString();
@@ -2744,48 +2744,7 @@ Categories:''');
27442744
return buffer.toString();
27452745
}
27462746

2747-
String _renderLibrary_partial_mixin_6(_i16.Mixin context3, _i3.Library context2,
2748-
_i3.Library context1, _i1.LibraryTemplateData context0) {
2749-
final buffer = StringBuffer();
2750-
buffer.write('''##### ''');
2751-
buffer.write(context3.linkedName.toString());
2752-
buffer.write(context3.linkedGenericParameters.toString());
2753-
buffer.writeln();
2754-
buffer.write(__renderLibrary_partial_mixin_6_partial_categorization_0(
2755-
context3, context2, context1, context0));
2756-
buffer.write('\n\n');
2757-
buffer.write(context3.oneLineDoc.toString());
2758-
buffer.write(' ');
2759-
buffer.write(context3.extendedDocLink.toString());
2760-
buffer.writeln();
2761-
2762-
return buffer.toString();
2763-
}
2764-
2765-
String __renderLibrary_partial_mixin_6_partial_categorization_0(
2766-
_i16.Mixin context3,
2767-
_i3.Library context2,
2768-
_i3.Library context1,
2769-
_i1.LibraryTemplateData context0) {
2770-
final buffer = StringBuffer();
2771-
if (context3.hasCategoryNames == true) {
2772-
buffer.writeln();
2773-
buffer.write('''
2774-
Categories:''');
2775-
var context4 = context3.displayedCategories;
2776-
if (context4 != null) {
2777-
for (var context5 in context4) {
2778-
buffer.writeln();
2779-
buffer.write(context5.categoryLabel.toString());
2780-
}
2781-
}
2782-
}
2783-
buffer.writeln();
2784-
2785-
return buffer.toString();
2786-
}
2787-
2788-
String _renderLibrary_partial_extension_7(
2747+
String _renderLibrary_partial_extension_6(
27892748
_i13.Extension context3,
27902749
_i3.Library context2,
27912750
_i3.Library context1,
@@ -2794,7 +2753,7 @@ String _renderLibrary_partial_extension_7(
27942753
buffer.write('''##### ''');
27952754
buffer.write(context3.linkedName.toString());
27962755
buffer.writeln();
2797-
buffer.write(__renderLibrary_partial_extension_7_partial_categorization_0(
2756+
buffer.write(__renderLibrary_partial_extension_6_partial_categorization_0(
27982757
context3, context2, context1, context0));
27992758
buffer.write('\n\n');
28002759
buffer.write(context3.oneLineDoc.toString());
@@ -2805,7 +2764,7 @@ String _renderLibrary_partial_extension_7(
28052764
return buffer.toString();
28062765
}
28072766

2808-
String __renderLibrary_partial_extension_7_partial_categorization_0(
2767+
String __renderLibrary_partial_extension_6_partial_categorization_0(
28092768
_i13.Extension context3,
28102769
_i3.Library context2,
28112770
_i3.Library context1,
@@ -2828,7 +2787,7 @@ Categories:''');
28282787
return buffer.toString();
28292788
}
28302789

2831-
String _renderLibrary_partial_constant_8(
2790+
String _renderLibrary_partial_constant_7(
28322791
_i5.TopLevelVariable context3,
28332792
_i3.Library context2,
28342793
_i3.Library context1,
@@ -2839,22 +2798,22 @@ String _renderLibrary_partial_constant_8(
28392798
buffer.write(''' const ''');
28402799
buffer.write(context3.modelType.linkedName.toString());
28412800
buffer.writeln();
2842-
buffer.write(__renderLibrary_partial_constant_8_partial_categorization_0(
2801+
buffer.write(__renderLibrary_partial_constant_7_partial_categorization_0(
28432802
context3, context2, context1, context0));
28442803
buffer.write('\n\n');
28452804
buffer.write(context3.oneLineDoc.toString());
28462805
buffer.write(' ');
28472806
buffer.write(context3.extendedDocLink.toString());
28482807
buffer.write(' ');
28492808
buffer.writeln();
2850-
buffer.write(__renderLibrary_partial_constant_8_partial_features_1(
2809+
buffer.write(__renderLibrary_partial_constant_7_partial_features_1(
28512810
context3, context2, context1, context0));
28522811
buffer.writeln();
28532812

28542813
return buffer.toString();
28552814
}
28562815

2857-
String __renderLibrary_partial_constant_8_partial_categorization_0(
2816+
String __renderLibrary_partial_constant_7_partial_categorization_0(
28582817
_i5.TopLevelVariable context3,
28592818
_i3.Library context2,
28602819
_i3.Library context1,
@@ -2877,7 +2836,7 @@ Categories:''');
28772836
return buffer.toString();
28782837
}
28792838

2880-
String __renderLibrary_partial_constant_8_partial_features_1(
2839+
String __renderLibrary_partial_constant_7_partial_features_1(
28812840
_i5.TopLevelVariable context3,
28822841
_i3.Library context2,
28832842
_i3.Library context1,
@@ -2893,7 +2852,7 @@ String __renderLibrary_partial_constant_8_partial_features_1(
28932852
return buffer.toString();
28942853
}
28952854

2896-
String _renderLibrary_partial_property_9(
2855+
String _renderLibrary_partial_property_8(
28972856
_i5.TopLevelVariable context3,
28982857
_i3.Library context2,
28992858
_i3.Library context1,
@@ -2906,22 +2865,22 @@ String _renderLibrary_partial_property_9(
29062865
buffer.write(' ');
29072866
buffer.write(context3.modelType.linkedName.toString());
29082867
buffer.writeln();
2909-
buffer.write(__renderLibrary_partial_property_9_partial_categorization_0(
2868+
buffer.write(__renderLibrary_partial_property_8_partial_categorization_0(
29102869
context3, context2, context1, context0));
29112870
buffer.write('\n\n');
29122871
buffer.write(context3.oneLineDoc.toString());
29132872
buffer.write(' ');
29142873
buffer.write(context3.extendedDocLink.toString());
29152874
buffer.write(' ');
29162875
buffer.writeln();
2917-
buffer.write(__renderLibrary_partial_property_9_partial_features_1(
2876+
buffer.write(__renderLibrary_partial_property_8_partial_features_1(
29182877
context3, context2, context1, context0));
29192878
buffer.writeln();
29202879

29212880
return buffer.toString();
29222881
}
29232882

2924-
String __renderLibrary_partial_property_9_partial_categorization_0(
2883+
String __renderLibrary_partial_property_8_partial_categorization_0(
29252884
_i5.TopLevelVariable context3,
29262885
_i3.Library context2,
29272886
_i3.Library context1,
@@ -2944,7 +2903,7 @@ Categories:''');
29442903
return buffer.toString();
29452904
}
29462905

2947-
String __renderLibrary_partial_property_9_partial_features_1(
2906+
String __renderLibrary_partial_property_8_partial_features_1(
29482907
_i5.TopLevelVariable context3,
29492908
_i3.Library context2,
29502909
_i3.Library context1,
@@ -2960,7 +2919,7 @@ String __renderLibrary_partial_property_9_partial_features_1(
29602919
return buffer.toString();
29612920
}
29622921

2963-
String _renderLibrary_partial_callable_10(
2922+
String _renderLibrary_partial_callable_9(
29642923
_i6.ModelFunctionTyped context3,
29652924
_i3.Library context2,
29662925
_i3.Library context1,
@@ -2974,22 +2933,22 @@ String _renderLibrary_partial_callable_10(
29742933
buffer.write(''') ''');
29752934
buffer.write(context3.modelType.returnType.linkedName.toString());
29762935
buffer.writeln();
2977-
buffer.write(__renderLibrary_partial_callable_10_partial_categorization_0(
2936+
buffer.write(__renderLibrary_partial_callable_9_partial_categorization_0(
29782937
context3, context2, context1, context0));
29792938
buffer.write('\n\n');
29802939
buffer.write(context3.oneLineDoc.toString());
29812940
buffer.write(' ');
29822941
buffer.write(context3.extendedDocLink.toString());
29832942
buffer.write(' ');
29842943
buffer.writeln();
2985-
buffer.write(__renderLibrary_partial_callable_10_partial_features_1(
2944+
buffer.write(__renderLibrary_partial_callable_9_partial_features_1(
29862945
context3, context2, context1, context0));
29872946
buffer.writeln();
29882947

29892948
return buffer.toString();
29902949
}
29912950

2992-
String __renderLibrary_partial_callable_10_partial_categorization_0(
2951+
String __renderLibrary_partial_callable_9_partial_categorization_0(
29932952
_i6.ModelFunctionTyped context3,
29942953
_i3.Library context2,
29952954
_i3.Library context1,
@@ -3012,7 +2971,7 @@ Categories:''');
30122971
return buffer.toString();
30132972
}
30142973

3015-
String __renderLibrary_partial_callable_10_partial_features_1(
2974+
String __renderLibrary_partial_callable_9_partial_features_1(
30162975
_i6.ModelFunctionTyped context3,
30172976
_i3.Library context2,
30182977
_i3.Library context1,
@@ -3028,7 +2987,7 @@ String __renderLibrary_partial_callable_10_partial_features_1(
30282987
return buffer.toString();
30292988
}
30302989

3031-
String _renderLibrary_partial_typedef_11(
2990+
String _renderLibrary_partial_typedef_10(
30322991
_i7.Typedef context3,
30332992
_i3.Library context2,
30342993
_i3.Library context1,
@@ -3045,29 +3004,29 @@ String _renderLibrary_partial_typedef_11(
30453004
buffer.write(''' = ''');
30463005
buffer.write(context4.modelType.linkedName.toString());
30473006
buffer.write('\n ');
3048-
buffer.write(__renderLibrary_partial_typedef_11_partial_categorization_0(
3007+
buffer.write(__renderLibrary_partial_typedef_10_partial_categorization_0(
30493008
context4, context3, context2, context1, context0));
30503009
buffer.write('\n\n ');
30513010
buffer.write(context4.oneLineDoc.toString());
30523011
buffer.write(' ');
30533012
buffer.write(context4.extendedDocLink.toString());
30543013
buffer.write(' ');
30553014
buffer.write('\n ');
3056-
buffer.write(__renderLibrary_partial_typedef_11_partial_features_1(
3015+
buffer.write(__renderLibrary_partial_typedef_10_partial_features_1(
30573016
context4, context3, context2, context1, context0));
30583017
}
30593018
}
30603019
if (context3.isCallable != true) {
30613020
buffer.write('\n ');
3062-
buffer.write(__renderLibrary_partial_typedef_11_partial_type_2(
3021+
buffer.write(__renderLibrary_partial_typedef_10_partial_type_2(
30633022
context3, context2, context1, context0));
30643023
}
30653024
buffer.writeln();
30663025

30673026
return buffer.toString();
30683027
}
30693028

3070-
String __renderLibrary_partial_typedef_11_partial_categorization_0(
3029+
String __renderLibrary_partial_typedef_10_partial_categorization_0(
30713030
_i7.FunctionTypedef context4,
30723031
_i7.Typedef context3,
30733032
_i3.Library context2,
@@ -3091,7 +3050,7 @@ Categories:''');
30913050
return buffer.toString();
30923051
}
30933052

3094-
String __renderLibrary_partial_typedef_11_partial_features_1(
3053+
String __renderLibrary_partial_typedef_10_partial_features_1(
30953054
_i7.FunctionTypedef context4,
30963055
_i7.Typedef context3,
30973056
_i3.Library context2,
@@ -3108,7 +3067,7 @@ String __renderLibrary_partial_typedef_11_partial_features_1(
31083067
return buffer.toString();
31093068
}
31103069

3111-
String __renderLibrary_partial_typedef_11_partial_type_2(
3070+
String __renderLibrary_partial_typedef_10_partial_type_2(
31123071
_i7.Typedef context3,
31133072
_i3.Library context2,
31143073
_i3.Library context1,
@@ -3121,7 +3080,7 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
31213080
buffer.write(context3.modelType.linkedName.toString());
31223081
buffer.writeln();
31233082
buffer.write(
3124-
___renderLibrary_partial_typedef_11_partial_type_2_partial_categorization_0(
3083+
___renderLibrary_partial_typedef_10_partial_type_2_partial_categorization_0(
31253084
context3, context2, context1, context0));
31263085
buffer.write('\n\n');
31273086
buffer.write(context3.oneLineDoc.toString());
@@ -3130,15 +3089,15 @@ String __renderLibrary_partial_typedef_11_partial_type_2(
31303089
buffer.write(' ');
31313090
buffer.writeln();
31323091
buffer.write(
3133-
___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
3092+
___renderLibrary_partial_typedef_10_partial_type_2_partial_features_1(
31343093
context3, context2, context1, context0));
31353094
buffer.writeln();
31363095

31373096
return buffer.toString();
31383097
}
31393098

31403099
String
3141-
___renderLibrary_partial_typedef_11_partial_type_2_partial_categorization_0(
3100+
___renderLibrary_partial_typedef_10_partial_type_2_partial_categorization_0(
31423101
_i7.Typedef context3,
31433102
_i3.Library context2,
31443103
_i3.Library context1,
@@ -3161,7 +3120,7 @@ Categories:''');
31613120
return buffer.toString();
31623121
}
31633122

3164-
String ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
3123+
String ___renderLibrary_partial_typedef_10_partial_type_2_partial_features_1(
31653124
_i7.Typedef context3,
31663125
_i3.Library context2,
31673126
_i3.Library context1,
@@ -3177,7 +3136,7 @@ String ___renderLibrary_partial_typedef_11_partial_type_2_partial_features_1(
31773136
return buffer.toString();
31783137
}
31793138

3180-
String _renderLibrary_partial_footer_12(_i1.LibraryTemplateData context0) {
3139+
String _renderLibrary_partial_footer_11(_i1.LibraryTemplateData context0) {
31813140
final buffer = StringBuffer();
31823141
buffer.writeln();
31833142
buffer.write(context0.customInnerFooter.toString());

‎lib/templates/md/_mixin.md‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎lib/templates/md/library.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
## Mixins
2626

2727
{{#library.publicMixinsSorted}}
28-
{{>mixin}}
28+
{{>container}}
2929

3030
{{/library.publicMixinsSorted}}
3131
{{/library.hasPublicMixins}}

0 commit comments

Comments
 (0)