[analyzer] rename the dartfix --include <fix> option to dartfix --fix <fix>

devoncarew · commit-bot@chromium.org · commit 91eb2f5fd0da · 2019-07-22T16:35:18.000Z
Change-Id: Ibd5d8c45912a292e1a787e88ddb06e730ebda0a9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109548 Reviewed-by: Dan Rubel <danrubel@google.com> Commit-Queue: Devon Carew <devoncarew@google.com>
diff --git a/pkg/dartfix/lib/src/options.dart b/pkg/dartfix/lib/src/options.dart
@@ -9,12 +9,12 @@ import 'package:cli_util/cli_logging.dart';
 import 'package:dartfix/src/context.dart';
 import 'package:path/path.dart' as path;
 
-const excludeOption = 'exclude';
-
 const forceOption = 'force';
-const includeOption = 'include';
+const includeOption = 'fix';
+const excludeOption = 'exclude';
 const overwriteOption = 'overwrite';
 const requiredOption = 'required';
+
 const _binaryName = 'dartfix';
 const _colorOption = 'color';
 const _serverSnapshot = 'server';
@@ -44,10 +44,8 @@ class Options {
 
   Options._fromArgs(this.context, ArgResults results)
       : force = results[forceOption] as bool,
-        includeFixes =
-            (results[includeOption] as List ?? []).cast<String>().toList(),
-        excludeFixes =
-            (results[excludeOption] as List ?? []).cast<String>().toList(),
+        includeFixes = (results[includeOption] as List ?? []).cast<String>(),
+        excludeFixes = (results[excludeOption] as List ?? []).cast<String>(),
         overwrite = results[overwriteOption] as bool,
         requiredFixes = results[requiredOption] as bool,
         sdkPath = _getSdkPath(),
@@ -57,7 +55,9 @@ class Options {
         useColor = results.wasParsed(_colorOption)
             ? results[_colorOption] as bool
             : null,
-        verbose = results[_verboseOption] as bool;
+        verbose = results[_verboseOption] as bool {
+    includeFixes.addAll((results['include'] as List ?? []).cast<String>());
+  }
 
   String makeAbsoluteAndNormalize(String target) {
     if (!path.isAbsolute(target)) {
@@ -70,7 +70,10 @@ class Options {
     final parser = ArgParser(allowTrailingOptions: true)
       ..addSeparator('Choosing fixes to be applied:')
       ..addMultiOption(includeOption,
-          abbr: 'i', help: 'Include a specific fix.', valueHelp: 'name-of-fix')
+          help: 'Include a specific fix.', valueHelp: 'name-of-fix')
+      // 'include' is an alias for 'fix' (above)
+      ..addMultiOption('include',
+          help: 'Include a specific fix.', valueHelp: 'name-of-fix', hide: true)
       ..addMultiOption(excludeOption,
           abbr: 'x', help: 'Exclude a specific fix.', valueHelp: 'name-of-fix')
       ..addFlag(requiredOption,
diff --git a/pkg/dartfix/test/src/driver_include_test.dart b/pkg/dartfix/test/src/driver_include_test.dart
@@ -24,7 +24,7 @@ main() {
     final testLogger = TestLogger();
     String exampleSource = await exampleFile.readAsString();
 
-    await driver.start(['-iuse-mixin', exampleDir.path],
+    await driver.start(['--fix', 'use-mixin', exampleDir.path],
         testContext: testContext, testLogger: testLogger);
     if (_debug) {
       print(testLogger.stderrBuffer.toString());
