Options cleanup for the command-line analyzer.

pkg/analyzer_cli/lib/src/options.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer_cli.src.options;
 
 import 'dart:io';
 
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/command_line/arguments.dart';
@@ skipping 275 matching lines @@
 
   static CommandLineOptions _parse(List<String> args) {
     args = preprocessArgs(PhysicalResourceProvider.INSTANCE, args);
 
     bool verbose = args.contains('-v') || args.contains('--verbose');
     bool hide = !verbose;
 
     var parser = new ArgParser(allowTrailingOptions: true);
     defineAnalysisArguments(parser, hide: hide);
     parser
-      ..addFlag('batch',
-          abbr: 'b',
-          help: 'Read commands from standard input (for testing).',
-          defaultsTo: false,
-          negatable: false)
       ..addOption('format',
-          help: 'Specifies the format in which errors are displayed.')
-      ..addFlag('machine',
-          help: 'Print errors in a format suitable for parsing (deprecated).',
-          defaultsTo: false,
-          negatable: false)
+          help:
+              'Specifies the format in which errors are displayed. The only currently allowed value is \'machine\'.')
       ..addFlag('version',
           help: 'Print the analyzer version.',
           defaultsTo: false,
           negatable: false)
       ..addFlag('lints',
           help: 'Show lint results.', defaultsTo: false, negatable: false)
       ..addFlag('no-hints',
           help: 'Do not show hint results.',
           defaultsTo: false,
           negatable: false)
-      ..addFlag('disable-cache-flushing', defaultsTo: false, hide: true)
       ..addFlag(ignoreUnrecognizedFlagsFlag,
           help: 'Ignore unrecognized command line flags.',
           defaultsTo: false,
           negatable: false)
       ..addFlag('fatal-hints',
           help: 'Treat hints as fatal.', defaultsTo: false, negatable: false)
       ..addFlag('fatal-warnings',
           help: 'Treat non-type warnings as fatal.',
           defaultsTo: false,
           negatable: false)
       ..addFlag('fatal-lints',
           help: 'Treat lints as fatal.', defaultsTo: false, negatable: false)
       ..addFlag('package-warnings',
           help: 'Show warnings from package: imports.',
           defaultsTo: false,
           negatable: false)
       ..addFlag('show-package-warnings',
           help: 'Show warnings from package: imports (deprecated).',
           defaultsTo: false,
           negatable: false)
       ..addFlag('warnings',
           help: 'Show warnings from SDK imports.',
           defaultsTo: false,
           negatable: false)
       ..addFlag('show-sdk-warnings',
           help: 'Show warnings from SDK imports (deprecated).',
           defaultsTo: false,
           negatable: false)
-      ..addOption('x-package-warnings-prefix',
-          help:
-              'Show warnings from package: imports that match the given prefix',
-          hide: true)
-      ..addOption('x-perf-report',
-          help: 'Writes a performance report to the given file (experimental).')
       ..addFlag('help',
           abbr: 'h',
-          help: 'Display this help message.\n'
-              'Add --verbose to show hidden options.',
+          help:
+              'Display this help message. Add --verbose to show hidden options.',
           defaultsTo: false,
           negatable: false)
       ..addFlag('verbose',
-          abbr: 'v', defaultsTo: false, help: 'Verbose output.')
+          abbr: 'v',
+          defaultsTo: false,
+          help: 'Verbose output.',
+          negatable: false)
       ..addOption('url-mapping',
           help: '--url-mapping=libraryUri,/path/to/library.dart directs the '
               'analyzer to use "library.dart" as the source for an import '
               'of "libraryUri".',
           allowMultiple: true,
           splitCommas: false)
+
       //
       // Build mode.
       //
       ..addFlag('persistent_worker',
           help: 'Enable Bazel persistent worker mode.',
           defaultsTo: false,
           negatable: false,
           hide: hide)
       ..addOption('build-analysis-output',
           help:
@@ skipping 37 matching lines @@
           help: 'Exclude @informative information (docs, offsets, etc).  '
               'Deprecated: please use --build-summary-output-semantic instead.',
           defaultsTo: false,
           negatable: false,
           hide: hide)
       ..addFlag('build-suppress-exit-code',
           help: 'Exit with code 0 even if errors are found.',
           defaultsTo: false,
           negatable: false,
           hide: hide)
+
       //
       // Hidden flags.
       //
-      ..addFlag('enable-async',
-          help: 'Enable support for the proposed async feature.',
+      ..addFlag('machine',
+          help: 'Print errors in a format suitable for parsing (deprecated).',
           defaultsTo: false,
           negatable: false,
           hide: hide)
-      ..addFlag('enable-enum',
-          help: 'Enable support for the proposed enum feature.',
+      ..addFlag('batch',
+          help: 'Read commands from standard input (for testing).',
           defaultsTo: false,
           negatable: false,
           hide: hide)
+      ..addFlag('disable-cache-flushing', defaultsTo: false, hide: hide)
+      ..addOption('x-perf-report',
+          help: 'Writes a performance report to the given file (experimental).',
+          hide: hide)
+      ..addOption('x-package-warnings-prefix',
+          help:
+              'Show warnings from package: imports that match the given prefix',
+          hide: hide)
       ..addFlag('enable-conditional-directives',
           help:
               'deprecated -- Enable support for conditional directives (DEP 40).',
           defaultsTo: false,
           negatable: false,
           hide: hide)
       ..addFlag('enable-null-aware-operators',
           help: 'Enable support for null-aware operators (DEP 9).',
           defaultsTo: false,
           negatable: false,
@@ skipping 13 matching lines @@
           defaultsTo: false,
           negatable: false,
           hide: hide)
       ..addFlag('use-analysis-driver-memory-byte-store',
           help: 'Use memory byte store, not the file system cache.',
           defaultsTo: false,
           negatable: false,
           hide: hide);
 
     try {
-      // TODO(scheglov) https://code.google.com/p/dart/issues/detail?id=11061
-      args =
-          args.map((String arg) => arg == '-batch' ? '--batch' : arg).toList();
       if (args.contains('--$ignoreUnrecognizedFlagsFlag')) {
         args = filterUnknownArguments(args, parser);
       }
       var results = parser.parse(args);
 
       // Persistent worker.
       if (args.contains('--persistent_worker')) {
         bool validArgs;
         if (!args.contains('--build-mode')) {
           validArgs = false;
@@ skipping 57 matching lines @@
 
   static _showUsage(parser) {
     errorSink
         .writeln('Usage: $_binaryName [options...] <libraries to analyze...>');
     errorSink.writeln(parser.getUsage());
     errorSink.writeln('');
     errorSink.writeln(
         'For more information, see http://www.dartlang.org/tools/analyzer.');
   }
 }