dart-lang · jdkoren · Mar 30, 2020 · Mar 12, 2020 · Mar 12, 2020 · Mar 12, 2020
diff --git a/lib/src/model/categorization.dart b/lib/src/model/categorization.dart
@@ -114,6 +114,8 @@ abstract class Categorization implements ModelElement {
     return categories.where((c) => c.isDocumented);
   }
 
+  bool get hasDisplayedCategories => displayedCategories.isNotEmpty;
+
   /// True if categories, subcategories, a documentation icon, or samples were
   /// declared.
   bool get hasCategorization {

diff --git a/lib/src/render/type_parameters_renderer.dart b/lib/src/render/type_parameters_renderer.dart
@@ -49,6 +49,6 @@ class TypeParametersRendererMd extends TypeParametersRenderer {
       return '';
     }
     var joined = typeParameters.map(mapfn).join(', ');
-    return '<${joined}>';
+    return '&lt;${joined}>';
   }
 }
diff --git a/lib/templates/md/_accessor_getter.md b/lib/templates/md/_accessor_getter.md
@@ -1,7 +1,8 @@
 {{#getter}}
-{{{ linkedReturnType }}} {{>name_summary}}
+{{{ linkedReturnType }}} {{>name_summary}}  {{!two spaces intentional}}
 {{>features}}
 
 {{>documentation}}
+
 {{>source_code}}
 {{/getter}}
diff --git a/lib/templates/md/_accessor_setter.md b/lib/templates/md/_accessor_setter.md
@@ -1,7 +1,8 @@
 {{#setter}}
-{{>name_summary}}({{{ linkedParamsNoMetadata }}})
+{{>name_summary}}({{{ linkedParamsNoMetadata }}})  {{!two spaces intentional}}
 {{>features}}
 
 {{>documentation}}
+
 {{>source_code}}
 {{/setter}}
diff --git a/lib/templates/md/_callable.md b/lib/templates/md/_callable.md
@@ -1,3 +1,5 @@
-{{{linkedName}}}{{{linkedGenericParameters}}}({{{ linkedParamsNoMetadata }}}) {{{ linkedReturnType }}} {{>categorization}}
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
+##### {{{linkedName}}}{{{linkedGenericParameters}}}({{{ linkedParamsNoMetadata }}}) {{{ linkedReturnType }}}
+{{>categorization}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
 {{>features}}
diff --git a/lib/templates/md/_categorization.md b/lib/templates/md/_categorization.md
@@ -1,5 +1,6 @@
-{{#hasCategoryNames}}
+{{#hasDisplayedCategories}}
+Categories:
 {{#displayedCategories}}
 {{{categoryLabel}}}
 {{/displayedCategories}}
-{{/hasCategoryNames}}
+{{/hasDisplayedCategories}}
diff --git a/lib/templates/md/_class.md b/lib/templates/md/_class.md
@@ -1,2 +1,4 @@
-{{{linkedName}}}{{{linkedGenericParameters}}} {{>categorization}}
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
+##### {{{linkedName}}}{{{linkedGenericParameters}}}
+{{>categorization}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}
diff --git a/lib/templates/md/_constant.md b/lib/templates/md/_constant.md
@@ -1,3 +1,5 @@
-{{{ linkedName }}} const {{{ linkedReturnType }}} {{>categorization}}
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
+##### {{{ linkedName }}} const {{{ linkedReturnType }}}
+{{>categorization}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
 {{>features}}
diff --git a/lib/templates/md/_extension.md b/lib/templates/md/_extension.md
@@ -1,2 +1,4 @@
-{{{linkedName}}} {{>categorization}}
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
+##### {{{linkedName}}}
+{{>categorization}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}
diff --git a/lib/templates/md/_library.md b/lib/templates/md/_library.md
@@ -1,4 +1,5 @@
-{{{ linkedName }}} ({{>categorization}})
+##### {{{ linkedName }}}
 {{#isDocumented}}
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}
+
 {{/isDocumented}}
diff --git a/lib/templates/md/_mixin.md b/lib/templates/md/_mixin.md
@@ -1,2 +1,4 @@
-{{{linkedName}}}{{{linkedGenericParameters}}} {{>categorization}}
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
+##### {{{linkedName}}}{{{linkedGenericParameters}}}
+{{>categorization}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}
diff --git a/lib/templates/md/_property.md b/lib/templates/md/_property.md
@@ -1,3 +1,5 @@
-{{{linkedName}}} {{{ arrow }}} {{{ linkedReturnType }}} {{>categorization}}
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
+##### {{{linkedName}}} {{{ arrow }}} {{{ linkedReturnType }}}
+{{>categorization}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
 {{>features}}
diff --git a/lib/templates/md/_source_link.md b/lib/templates/md/_source_link.md
@@ -1,3 +1,3 @@
 {{#hasSourceHref}}
-[source]({{{sourceHref}}})
+[view source]({{{sourceHref}}})
 {{/hasSourceHref}}
diff --git a/lib/templates/md/category.md b/lib/templates/md/category.md
@@ -10,6 +10,7 @@
 
 {{#publicLibraries}}
 {{>library}}
+
 {{/publicLibraries}}
 {{/hasPublicLibraries}}
 
@@ -18,6 +19,7 @@
 
 {{#publicClasses}}
 {{>class}}
+
 {{/publicClasses}}
 {{/hasPublicClasses}}
 
@@ -26,6 +28,7 @@
 
 {{#publicMixins}}
 {{>mixin}}
+
 {{/publicMixins}}
 {{/hasPublicMixins}}
 
@@ -34,6 +37,7 @@
 
 {{#publicConstants}}
 {{>constant}}
+
 {{/publicConstants}}
 {{/hasPublicConstants}}
 
@@ -42,6 +46,7 @@
 
 {{#publicProperties}}
 {{>property}}
+
 {{/publicProperties}}
 {{/hasPublicProperties}}
 
@@ -50,6 +55,7 @@
 
 {{#publicFunctions}}
 {{>callable}}
+
 {{/publicFunctions}}
 {{/hasPublicFunctions}}
 
@@ -58,6 +64,7 @@
 
 {{#publicEnums}}
 {{>class}}
+
 {{/publicEnums}}
 {{/hasPublicEnums}}
 
@@ -66,6 +73,7 @@
 
 {{#publicTypedefs}}
 {{>callable}}
+
 {{/publicTypedefs}}
 {{/hasPublicTypedefs}}
 
@@ -74,6 +82,7 @@
 
 {{#publicExceptions}}
 {{>class}}
+
 {{/publicExceptions}}
 {{/hasPublicExceptions}}
 {{/self}}

diff --git a/lib/templates/md/class.md b/lib/templates/md/class.md
@@ -67,8 +67,10 @@
 
 {{#publicConstructors}}
 {{{linkedName}}} ({{{ linkedParams }}})
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
-{{#isConst}}const{{/isConst}} {{#isFactory}}factory{{/isFactory}}
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
+{{#isConst}}_const_{{/isConst}} {{#isFactory}}_factory_{{/isFactory}}
+
 {{/publicConstructors}}
 {{/hasPublicConstructors}}
 
@@ -77,6 +79,7 @@
 
 {{#allPublicInstanceProperties}}
 {{>property}}
+
 {{/allPublicInstanceProperties}}
 {{/hasPublicProperties}}
 
@@ -85,6 +88,7 @@
 
 {{#allPublicInstanceMethods}}
 {{>callable}}
+
 {{/allPublicInstanceMethods}}
 {{/hasPublicMethods}}
 
@@ -93,6 +97,7 @@
 
 {{#allPublicOperators}}
 {{>callable}}
+
 {{/allPublicOperators}}
 {{/hasPublicOperators}}
 
@@ -101,6 +106,7 @@
 
 {{#publicStaticProperties}}
 {{>property}}
+
 {{/publicStaticProperties}}
 {{/hasPublicStaticProperties}}
 
@@ -109,6 +115,7 @@
 
 {{#publicStaticMethods}}
 {{>callable}}
+
 {{/publicStaticMethods}}
 {{/hasPublicStaticMethods}}
 
@@ -117,6 +124,7 @@
 
 {{#publicConstants}}
 {{>constant}}
+
 {{/publicConstants}}
 {{/hasPublicConstants}}
 {{/clazz}}

diff --git a/lib/templates/md/constant.md b/lib/templates/md/constant.md
@@ -10,6 +10,7 @@
 {{{ linkedReturnType }}} {{>name_summary}} = {{{ constantValue }}}
 
 {{>documentation}}
+
 {{>source_code}}
 {{/property}}
 

diff --git a/lib/templates/md/enum.md b/lib/templates/md/enum.md
@@ -59,16 +59,19 @@
 
 {{#publicConstants}}
 {{>constant}}
+
 {{/publicConstants}}
 {{/hasPublicConstants}}
 
 {{#hasPublicConstructors}}
 ## Constructors
 
 {{#publicConstructors}}
-{{{linkedName}}} ({{{ linkedParams }}})
-: {{{ oneLineDoc }}} {{{ extendedDocLink }}}
-{{#isConst}}const{{/isConst}} {{#isFactory}}factory{{/isFactory}}
+{{{linkedName}}}({{{ linkedParams }}})
+
+{{{ oneLineDoc }}} {{{ extendedDocLink }}}  {{!two spaces intentional}}
+{{#isConst}}_const_{{/isConst}} {{#isFactory}}_factory_{{/isFactory}}
+
 {{/publicConstructors}}
 {{/hasPublicConstructors}}
 
@@ -77,6 +80,7 @@
 
 {{#allPublicInstanceProperties}}
 {{>property}}
+
 {{/allPublicInstanceProperties}}
 {{/hasPublicProperties}}
 
@@ -85,6 +89,7 @@
 
 {{#allPublicInstanceMethods}}
 {{>callable}}
+
 {{/allPublicInstanceMethods}}
 {{/hasPublicMethods}}
 
@@ -93,6 +98,7 @@
 
 {{#allPublicOperators}}
 {{>callable}}
+
 {{/allPublicOperators}}
 {{/hasPublicOperators}}
 
@@ -101,6 +107,7 @@
 
 {{#publicStaticProperties}}
 {{>property}}
+
 {{/publicStaticProperties}}
 {{/hasPublicStaticProperties}}
 
@@ -109,6 +116,7 @@
 
 {{#publicStaticMethods}}
 {{>callable}}
+
 {{/publicStaticMethods}}
 {{/hasPublicStaticMethods}}
 {{/eNum}}

diff --git a/lib/templates/md/extension.md b/lib/templates/md/extension.md
@@ -2,24 +2,22 @@
 
 {{#self}}
 # {{{nameWithGenerics}}} {{kind}}
+on {{#extendedType}}{{{linkedName}}}{{/extendedType}}
 
 {{>source_link}}
+
 {{>categorization}}
 {{/self}}
 
 {{#extension}}
 {{>documentation}}
 
-on
-{{#extendedType}}
-: {{{linkedName}}}
-{{/extendedType}}
-
 {{#hasPublicProperties}}
 ## Properties
 
 {{#allPublicInstanceProperties}}
 {{>property}}
+
 {{/allPublicInstanceProperties}}
 {{/hasPublicProperties}}
 
@@ -28,6 +26,7 @@ on
 
 {{#allPublicInstanceMethods}}
 {{>callable}}
+
 {{/allPublicInstanceMethods}}
 {{/hasPublicMethods}}
 
@@ -36,6 +35,7 @@ on
 
 {{#allPublicOperators}}
 {{>callable}}
+
 {{/allPublicOperators}}
 {{/hasPublicOperators}}
 
@@ -44,6 +44,7 @@ on
 
 {{#publicStaticProperties}}
 {{>property}}
+
 {{/publicStaticProperties}}
 {{/hasPublicStaticProperties}}
 
@@ -52,6 +53,7 @@ on
 
 {{#publicStaticMethods}}
 {{>callable}}
+
 {{/publicStaticMethods}}
 {{/hasPublicStaticMethods}}
 
@@ -60,6 +62,7 @@ on
 
 {{#publicConstants}}
 {{>constant}}
+
 {{/publicConstants}}
 {{/hasPublicConstants}}
 {{/extension}}

diff --git a/lib/templates/md/index.md b/lib/templates/md/index.md
@@ -20,7 +20,7 @@
 {{/defaultCategory.publicLibraries}}
 
 {{#categoriesWithPublicLibraries}}
-### {{name}}
+### Category {{{categoryLabel}}}
 
 {{#publicLibraries}}
 {{>library}}