clean up loops

Author: jcollins-g

lib/src/dartdoc_options.dart

@@ -1094,26 +1094,23 @@ abstract class _DartdocFileOption<T> implements DartdocOption<T> {
 
   /// Searches all dartdoc_options files through parent directories, starting at
   /// [dir], for the option and returns one once found.
-  _OptionValueWithContext<Object> _valueAtFromFilesFirstFound(Folder dir) {
+  _OptionValueWithContext<Object> _valueAtFromFilesFirstFound(Folder folder) {
     _OptionValueWithContext<Object> value;
-    while (true) {
+    for (var dir in folder.withAncestors) {
       value = _valueAtFromFile(dir);
-      if (value != null || dir.isRoot) break;
-      dir = dir.parent2;
+      if (value != null) break;
     }
     return value;
   }
 
   /// Searches all dartdoc_options files for the option, and returns the value
   /// in the top-most parent directory `dartdoc_options.yaml` file it is
   /// mentioned in.
-  _OptionValueWithContext<Object> _valueAtFromFilesLastFound(Folder dir) {
+  _OptionValueWithContext<Object> _valueAtFromFilesLastFound(Folder folder) {
     _OptionValueWithContext<Object> value;
-    while (true) {
+    for (var dir in folder.withAncestors) {
       var tmpValue = _valueAtFromFile(dir);
       if (tmpValue != null) value = tmpValue;
-      if (dir.isRoot) break;
-      dir = dir.parent2;
     }
     return value;
   }
@@ -1179,35 +1176,32 @@ abstract class _DartdocFileOption<T> implements DartdocOption<T> {
         definingFile: 'dartdoc_options.yaml');
   }
 
-  _YamlFileData _yamlAtDirectory(Folder dir) {
-    var canonicalPaths = <String>[
-      resourceProvider.pathContext.canonicalize(dir.path)
-    ];
-    if (!_yamlAtCanonicalPathCache.containsKey(canonicalPaths.first)) {
-      var yamlData = _YamlFileData({}, _directoryCurrentPath);
+  _YamlFileData _yamlAtDirectory(Folder folder) {
+    var canonicalPaths = <String>[];
+    var yamlData = _YamlFileData({}, _directoryCurrentPath);
+
+    for (var dir in folder.withAncestors) {
+      var canonicalPath =
+          resourceProvider.pathContext.canonicalize(folder.path);
+      if (_yamlAtCanonicalPathCache.containsKey(canonicalPath)) {
+        yamlData = _yamlAtCanonicalPathCache[canonicalPath];
+        break;
+      }
+      canonicalPaths.add(canonicalPath);
       if (dir.exists) {
-        File dartdocOptionsFile;
-
-        while (true) {
-          dartdocOptionsFile = resourceProvider.getFile(resourceProvider
-              .pathContext
-              .join(dir.path, 'dartdoc_options.yaml'));
-          if (dartdocOptionsFile.exists || dir.isRoot) {
-            break;
-          }
-          dir = dir.parent2;
-          canonicalPaths
-              .add(resourceProvider.pathContext.canonicalize(dir.path));
-        }
+        var dartdocOptionsFile = resourceProvider.getFile(resourceProvider
+            .pathContext
+            .join(dir.path, 'dartdoc_options.yaml'));
         if (dartdocOptionsFile.exists) {
           yamlData = _YamlFileData(
               loadYaml(dartdocOptionsFile.readAsStringSync()),
               resourceProvider.pathContext.canonicalize(dir.path));
+          break;
         }
       }
-      canonicalPaths.forEach((p) => _yamlAtCanonicalPathCache[p] = yamlData);
     }
-    return _yamlAtCanonicalPathCache[canonicalPaths.first];
+    canonicalPaths.forEach((p) => _yamlAtCanonicalPathCache[p] = yamlData);
+    return yamlData;
   }
 }
 

lib/src/package_meta.dart

@@ -177,23 +177,21 @@ abstract class PubPackageMeta extends PackageMeta {
 
   static final _sdkDirParent = <String, Folder>{};
 
-  /// If [dir] is inside a Dart SDK, returns the directory of the SDK, and `null`
+  /// If [folder] is inside a Dart SDK, returns the directory of the SDK, and `null`
   /// otherwise.
-  static Folder sdkDirParent(Folder dir, ResourceProvider resourceProvider) {
+  static Folder sdkDirParent(Folder folder, ResourceProvider resourceProvider) {
     var pathContext = resourceProvider.pathContext;
-    var dirPathCanonical = pathContext.canonicalize(dir.path);
+    var dirPathCanonical = pathContext.canonicalize(folder.path);
     if (!_sdkDirParent.containsKey(dirPathCanonical)) {
       _sdkDirParent[dirPathCanonical] = null;
-      while (dir.exists) {
+      for (var dir in folder.withAncestors) {
         if (_sdkDirFilePaths.every((List<String> l) {
           return l.any((f) =>
               resourceProvider.getFile(pathContext.join(dir.path, f)).exists);
         })) {
           _sdkDirParent[dirPathCanonical] = dir;
           break;
         }
-        if (dir.isRoot) break;
-        dir = dir.parent2;
       }
     }
     return _sdkDirParent[dirPathCanonical];
@@ -224,38 +222,36 @@ abstract class PubPackageMeta extends PackageMeta {
   /// [dir.absolute.path].  Multiple [dir.absolute.path]s will resolve to the
   /// same object if they are part of the same package.  Returns null
   /// if the directory is not part of a known package.
-  static PubPackageMeta fromDir(Folder dir, ResourceProvider resourceProvider) {
+  static PubPackageMeta fromDir(
+      Folder folder, ResourceProvider resourceProvider) {
     var pathContext = resourceProvider.pathContext;
-    var original = resourceProvider.getFolder(pathContext.absolute(dir.path));
-    dir = original;
+    var original =
+        resourceProvider.getFolder(pathContext.absolute(folder.path));
+    folder = original;
     if (!original.exists) {
       throw PackageMetaFailure(
           'fatal error: unable to locate the input directory at ${original.path}.');
     }
 
-    if (!_packageMetaCache.containsKey(dir.path)) {
+    if (!_packageMetaCache.containsKey(folder.path)) {
       PackageMeta packageMeta;
       // There are pubspec.yaml files inside the SDK.  Ignore them.
-      var parentSdkDir = sdkDirParent(dir, resourceProvider);
+      var parentSdkDir = sdkDirParent(folder, resourceProvider);
       if (parentSdkDir != null) {
         packageMeta = _SdkMeta(parentSdkDir, resourceProvider);
       } else {
-        while (dir.exists) {
+        for (var dir in folder.withAncestors) {
           var pubspec = resourceProvider
               .getFile(pathContext.join(dir.path, 'pubspec.yaml'));
           if (pubspec.exists) {
             packageMeta = _FilePackageMeta(dir, resourceProvider);
             break;
           }
-          // Allow a package to be at root (possible in a Windows setting with
-          // drive letter mappings).
-          if (dir.isRoot) break;
-          dir = dir.parent2;
         }
       }
-      _packageMetaCache[pathContext.absolute(dir.path)] = packageMeta;
+      _packageMetaCache[pathContext.absolute(folder.path)] = packageMeta;
     }
-    return _packageMetaCache[pathContext.absolute(dir.path)];
+    return _packageMetaCache[pathContext.absolute(folder.path)];
   }
 
   @override