DDC/AnalyzerCLI common cmdline option processing

pkg/analyzer/lib/src/command_line/arguments.dart

 // Copyright (c) 2016, 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.src.command_line.arguments;
 
 import 'dart:collection';
 
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/context/builder.dart';
@@ skipping 86 matching lines @@
   return new DartSdkManager(
       sdkPath ?? FolderBasedDartSdk.defaultSdkDirectory(resourceProvider),
       canUseSummaries);
 }
 
 /**
  * Add the standard flags and options to the given [parser]. The standard flags
  * are those that are typically used to control the way in which the code is
  * analyzed.
  */
-void defineAnalysisArguments(ArgParser parser, {bool hide: true}) {
-  defineDDCAnalysisArguments(parser, hide: hide);
+void defineAnalysisArguments(ArgParser parser, {bool hide: true, ddc: false}) {

[Brian Wilkerson, 2016/12/19 17:45:36]

'ddc' --> 'bool ddc'

I'm not fond of the client-specific argument. Hopefully we can remove it in the
future and/or replace it by something more semantically meaningful.

[danrubel, 2016/12/19 21:21:17]

Yes, this is temporary until I can normalize DDC options with Analyzer CLI.

Oops... the TODO comment in the defineDDCAnalysisArguments option should have
been moved here.
Done.

+  parser.addOption(defineVariableOption,
+      abbr: 'D',
+      allowMultiple: true,
+      help: 'Define environment variables. For example, "-Dfoo=bar" defines an '
+          'environment variable named "foo" whose value is "bar".');
+
+  parser.addOption(sdkPathOption, help: 'The path to the Dart SDK.');
+  parser.addOption(sdkSummaryPathOption,
+      help: 'The path to the Dart SDK summary file.', hide: hide);
 
   parser.addOption(analysisOptionsFileOption,
-      help: 'Path to an analysis options file.');
+      help: 'Path to an analysis options file.', hide: ddc);
+
+  parser.addOption(packageRootOption,
+      abbr: 'p',
+      help: 'The path to a package root directory (deprecated). '
+          'This option cannot be used with --packages.');
   parser.addOption(packagesOption,
       help: 'The path to the package resolution configuration file, which '
           'supplies a mapping of package names to paths. This option cannot be '
-          'used with --package-root.');
+          'used with --package-root.',
+      hide: ddc);
 
   parser.addFlag(strongModeFlag,
-      help: 'Enable strong static checks (https://goo.gl/DqcBsw)');
+      help: 'Enable strong static checks (https://goo.gl/DqcBsw)', hide: ddc);

[Brian Wilkerson, 2016/12/19 17:45:36]

I think this needs to include 'defaultsTo: ddc,'.

[danrubel, 2016/12/19 21:21:17]

Good point. Done.

   parser.addFlag(noImplicitCastsFlag,
       negatable: false,
-      help: 'Disable implicit casts in strong mode (https://goo.gl/cTLz40)');
+      help: 'Disable implicit casts in strong mode (https://goo.gl/cTLz40)',
+      hide: ddc);
   parser.addFlag(noImplicitDynamicFlag,
       negatable: false,
-      help: 'Disable implicit dynamic (https://goo.gl/m0UgXD)');
+      help: 'Disable implicit dynamic (https://goo.gl/m0UgXD)',
+      hide: ddc);
   //
   // Hidden flags and options.
   //
 //  parser.addFlag(enableNullAwareOperatorsFlag, // 'enable-null-aware-operators'
 //      help: 'Enable support for null-aware operators (DEP 9).',
 //      defaultsTo: false,
 //      negatable: false,
-//      hide: hide);
+//      hide: hide || ddc);
   parser.addFlag(enableStrictCallChecksFlag,
       help: 'Fix issue 21938.',
       defaultsTo: false,
       negatable: false,
-      hide: hide);
+      hide: hide || ddc);
   parser.addFlag(enableInitializingFormalAccessFlag,
       help:
           'Enable support for allowing access to field formal parameters in a '
           'constructor\'s initializer list',
       defaultsTo: false,
       negatable: false,
-      hide: hide);
+      hide: hide || ddc);
   parser.addFlag(enableSuperInMixinFlag,
       help: 'Relax restrictions on mixins (DEP 34).',
       defaultsTo: false,
       negatable: false,
-      hide: hide);
+      hide: hide || ddc);
 //  parser.addFlag('enable_type_checks',
 //      help: 'Check types in constant evaluation.',
 //      defaultsTo: false,
 //      negatable: false,
-//      hide: hide);
+//      hide: hide || ddc);
 }
 
 /**
- * Add the DDC analysis flags and options to the given [parser].
- *
- * TODO(danrubel) Update DDC to support all the options defined in
- * the [defineAnalysisOptions] method above, then have DDC call that method
- * and remove this method.
- */
-void defineDDCAnalysisArguments(ArgParser parser, {bool hide: true}) {
-  parser.addOption(defineVariableOption,
-      abbr: 'D',
-      allowMultiple: true,
-      help: 'Define environment variables. For example, "-Dfoo=bar" defines an '
-          'environment variable named "foo" whose value is "bar".');
-  parser.addOption(sdkPathOption, help: 'The path to the Dart SDK.');
-  parser.addOption(sdkSummaryPathOption,
-      help: 'The path to the Dart SDK summary file.', hide: hide);
-  parser.addOption(packageRootOption,
-      abbr: 'p',
-      help: 'The path to a package root directory (deprecated). '
-          'This option cannot be used with --packages.');
-}
-
-/**
  * Find arguments of the form -Dkey=value
  * or argument pairs of the form -Dkey value
  * and place those key/value pairs into [definedVariables].
  * Return a list of arguments with the key/value arguments removed.
  */
 List<String> extractDefinedVariables(
     List<String> args, Map<String, String> definedVariables) {
   //TODO(danrubel) extracting defined variables is already handled by the
   // createContextBuilderOptions method.
   // Long term we should switch to using that instead.
@@ skipping 104 matching lines @@
           .replaceAll('\r\n', '\n')
           .replaceAll('\r', '\n')
           .split('\n')
           .where((String line) => line.isNotEmpty));
     } on FileSystemException catch (e) {
       throw new Exception('Failed to read file specified by $lastArg : $e');
     }
   }
   return args;
 }