@@ -256,17 +256,18 @@ class PackageGraph {
256256 bool allLibrariesAdded = false ;
257257 bool _localDocumentationBuilt = false ;
258258
259+ Set <String > _allRootDirs;
260+
259261 /// Returns true if there's at least one library documented in the package
260262 /// that has the same package path as the library for the given element.
263+ ///
261264 /// Usable as a cross-check for dartdoc's canonicalization to generate
262265 /// warnings for ModelElement.isPublicAndPackageDocumented.
263- Set <String > _allRootDirs;
264-
265266 bool packageDocumentedFor (ModelElement element) {
266267 _allRootDirs ?? = {
267268 ...(publicLibraries.map ((l) => l.packageMeta? .resolvedDir))
268269 };
269- return ( _allRootDirs.contains (element.library.packageMeta? .resolvedDir) );
270+ return _allRootDirs.contains (element.library.packageMeta? .resolvedDir);
270271 }
271272
272273 PackageWarningCounter get packageWarningCounter => _packageWarningCounter;
@@ -584,7 +585,7 @@ class PackageGraph {
584585 }
585586 }
586587
587- List <Library > get libraries =>
588+ Iterable <Library > get libraries =>
588589 packages.expand ((p) => p.libraries).toList ()..sort ();
589590
590591 List <Library > _publicLibraries;
@@ -682,8 +683,7 @@ class PackageGraph {
682683 if (library.modelElementsMap.containsKey (searchElement)) {
683684 for (var modelElement in library.modelElementsMap[searchElement]) {
684685 if (modelElement.isCanonical) {
685- _canonicalLibraryFor[e] = library;
686- break ;
686+ return _canonicalLibraryFor[e] = library;
687687 }
688688 }
689689 }
@@ -745,8 +745,7 @@ class PackageGraph {
745745 Class canonicalClass = findCanonicalModelElementFor (e.enclosingElement);
746746 if (canonicalClass != null ) {
747747 candidates.addAll (canonicalClass.allCanonicalModelElements.where ((m) {
748- if (m.element == e) return true ;
749- return false ;
748+ return m.element == e;
750749 }));
751750 }
752751 var matches = < ModelElement > {...candidates.where ((me) => me.isCanonical)};
0 commit comments