move extractDefinedVariables from analyzer cli to 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 473 matching lines @@
           help: 'Disable implicit casts in strong mode (https://goo.gl/cTLz40)')
       ..addFlag('no-implicit-dynamic',
           negatable: false,
           help: 'Disable implicit dynamic (https://goo.gl/m0UgXD)');
 
     try {
       // TODO(scheglov) https://code.google.com/p/dart/issues/detail?id=11061
       args =
           args.map((String arg) => arg == '-batch' ? '--batch' : arg).toList();
       Map<String, String> definedVariables = <String, String>{};
-      var results = parser.parse(args, definedVariables);
+      args = extractDefinedVariables(args, definedVariables);
+      var results = parser.parse(args);
 
       // Persistent worker.
       if (args.contains('--persistent_worker')) {
         bool validArgs;
         if (!args.contains('--build-mode')) {
           validArgs = false;
         } else if (args.length == 2) {
           validArgs = true;
         } else if (args.length == 4 && args.contains('--dart-sdk')) {
           validArgs = true;
@@ skipping 121 matching lines @@
         allowMultiple: allowMultiple,
         splitCommas: splitCommas,
         hide: hide);
   }
 
   /// Generates a string displaying usage information for the defined options.
   /// See [ArgParser.usage].
   String getUsage() => _parser.usage;
 
   /// Parses [args], a list of command-line arguments, matches them against the
-  /// flags and options defined by this parser, and returns the result. The
-  /// values of any defined variables are captured in the given map.
+  /// flags and options defined by this parser, and returns the result.
   /// See [ArgParser].
-  ArgResults parse(List<String> args, Map<String, String> definedVariables) =>
-      _parser.parse(
-          _filterUnknowns(parseDefinedVariables(args, definedVariables)));
-
-  List<String> parseDefinedVariables(
-      List<String> args, Map<String, String> definedVariables) {
-    int count = args.length;
-    List<String> remainingArgs = <String>[];
-    for (int i = 0; i < count; i++) {
-      String arg = args[i];
-      if (arg == '--') {
-        while (i < count) {
-          remainingArgs.add(args[i++]);
-        }
-      } else if (arg.startsWith("-D")) {
-        definedVariables[arg.substring(2)] = args[++i];
-      } else {
-        remainingArgs.add(arg);
-      }
-    }
-    return remainingArgs;
-  }
+  ArgResults parse(List<String> args) => _parser.parse(_filterUnknowns(args));
 
   List<String> _filterUnknowns(List<String> args) {
     // Only filter args if the ignore flag is specified, or if
     // _alwaysIgnoreUnrecognized was set to true.
     if (_alwaysIgnoreUnrecognized ||
         args.contains('--ignore-unrecognized-flags')) {
       //TODO(pquitslund): replace w/ the following once library skew issues are
       // sorted out
       //return args.where((arg) => !arg.startsWith('--') ||
       //  _knownFlags.contains(arg.substring(2)));
@@ skipping 29 matching lines @@
 
   int _getNextFlagIndex(args, i) {
     for (; i < args.length; ++i) {
       if (args[i].startsWith('--')) {
         return i;
       }
     }
     return i;
   }
 }