diff --git a/CHANGELOG.md b/CHANGELOG.md index 21bcdd4b0f..02e230cb2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.21.1 +* Fix a problem where category ordering specified in categories option + was not obeyed. Reintroduce categoryOrder option to solve this problem. + ## 0.21.0 * Expand categories to all top level items as well as libraries. (#1681, #1353) * The categoryOrder option in dartdoc_options.yaml and the command line diff --git a/README.md b/README.md index f192910d48..7e6d998832 100644 --- a/README.md +++ b/README.md @@ -109,15 +109,18 @@ dartdoc: "Second Category": markdown: doc/Second.md name: Great + categoryOrder: ["First Category", "Second Category"] linkTo: url: "https://my.dartdocumentationsite.org/dev/%v%" ``` Unrecognized options will be ignored. Supported options: - * **categories**: Specify the order of categories. For APIs you'd like to document, specify + * **categories**: More details for each category/topic. For topics you'd like to document, specify the markdown file with `markdown:` to use for the category page. Optionally, rename the category from the source code into a display name with 'name:'. + * **categoryOrder**: Specify the order of topics for display in the sidebar and + the package page. * **exclude**: Specify a list of library names to avoid generating docs for, overriding any specified in include. * **include**: Specify a list of library names to generate docs for, ignoring all others. diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart index 444fa6d23d..51a02eab06 100644 --- a/lib/src/dartdoc_options.dart +++ b/lib/src/dartdoc_options.dart @@ -77,24 +77,19 @@ class CategoryConfiguration { /// A map of [CategoryDefinition.name] to [CategoryDefinition] objects. final Map categoryDefinitions; - /// The defined order for categories. - List categoryOrder; - - CategoryConfiguration._(this.categoryDefinitions, this.categoryOrder); + CategoryConfiguration._(this.categoryDefinitions); static CategoryConfiguration get empty { - return new CategoryConfiguration._({}, []); + return new CategoryConfiguration._({}); } static CategoryConfiguration fromYamlMap( YamlMap yamlMap, pathLib.Context pathContext) { - List categoriesInOrder = []; Map newCategoryDefinitions = {}; for (MapEntry entry in yamlMap.entries) { String name = entry.key.toString(); String displayName; String documentationMarkdown; - categoriesInOrder.add(name); var categoryMap = entry.value; if (categoryMap is Map) { displayName = categoryMap['displayName']?.toString(); @@ -111,8 +106,7 @@ class CategoryConfiguration { new CategoryDefinition(name, displayName, documentationMarkdown); } } - return new CategoryConfiguration._( - newCategoryDefinitions, categoriesInOrder); + return new CategoryConfiguration._(newCategoryDefinitions); } } @@ -1014,6 +1008,7 @@ class DartdocOptionContext { optionSet['ambiguousReexportScorerMinConfidence'].valueAt(context); bool get autoIncludeDependencies => optionSet['autoIncludeDependencies'].valueAt(context); + List get categoryOrder => optionSet['categoryOrder'].valueAt(context); CategoryConfiguration get categories => optionSet['categories'].valueAt(context); List get dropTextFrom => optionSet['dropTextFrom'].valueAt(context); @@ -1068,7 +1063,6 @@ Future> createDartdocOptions() async { new DartdocOptionArgOnly('addCrossdart', false, help: 'Add Crossdart links to the source code pieces.', negatable: true), - new DartdocOptionArgFile( 'ambiguousReexportScorerMinConfidence', 0.1, help: @@ -1077,6 +1071,10 @@ Future> createDartdocOptions() async { help: 'Include all the used libraries into the docs, even the ones not in the current package or "include-external"', negatable: true), + new DartdocOptionArgFile>('categoryOrder', [], + help: + "A list of categories (not package names) to place first when grouping symbols on dartdoc's sidebar. " + 'Unmentioned categories are sorted after these.'), new DartdocOptionFileOnly( 'categories', CategoryConfiguration.empty, convertYamlToType: CategoryConfiguration.fromYamlMap, @@ -1206,7 +1204,7 @@ Future> createDartdocOptions() async { new DartdocOptionArgOnly>('packageOrder', [], help: 'A list of package names to place first when grouping libraries in packages. ' - 'Unmentioned categories are sorted after these.'), + 'Unmentioned packages are sorted after these.'), new DartdocOptionArgOnly('sdkDocs', false, help: 'Generate ONLY the docs for the Dart SDK.', negatable: false), new DartdocOptionArgSynth('sdkDir', diff --git a/lib/src/model.dart b/lib/src/model.dart index 10888a0d24..3e8b95a4f1 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -149,7 +149,6 @@ abstract class Inheritable implements ModelElement { // starting from the ModelElement. if (canonicalC != null) { assert(canonicalC.isCanonical); - //assert(this.inheritance.contains(canonicalC)); assert(canonicalC.contains(searchElement)); _canonicalEnclosingClass = canonicalC; break; @@ -5131,7 +5130,7 @@ class Category extends Nameable String get sortKey => _name; @override - List get containerOrder => config.categories.categoryOrder; + List get containerOrder => config.categoryOrder; @override String get enclosingName => package.name; diff --git a/lib/src/version.dart b/lib/src/version.dart index 89785059fd..ffaad2c6f4 100644 --- a/lib/src/version.dart +++ b/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '0.21.0'; +const packageVersion = '0.21.1'; diff --git a/pubspec.yaml b/pubspec.yaml index 4de7541ed9..f2fbf5a945 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dartdoc # Also update the `version` field in lib/dartdoc.dart. -version: 0.21.0 +version: 0.21.1 author: Dart Team description: A documentation generator for Dart. homepage: https://github.com/dart-lang/dartdoc diff --git a/test/model_test.dart b/test/model_test.dart index b877c55a02..4df7d30f3d 100644 --- a/test/model_test.dart +++ b/test/model_test.dart @@ -189,14 +189,14 @@ void main() { packageCategories.map((c) => c.name).toList(), orderedEquals([ 'Superb', - 'Real Libraries', 'Unreal', + 'Real Libraries', 'Misc', 'More Excellence', 'NotSoExcellent' ])); expect(packageCategories.map((c) => c.libraries.length).toList(), - orderedEquals([0, 3, 2, 1, 0, 0])); + orderedEquals([0, 2, 3, 1, 0, 0])); expect( packageGraph .localPackages.first.defaultCategory.publicLibraries.length, diff --git a/testing/test_package/dartdoc_options.yaml b/testing/test_package/dartdoc_options.yaml index 1971efc25e..3f65cc67b4 100644 --- a/testing/test_package/dartdoc_options.yaml +++ b/testing/test_package/dartdoc_options.yaml @@ -1,8 +1,9 @@ dartdoc: + categoryOrder: ["Excellent", "Unreal", "Real Libraries"] categories: Excellent: markdown: "Excellent.md" displayName: "Superb" - Real Libraries: Unreal: markdown: "Unreal.md" + Real Libraries: diff --git a/testing/test_package_docs/__404error.html b/testing/test_package_docs/__404error.html index 229932bbcc..2081627f8f 100644 --- a/testing/test_package_docs/__404error.html +++ b/testing/test_package_docs/__404error.html @@ -4,7 +4,7 @@ - + test_package - Dart API docs @@ -42,13 +42,13 @@
test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/anonymous_library/anonymous_library-library.html b/testing/test_package_docs/anonymous_library/anonymous_library-library.html index 9d0bd847eb..2f0d6ef67d 100644 --- a/testing/test_package_docs/anonymous_library/anonymous_library-library.html +++ b/testing/test_package_docs/anonymous_library/anonymous_library-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html index a5e48ab82f..615dc5679e 100644 --- a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html +++ b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/categoriesExported/categoriesExported-library.html b/testing/test_package_docs/categoriesExported/categoriesExported-library.html index 308a9664f6..13bf0bb7dd 100644 --- a/testing/test_package_docs/categoriesExported/categoriesExported-library.html +++ b/testing/test_package_docs/categoriesExported/categoriesExported-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/code_in_comments/code_in_comments-library.html b/testing/test_package_docs/code_in_comments/code_in_comments-library.html index 4d4df09a03..2cef34da6d 100644 --- a/testing/test_package_docs/code_in_comments/code_in_comments-library.html +++ b/testing/test_package_docs/code_in_comments/code_in_comments-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html index 4560937206..76ee0edb73 100644 --- a/testing/test_package_docs/css/css-library.html +++ b/testing/test_package_docs/css/css-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html index 94d6fab565..4ea210c1fe 100644 --- a/testing/test_package_docs/ex/ex-library.html +++ b/testing/test_package_docs/ex/ex-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/fake/BaseForDocComments-class.html b/testing/test_package_docs/fake/BaseForDocComments-class.html index 24bd8b5174..49177e42f6 100644 --- a/testing/test_package_docs/fake/BaseForDocComments-class.html +++ b/testing/test_package_docs/fake/BaseForDocComments-class.html @@ -161,7 +161,7 @@
    fake library

    BaseForDocComments class Superb - Unreal + Unreal

    diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html index 2163ba270b..8bf037b392 100644 --- a/testing/test_package_docs/fake/fake-library.html +++ b/testing/test_package_docs/fake/fake-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -142,7 +142,7 @@

    Classes

    BaseForDocComments Superb - Unreal + Unreal
    diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html index 3e09a7e6d4..9476bc9d76 100644 --- a/testing/test_package_docs/index.html +++ b/testing/test_package_docs/index.html @@ -4,7 +4,7 @@ - + test_package - Dart API docs @@ -42,13 +42,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -133,7 +133,20 @@

    Libraries

    This lib is deprecated. It never had a chance -

    Real Libraries

    +

    Unreal

    +
    + reexport_one Unreal + +
    +
    + +
    + reexport_two Unreal + +
    +
    + +

    Real Libraries

    ex
    @@ -149,19 +162,6 @@

    Libraries

    -

    Unreal

    -
    - reexport_one Unreal - -
    -
    - -
    - reexport_two Unreal - -
    -
    -

    Misc

    two_exports diff --git a/testing/test_package_docs/is_deprecated/is_deprecated-library.html b/testing/test_package_docs/is_deprecated/is_deprecated-library.html index cb23111923..4cac1680f9 100644 --- a/testing/test_package_docs/is_deprecated/is_deprecated-library.html +++ b/testing/test_package_docs/is_deprecated/is_deprecated-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html index 2ffe60667f..f21f42c9c5 100644 --- a/testing/test_package_docs/reexport_one/reexport_one-library.html +++ b/testing/test_package_docs/reexport_one/reexport_one-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -63,7 +63,7 @@
    test_package pa
    -

    reexport_one library Unreal +

    reexport_one library Unreal

    diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html index 5636cfba4a..e09900e665 100644 --- a/testing/test_package_docs/reexport_two/reexport_two-library.html +++ b/testing/test_package_docs/reexport_two/reexport_two-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -63,7 +63,7 @@
    test_package pa
    -

    reexport_two library Unreal +

    reexport_two library Unreal

    diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html index 6378e5ae86..b402f96406 100644 --- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html +++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs/topics/Superb-topic.html b/testing/test_package_docs/topics/Superb-topic.html index b04ff3b68a..c7288229da 100644 --- a/testing/test_package_docs/topics/Superb-topic.html +++ b/testing/test_package_docs/topics/Superb-topic.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -76,7 +76,7 @@

    Classes

    BaseForDocComments Superb - Unreal + Unreal
    diff --git a/testing/test_package_docs/topics/Unreal-topic.html b/testing/test_package_docs/topics/Unreal-topic.html index 3cce04d471..fc33f2f3d3 100644 --- a/testing/test_package_docs/topics/Unreal-topic.html +++ b/testing/test_package_docs/topics/Unreal-topic.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -75,13 +75,13 @@

    Libraries

    - reexport_one Unreal + reexport_one Unreal
    - reexport_two Unreal + reexport_two Unreal
    @@ -95,7 +95,7 @@

    Classes

    BaseForDocComments Superb - Unreal + Unreal
    diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html index 4d81759f77..42083e07bb 100644 --- a/testing/test_package_docs/two_exports/two_exports-library.html +++ b/testing/test_package_docs/two_exports/two_exports-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/__404error.html b/testing/test_package_docs_dev/__404error.html index 229932bbcc..2081627f8f 100644 --- a/testing/test_package_docs_dev/__404error.html +++ b/testing/test_package_docs_dev/__404error.html @@ -4,7 +4,7 @@ - + test_package - Dart API docs @@ -42,13 +42,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html b/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html index 9d0bd847eb..2f0d6ef67d 100644 --- a/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html +++ b/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html index a5e48ab82f..615dc5679e 100644 --- a/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html +++ b/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html b/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html index 308a9664f6..13bf0bb7dd 100644 --- a/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html +++ b/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html b/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html index 4d4df09a03..2cef34da6d 100644 --- a/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html +++ b/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/css/css-library.html b/testing/test_package_docs_dev/css/css-library.html index 4560937206..76ee0edb73 100644 --- a/testing/test_package_docs_dev/css/css-library.html +++ b/testing/test_package_docs_dev/css/css-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/ex/ex-library.html b/testing/test_package_docs_dev/ex/ex-library.html index 94d6fab565..4ea210c1fe 100644 --- a/testing/test_package_docs_dev/ex/ex-library.html +++ b/testing/test_package_docs_dev/ex/ex-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/fake/BaseForDocComments-class.html b/testing/test_package_docs_dev/fake/BaseForDocComments-class.html index 24bd8b5174..49177e42f6 100644 --- a/testing/test_package_docs_dev/fake/BaseForDocComments-class.html +++ b/testing/test_package_docs_dev/fake/BaseForDocComments-class.html @@ -161,7 +161,7 @@
    fake library

    BaseForDocComments class Superb - Unreal + Unreal

    diff --git a/testing/test_package_docs_dev/fake/fake-library.html b/testing/test_package_docs_dev/fake/fake-library.html index 2163ba270b..8bf037b392 100644 --- a/testing/test_package_docs_dev/fake/fake-library.html +++ b/testing/test_package_docs_dev/fake/fake-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -142,7 +142,7 @@

    Classes

    BaseForDocComments Superb - Unreal + Unreal
    diff --git a/testing/test_package_docs_dev/index.html b/testing/test_package_docs_dev/index.html index 3e09a7e6d4..9476bc9d76 100644 --- a/testing/test_package_docs_dev/index.html +++ b/testing/test_package_docs_dev/index.html @@ -4,7 +4,7 @@ - + test_package - Dart API docs @@ -42,13 +42,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -133,7 +133,20 @@

    Libraries

    This lib is deprecated. It never had a chance -

    Real Libraries

    +

    Unreal

    +
    + reexport_one Unreal + +
    +
    + +
    + reexport_two Unreal + +
    +
    + +

    Real Libraries

    ex
    @@ -149,19 +162,6 @@

    Libraries

    -

    Unreal

    -
    - reexport_one Unreal - -
    -
    - -
    - reexport_two Unreal - -
    -
    -

    Misc

    two_exports diff --git a/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html b/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html index cb23111923..4cac1680f9 100644 --- a/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html +++ b/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/reexport_one/reexport_one-library.html b/testing/test_package_docs_dev/reexport_one/reexport_one-library.html index 2ffe60667f..f21f42c9c5 100644 --- a/testing/test_package_docs_dev/reexport_one/reexport_one-library.html +++ b/testing/test_package_docs_dev/reexport_one/reexport_one-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -63,7 +63,7 @@
    test_package pa
    -

    reexport_one library Unreal +

    reexport_one library Unreal

    diff --git a/testing/test_package_docs_dev/reexport_two/reexport_two-library.html b/testing/test_package_docs_dev/reexport_two/reexport_two-library.html index 5636cfba4a..e09900e665 100644 --- a/testing/test_package_docs_dev/reexport_two/reexport_two-library.html +++ b/testing/test_package_docs_dev/reexport_two/reexport_two-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -63,7 +63,7 @@
    test_package pa
    -

    reexport_two library Unreal +

    reexport_two library Unreal

    diff --git a/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html index 6378e5ae86..b402f96406 100644 --- a/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html +++ b/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • diff --git a/testing/test_package_docs_dev/topics/Superb-topic.html b/testing/test_package_docs_dev/topics/Superb-topic.html index b04ff3b68a..c7288229da 100644 --- a/testing/test_package_docs_dev/topics/Superb-topic.html +++ b/testing/test_package_docs_dev/topics/Superb-topic.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -76,7 +76,7 @@

    Classes

    BaseForDocComments Superb - Unreal + Unreal
    diff --git a/testing/test_package_docs_dev/topics/Unreal-topic.html b/testing/test_package_docs_dev/topics/Unreal-topic.html index 3cce04d471..fc33f2f3d3 100644 --- a/testing/test_package_docs_dev/topics/Unreal-topic.html +++ b/testing/test_package_docs_dev/topics/Unreal-topic.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other
    • @@ -75,13 +75,13 @@

    Libraries

    - reexport_one Unreal + reexport_one Unreal
    - reexport_two Unreal + reexport_two Unreal
    @@ -95,7 +95,7 @@

    Classes

    BaseForDocComments Superb - Unreal + Unreal
    diff --git a/testing/test_package_docs_dev/two_exports/two_exports-library.html b/testing/test_package_docs_dev/two_exports/two_exports-library.html index 4d81759f77..42083e07bb 100644 --- a/testing/test_package_docs_dev/two_exports/two_exports-library.html +++ b/testing/test_package_docs_dev/two_exports/two_exports-library.html @@ -45,13 +45,13 @@
    test_package pa
  • another_anonymous_lib
  • code_in_comments
  • is_deprecated
    • +
  • Unreal
    • +
  • reexport_one
    • +
  • reexport_two
  • Real Libraries
  • ex
  • fake
  • two_exports
    • -
  • Unreal
    • -
  • reexport_one
    • -
  • reexport_two
  • Misc
  • two_exports
  • Other