Fix ambigious dartdoc version value when unspecified.

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.22.1
+
+- Fix: unspecified `--dartdoc-version` will use the latest version in an isolated
+  environment. To use the SDK's `dartdoc`, set the value to `sdk`.
+
 ## 0.22.0
 
 - `ToolEnvironment`:

README.md

@@ -40,5 +40,5 @@ Options:
       --hosted                 Download and analyze a hosted package (from https://pub.dev).
       --[no-]dartdoc           Run dartdoc and score the package on documentation coverage.
                                (defaults to on)
-      --dartdoc-version        The dartdoc version to use (otherwise the latest stable).
+      --dartdoc-version        The dartdoc version to use: `sdk`, `latest` (default) or `<version constraint>`.
 ```

bin/pana.dart

@@ -72,7 +72,8 @@ final _parser = ArgParser()
   )
   ..addOption(
     'dartdoc-version',
-    help: 'The dartdoc version to use (otherwise the latest stable).',
+    help:
+        'The dartdoc version to use: `sdk`, `latest` (default) or `<version constraint>`.',
   )
   ..addOption(
     'resources-output',

lib/src/sdk_env.dart

@@ -453,9 +453,16 @@ class ToolEnvironment {
       if (sdkDir != null) ...['--sdk-dir', sdkDir],
     ];
 
-    PanaProcessResult pr;
-
-    if (_dartdocVersion != null) {
+    if (_dartdocVersion == 'sdk') {
+      final command =
+          usesFlutter ? _flutterSdk._dartSdk.dartCmd : _dartSdk.dartCmd;
+      return await runConstrained(
+        [...command, 'doc', ...args],
+        workingDirectory: packageDir,
+        environment: _dartSdk.environment,
+        timeout: timeout,
+      );
+    } else {
       if (!_globalDartdocActivated) {
         await runConstrained(
           [
@@ -464,7 +471,7 @@ class ToolEnvironment {
             'global',
             'activate',
             'dartdoc',
-            _dartdocVersion!,
+            if (_dartdocVersion != null) _dartdocVersion!,
           ],
           environment: {
             ..._dartSdk.environment,
@@ -475,24 +482,14 @@ class ToolEnvironment {
         _globalDartdocActivated = true;
       }
       final command = usesFlutter ? _flutterSdk.flutterCmd : _dartSdk.dartCmd;
-      pr = await runConstrained(
+      return await runConstrained(
         [...command, 'pub', 'global', 'run', 'dartdoc', ...args],
         workingDirectory: packageDir,
         environment:
             usesFlutter ? _flutterSdk.environment : _dartSdk.environment,
         timeout: timeout,
       );
-    } else {
-      final command =
-          usesFlutter ? _flutterSdk._dartSdk.dartCmd : _dartSdk.dartCmd;
-      pr = await runConstrained(
-        [...command, 'doc', ...args],
-        workingDirectory: packageDir,
-        environment: _dartSdk.environment,
-        timeout: timeout,
-      );
     }
-    return pr;
   }
 
   /// Removes the `dev_dependencies` from the `pubspec.yaml`,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: pana
 description: PAckage aNAlyzer - produce a report summarizing the health and quality of a Dart package.
-version: 0.22.0
+version: 0.22.1
 repository: https://github.com/dart-lang/pana
 topics:
   - tool

test/goldens/help.txt

@@ -12,4 +12,4 @@ Options:
       --hosted                 Download and analyze a hosted package (from https://pub.dev).
       --[no-]dartdoc           Run dartdoc and score the package on documentation coverage.
                                (defaults to on)
-      --dartdoc-version        The dartdoc version to use (otherwise the latest stable).
+      --dartdoc-version        The dartdoc version to use: `sdk`, `latest` (default) or `<version constraint>`.