diff --git a/lib/templates/md/class.md b/lib/templates/md/class.md index d9cb249c69..e98847fb06 100644 --- a/lib/templates/md/class.md +++ b/lib/templates/md/class.md @@ -65,68 +65,68 @@ {{#hasPublicConstructors}} ## Constructors -{{#publicConstructors}} +{{#publicConstructorsSorted}} {{{linkedName}}} ({{{ linkedParams }}}) {{{ oneLineDoc }}} {{{ extendedDocLink }}} {{!two spaces intentional}} {{#isConst}}_const_{{/isConst}} {{#isFactory}}_factory_{{/isFactory}} -{{/publicConstructors}} +{{/publicConstructorsSorted}} {{/hasPublicConstructors}} -{{#hasPublicProperties}} +{{#hasPublicInstanceFields}} ## Properties -{{#allPublicInstanceProperties}} +{{#publicInstanceFieldsSorted}} {{>property}} -{{/allPublicInstanceProperties}} -{{/hasPublicProperties}} +{{/publicInstanceFieldsSorted}} +{{/hasPublicInstanceFields}} -{{#hasPublicMethods}} +{{#hasPublicInstanceMethods}} ## Methods -{{#allPublicInstanceMethods}} +{{#publicInstanceMethodsSorted}} {{>callable}} -{{/allPublicInstanceMethods}} -{{/hasPublicMethods}} +{{/publicInstanceMethodsSorted}} +{{/hasPublicInstanceMethods}} -{{#hasPublicOperators}} +{{#hasPublicInstanceOperators}} ## Operators -{{#allPublicOperators}} +{{#publicInstanceOperatorsSorted}} {{>callable}} -{{/allPublicOperators}} -{{/hasPublicOperators}} +{{/publicInstanceOperatorsSorted}} +{{/hasPublicInstanceOperators}} -{{#hasPublicStaticProperties}} +{{#hasPublicVariableStaticFields}} ## Static Properties -{{#publicStaticProperties}} +{{#publicVariableStaticFieldsSorted}} {{>property}} -{{/publicStaticProperties}} -{{/hasPublicStaticProperties}} +{{/publicVariableStaticFieldsSorted}} +{{/hasPublicVariableStaticFields}} {{#hasPublicStaticMethods}} ## Static Methods -{{#publicStaticMethods}} +{{#publicStaticMethodsSorted}} {{>callable}} -{{/publicStaticMethods}} +{{/publicStaticMethodsSorted}} {{/hasPublicStaticMethods}} -{{#hasPublicConstants}} +{{#hasPublicConstantFields}} ## Constants -{{#publicConstants}} +{{#publicConstantFieldsSorted}} {{>constant}} -{{/publicConstants}} -{{/hasPublicConstants}} +{{/publicConstantFieldsSorted}} +{{/hasPublicConstantFields}} {{/clazz}} {{>footer}} diff --git a/lib/templates/md/enum.md b/lib/templates/md/enum.md index 727e6be62a..ce48fa30a4 100644 --- a/lib/templates/md/enum.md +++ b/lib/templates/md/enum.md @@ -54,70 +54,70 @@ {{/hasAnnotations}} {{/hasModifiers}} -{{#hasPublicConstants}} +{{#hasPublicConstantFields}} ## Constants -{{#publicConstants}} +{{#publicConstantFieldsSorted}} {{>constant}} -{{/publicConstants}} -{{/hasPublicConstants}} +{{/publicConstantFieldsSorted}} +{{/hasPublicConstantFields}} {{#hasPublicConstructors}} ## Constructors -{{#publicConstructors}} +{{#publicConstructorsSorted}} {{{linkedName}}}({{{ linkedParams }}}) {{{ oneLineDoc }}} {{{ extendedDocLink }}} {{!two spaces intentional}} {{#isConst}}_const_{{/isConst}} {{#isFactory}}_factory_{{/isFactory}} -{{/publicConstructors}} +{{/publicConstructorsSorted}} {{/hasPublicConstructors}} -{{#hasPublicProperties}} +{{#hasPublicInstanceFields}} ## Properties -{{#allPublicInstanceProperties}} +{{#publicInstanceFieldsSorted}} {{>property}} -{{/allPublicInstanceProperties}} -{{/hasPublicProperties}} +{{/publicInstanceFieldsSorted}} +{{/hasPublicInstanceFields}} -{{#hasPublicMethods}} +{{#hasPublicInstanceMethods}} ## Methods -{{#allPublicInstanceMethods}} +{{#publicInstanceMethodsSorted}} {{>callable}} -{{/allPublicInstanceMethods}} -{{/hasPublicMethods}} +{{/publicInstanceMethodsSorted}} +{{/hasPublicInstanceMethods}} -{{#hasPublicOperators}} +{{#hasPublicInstanceOperators}} ## Operators -{{#allPublicOperators}} +{{#publicInstanceOperatorsSorted}} {{>callable}} -{{/allPublicOperators}} -{{/hasPublicOperators}} +{{/publicInstanceOperatorsSorted}} +{{/hasPublicInstanceOperators}} -{{#hasPublicStaticProperties}} +{{#hasPublicVariableStaticFields}} ## Static Properties -{{#publicStaticProperties}} +{{#publicVariableStaticFieldsSorted}} {{>property}} -{{/publicStaticProperties}} -{{/hasPublicStaticProperties}} +{{/publicVariableStaticFieldsSorted}} +{{/hasPublicVariableStaticFields}} {{#hasPublicStaticMethods}} ## Static Methods -{{#publicStaticMethods}} +{{#publicStaticMethodsSorted}} {{>callable}} -{{/publicStaticMethods}} +{{/publicStaticMethodsSorted}} {{/hasPublicStaticMethods}} {{/eNum}} diff --git a/lib/templates/md/extension.md b/lib/templates/md/extension.md index aa7c992440..be62c54e0d 100644 --- a/lib/templates/md/extension.md +++ b/lib/templates/md/extension.md @@ -12,59 +12,59 @@ on {{#extendedType}}{{{linkedName}}}{{/extendedType}} {{#extension}} {{>documentation}} -{{#hasPublicProperties}} +{{#hasPublicInstanceFields}} ## Properties -{{#allPublicInstanceProperties}} +{{#publicInstanceFieldsSorted}} {{>property}} -{{/allPublicInstanceProperties}} -{{/hasPublicProperties}} +{{/publicInstanceFieldsSorted}} +{{/hasPublicInstanceFields}} -{{#hasPublicMethods}} +{{#hasPublicInstanceMethods}} ## Methods -{{#allPublicInstanceMethods}} +{{#publicInstanceMethodsSorted}} {{>callable}} -{{/allPublicInstanceMethods}} -{{/hasPublicMethods}} +{{/publicInstanceMethodsSorted}} +{{/hasPublicInstanceMethods}} -{{#hasPublicOperators}} +{{#hasPublicInstanceOperators}} ## Operators -{{#allPublicOperators}} +{{#publicInstanceOperatorsSorted}} {{>callable}} -{{/allPublicOperators}} -{{/hasPublicOperators}} +{{/publicInstanceOperatorsSorted}} +{{/hasPublicInstanceOperators}} -{{#hasPublicStaticProperties}} +{{#hasPublicVariableStaticFields}} ## Static Properties -{{#publicStaticProperties}} +{{#publicVariableStaticFieldsSorted}} {{>property}} -{{/publicStaticProperties}} -{{/hasPublicStaticProperties}} +{{/publicVariableStaticFieldsSorted}} +{{/hasPublicVariableStaticFields}} {{#hasPublicStaticMethods}} ## Static Methods -{{#publicStaticMethods}} +{{#publicStaticMethodsSorted}} {{>callable}} -{{/publicStaticMethods}} +{{/publicStaticMethodsSorted}} {{/hasPublicStaticMethods}} -{{#hasPublicConstants}} +{{#hasPublicConstantFields}} ## Constants -{{#publicConstants}} +{{#publicConstantFieldsSorted}} {{>constant}} -{{/publicConstants}} -{{/hasPublicConstants}} +{{/publicConstantFieldsSorted}} +{{/hasPublicConstantFields}} {{/extension}} {{>footer}} diff --git a/lib/templates/md/mixin.md b/lib/templates/md/mixin.md index 8060f5e0bc..e81cdbccfd 100644 --- a/lib/templates/md/mixin.md +++ b/lib/templates/md/mixin.md @@ -65,68 +65,68 @@ {{#hasPublicConstructors}} ## Constructors -{{#publicConstructors}} +{{#publicConstructorsSorted}} {{{linkedName}}}({{{ linkedParams }}}) {{{ oneLineDoc }}} {{{ extendedDocLink }}} {{!two spaces intentional}} {{#isConst}}_const_{{/isConst}} {{#isFactory}}_factory_{{/isFactory}} -{{/publicConstructors}} +{{/publicConstructorsSorted}} {{/hasPublicConstructors}} -{{#hasPublicProperties}} +{{#hasPublicInstanceFields}} ## Properties -{{#allPublicInstanceProperties}} +{{#publicInstanceFieldsSorted}} {{>property}} -{{/allPublicInstanceProperties}} -{{/hasPublicProperties}} +{{/publicInstanceFieldsSorted}} +{{/hasPublicInstanceFields}} -{{#hasPublicMethods}} +{{#hasPublicInstanceMethods}} ## Methods -{{#allPublicInstanceMethods}} +{{#publicInstanceMethodsSorted}} {{>callable}} -{{/allPublicInstanceMethods}} -{{/hasPublicMethods}} +{{/publicInstanceMethodsSorted}} +{{/hasPublicInstanceMethods}} -{{#hasPublicOperators}} +{{#hasPublicInstanceOperators}} ## Operators -{{#allPublicOperators}} +{{#publicInstanceOperatorsSorted}} {{>callable}} -{{/allPublicOperators}} -{{/hasPublicOperators}} +{{/publicInstanceOperatorsSorted}} +{{/hasPublicInstanceOperators}} -{{#hasPublicStaticProperties}} +{{#hasPublicVariableStaticFields}} ## Static Properties -{{#publicStaticProperties}} +{{#publicVariableStaticFieldsSorted}} {{>property}} -{{/publicStaticProperties}} -{{/hasPublicStaticProperties}} +{{/publicVariableStaticFieldsSorted}} +{{/hasPublicVariableStaticFields}} {{#hasPublicStaticMethods}} ## Static Methods -{{#publicStaticMethods}} +{{#publicStaticMethodsSorted}} {{>callable}} -{{/publicStaticMethods}} +{{/publicStaticMethodsSorted}} {{/hasPublicStaticMethods}} -{{#hasPublicConstants}} +{{#hasPublicConstantFields}} ## Constants -{{#publicConstants}} +{{#publicConstantFieldsSorted}} {{>constant}} -{{/publicConstants}} -{{/hasPublicConstants}} +{{/publicConstantFieldsSorted}} +{{/hasPublicConstantFields}} {{/mixin}} {{>footer}} diff --git a/test/dartdoc_test.dart b/test/dartdoc_test.dart index 9a5724c6a5..d1d7ee9c3a 100644 --- a/test/dartdoc_test.dart +++ b/test/dartdoc_test.dart @@ -407,6 +407,12 @@ void main() { } }); + test('generating markdown docs does not crash', () async { + var dartdoc = + await buildDartdoc(['--format', 'md'], testPackageDir, tempDir); + await dartdoc.generateDocsBase(); + }); + test('rel canonical prefix does not include base href', () async { // ignore: omit_local_variable_types final String prefix = 'foo.bar/baz';