@@ -3991,9 +3991,9 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
39913991 warningMessage =
39923992 "library says it is {@canonicalFor ${message }} but ${message } can't be canonical there" ;
39933993 break ;
3994- case PackageWarning .categoryOrderGivesMissingPackageName :
3994+ case PackageWarning .packageOrderGivesMissingPackageName :
39953995 warningMessage =
3996- "--category -order gives invalid package name: '${message }'" ;
3996+ "--package -order gives invalid package name: '${message }'" ;
39973997 break ;
39983998 case PackageWarning .unresolvedDocReference:
39993999 warningMessage = "unresolved doc reference [${message }]" ;
@@ -4063,17 +4063,18 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
40634063 return locatable.fullyQualifiedName.replaceFirst (':' , '-' );
40644064 }
40654065
4066- List <Package > get categories {
4067- // Help the user if they pass us a category that doesn't exist.
4068- for (String categoryName in config.categoryOrder) {
4069- if (! packages.containsKey (categoryName))
4070- warnOnElement (null , PackageWarning .categoryOrderGivesMissingPackageName,
4071- message: "${categoryName }, categories: ${packages .keys .join (',' )}" );
4066+ List <Package > get publicPackages {
4067+ List <Package > _publicPackages;
4068+ // Help the user if they pass us a package that doesn't exist.
4069+ for (String packageName in config.packageOrder) {
4070+ if (! packages.containsKey (packageName))
4071+ warnOnElement (null , PackageWarning .packageOrderGivesMissingPackageName,
4072+ message: "${packageName }, packages: ${packages .keys .join (',' )}" );
40724073 }
4073- List < Package > publicPackages = packages.values
4074+ _publicPackages = packages.values
40744075 .where ((p) => p.libraries.any ((l) => l.isPublic))
40754076 .toList ();
4076- return publicPackages ..sort ();
4077+ return _publicPackages ..sort ();
40774078 }
40784079
40794080 Map <LibraryElement , Set <Library >> _libraryElementReexportedBy = new Map ();
@@ -4200,7 +4201,7 @@ class PackageGraph extends Canonicalization with Nameable, Warnable {
42004201 String get name => packageMeta.name;
42014202
42024203 String get kind =>
4203- (packageMeta.useCategories || packageGraph.isSdk) ? '' : 'package' ;
4204+ (packageMeta.displayAsPackages || packageGraph.isSdk) ? '' : 'package' ;
42044205
42054206 @override
42064207 String get oneLineDoc => '' ;
@@ -4492,14 +4493,14 @@ class Package implements Comparable<Package> {
44924493 String toString () => name;
44934494
44944495 /// Returns:
4495- /// -1 if this category is listed in --category -order.
4496- /// 0 if this category is the original package we are documenting.
4496+ /// -1 if this package is listed in --package -order.
4497+ /// 0 if this package is the original package we are documenting.
44974498 /// 1 if this group represents the Dart SDK.
44984499 /// 2 if this group has a name that contains the name of the original
44994500 /// package we are documenting.
45004501 /// 3 otherwise.
45014502int get _group {
4502- if (config.categoryOrder .contains (name)) return - 1 ;
4503+ if (config.packageOrder .contains (name)) return - 1 ;
45034504 if (name.toLowerCase () == packageGraph.name.toLowerCase ()) return 0 ;
45044505 if (name == "Dart Core" ) return 1 ;
45054506 if (name.toLowerCase ().contains (packageGraph.name.toLowerCase ())) return 2 ;
@@ -4510,8 +4511,8 @@ class Package implements Comparable<Package> {
45104511 int compareTo (Package other) {
45114512 if (_group == other._group) {
45124513 if (_group == - 1 ) {
4513- return Comparable .compare (config.categoryOrder .indexOf (name),
4514- config.categoryOrder .indexOf (other.name));
4514+ return Comparable .compare (config.packageOrder .indexOf (name),
4515+ config.packageOrder .indexOf (other.name));
45154516 } else {
45164517 return name.toLowerCase ().compareTo (other.name.toLowerCase ());
45174518 }
0 commit comments