move to the latest version of pedantic (#1975)

Author: devoncarew

analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.1.5.0.yaml
+include: package:pedantic/analysis_options.1.7.0.yaml
 
 analyzer:
   exclude:

lib/dartdoc.dart

@@ -24,7 +24,7 @@ import 'package:dartdoc/src/version.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:html/dom.dart' show Element, Document;
 import 'package:html/parser.dart' show parse;
-import 'package:path/path.dart' as pathLib;
+import 'package:path/path.dart' as path;
 
 export 'package:dartdoc/src/dartdoc_options.dart';
 export 'package:dartdoc/src/element_type.dart';
@@ -105,10 +105,11 @@ class Dartdoc extends PackageBuilder {
 
       for (var generator in generators) {
         await generator.generate(packageGraph, outputDir.path);
-        writtenFiles.addAll(generator.writtenFiles.map(pathLib.normalize));
+        writtenFiles.addAll(generator.writtenFiles.map(path.normalize));
       }
-      if (config.validateLinks && writtenFiles.isNotEmpty)
+      if (config.validateLinks && writtenFiles.isNotEmpty) {
         validateLinks(packageGraph, outputDir.path);
+      }
     }
 
     int warnings = packageGraph.packageWarningCounter.warningCount;
@@ -159,12 +160,12 @@ class Dartdoc extends PackageBuilder {
     Set<Warnable> warnOnElements;
 
     // Make all paths relative to origin.
-    if (pathLib.isWithin(origin, warnOn)) {
-      warnOn = pathLib.relative(warnOn, from: origin);
+    if (path.isWithin(origin, warnOn)) {
+      warnOn = path.relative(warnOn, from: origin);
     }
     if (referredFrom != null) {
-      if (pathLib.isWithin(origin, referredFrom)) {
-        referredFrom = pathLib.relative(referredFrom, from: origin);
+      if (path.isWithin(origin, referredFrom)) {
+        referredFrom = path.relative(referredFrom, from: origin);
       }
       // Source paths are always relative.
       if (_hrefs[referredFrom] != null) {
@@ -185,8 +186,9 @@ class Dartdoc extends PackageBuilder {
       }
     }
 
-    if (referredFromElements.isEmpty && referredFrom == 'index.html')
+    if (referredFromElements.isEmpty && referredFrom == 'index.html') {
       referredFromElements.add(packageGraph.defaultPackage);
+    }
     String message = warnOn;
     if (referredFrom == 'index.json') message = '$warnOn (from index.json)';
     packageGraph.warnOnElement(warnOnElement, kind,
@@ -195,13 +197,13 @@ class Dartdoc extends PackageBuilder {
 
   void _doOrphanCheck(
       PackageGraph packageGraph, String origin, Set<String> visited) {
-    String normalOrigin = pathLib.normalize(origin);
-    String staticAssets = pathLib.joinAll([normalOrigin, 'static-assets', '']);
-    String indexJson = pathLib.joinAll([normalOrigin, 'index.json']);
+    String normalOrigin = path.normalize(origin);
+    String staticAssets = path.joinAll([normalOrigin, 'static-assets', '']);
+    String indexJson = path.joinAll([normalOrigin, 'index.json']);
     bool foundIndexJson = false;
     for (FileSystemEntity f
         in new Directory(normalOrigin).listSync(recursive: true)) {
-      var fullPath = pathLib.normalize(f.path);
+      var fullPath = path.normalize(f.path);
       if (f is Directory) {
         continue;
       }
@@ -214,7 +216,7 @@ class Dartdoc extends PackageBuilder {
         continue;
       }
       if (visited.contains(fullPath)) continue;
-      String relativeFullPath = pathLib.relative(fullPath, from: normalOrigin);
+      String relativeFullPath = path.relative(fullPath, from: normalOrigin);
       if (!writtenFiles.contains(relativeFullPath)) {
         // This isn't a file we wrote (this time); don't claim we did.
         _warn(packageGraph, PackageWarning.unknownFile, fullPath, normalOrigin);
@@ -259,8 +261,8 @@ class Dartdoc extends PackageBuilder {
 
   void _doSearchIndexCheck(
       PackageGraph packageGraph, String origin, Set<String> visited) {
-    String fullPath = pathLib.joinAll([origin, 'index.json']);
-    String indexPath = pathLib.joinAll([origin, 'index.html']);
+    String fullPath = path.joinAll([origin, 'index.json']);
+    String indexPath = path.joinAll([origin, 'index.html']);
     File file = new File("$fullPath");
     if (!file.existsSync()) {
       return null;
@@ -275,10 +277,10 @@ class Dartdoc extends PackageBuilder {
     found.add(indexPath);
     for (Map<String, dynamic> entry in jsonData) {
       if (entry.containsKey('href')) {
-        String entryPath = pathLib.joinAll([origin, entry['href']]);
+        String entryPath = path.joinAll([origin, entry['href']]);
         if (!visited.contains(entryPath)) {
           _warn(packageGraph, PackageWarning.brokenLink, entryPath,
-              pathLib.normalize(origin),
+              path.normalize(origin),
               referredFrom: fullPath);
         }
         found.add(entryPath);
@@ -288,7 +290,7 @@ class Dartdoc extends PackageBuilder {
     Set<String> missing_from_search = visited.difference(found);
     for (String s in missing_from_search) {
       _warn(packageGraph, PackageWarning.missingFromSearchIndex, s,
-          pathLib.normalize(origin),
+          path.normalize(origin),
           referredFrom: fullPath);
     }
   }
@@ -297,14 +299,14 @@ class Dartdoc extends PackageBuilder {
       String pathToCheck,
       [String source, String fullPath]) {
     if (fullPath == null) {
-      fullPath = pathLib.joinAll([origin, pathToCheck]);
-      fullPath = pathLib.normalize(fullPath);
+      fullPath = path.joinAll([origin, pathToCheck]);
+      fullPath = path.normalize(fullPath);
     }
 
     Tuple2 stringLinksAndHref = _getStringLinksAndHref(fullPath);
     if (stringLinksAndHref == null) {
       _warn(packageGraph, PackageWarning.brokenLink, pathToCheck,
-          pathLib.normalize(origin),
+          path.normalize(origin),
           referredFrom: source);
       _onCheckProgress.add(pathToCheck);
       // Remove so that we properly count that the file doesn't exist for
@@ -328,18 +330,20 @@ class Dartdoc extends PackageBuilder {
         Uri uri;
         try {
           uri = Uri.parse(href);
-        } catch (FormatError) {}
+        } catch (FormatError) {
+          // ignore
+        }
 
         if (uri == null || !uri.hasAuthority && !uri.hasFragment) {
           var full;
           if (baseHref != null) {
-            full = '${pathLib.dirname(pathToCheck)}/$baseHref/$href';
+            full = '${path.dirname(pathToCheck)}/$baseHref/$href';
           } else {
-            full = '${pathLib.dirname(pathToCheck)}/$href';
+            full = '${path.dirname(pathToCheck)}/$href';
           }
-          var newPathToCheck = pathLib.normalize(full);
-          String newFullPath = pathLib.joinAll([origin, newPathToCheck]);
-          newFullPath = pathLib.normalize(newFullPath);
+          var newPathToCheck = path.normalize(full);
+          String newFullPath = path.joinAll([origin, newPathToCheck]);
+          newFullPath = path.normalize(newFullPath);
           if (!visited.contains(newFullPath)) {
             toVisit.add(new Tuple2(newPathToCheck, newFullPath));
             visited.add(newFullPath);