From a087fc7c43b68301165e99147977d3599b9ac441 Mon Sep 17 00:00:00 2001
From: Olivier Chafik <ochafik@google.com>
Date: Fri, 11 Dec 2015 17:23:58 +0000
Subject: [PATCH] Allow disabling named param destructuring with
 --destructure-named-params (issue #396)

Right now one also needs to regenerate the runtime (see #397):
./tools/build_sdk --no-destructure-named-params
---
 lib/src/codegen/js_codegen.dart | 3 ++-
 lib/src/options.dart            | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/src/codegen/js_codegen.dart b/lib/src/codegen/js_codegen.dart
index 42766cb4..85a64ebe 100644
--- a/lib/src/codegen/js_codegen.dart
+++ b/lib/src/codegen/js_codegen.dart
@@ -1990,7 +1990,8 @@ class JSCodegenVisitor extends GeneralizingAstVisitor with ClosureAnnotator {
   /// We cannot destructure named params that clash with JS reserved names:
   /// see discussion in https://github.com/dart-lang/dev_compiler/issues/392.
   bool _isDestructurableNamedParam(FormalParameter param) =>
-      _isNamedParam(param) && !invalidVariableName(param.identifier.name);
+      _isNamedParam(param) && !invalidVariableName(param.identifier.name) &&
+      options.destructureNamedParams;
 
   @override
   List<JS.Parameter> visitFormalParameterList(FormalParameterList node) =>
diff --git a/lib/src/options.dart b/lib/src/options.dart
index 3162439b..0e0817b4 100644
--- a/lib/src/options.dart
+++ b/lib/src/options.dart
@@ -15,6 +15,7 @@ import 'package:yaml/yaml.dart';
 
 const String _V8_BINARY_DEFAULT = 'node';
 const bool _CLOSURE_DEFAULT = false;
+const bool _DESTRUCTURE_NAMED_PARAMS_DEFAULT = true;
 
 /// Options used to set up Source URI resolution in the analysis context.
 class SourceResolverOptions {
@@ -69,6 +70,9 @@ class CodegenOptions {
   /// Emit Closure Compiler-friendly code.
   final bool closure;
 
+  /// Enable ES6 destructuring of named parameters.
+  final bool destructureNamedParams;
+
   /// Whether to emit a workaround for missing arrow function bind-this in
   /// other V8 builds
   final bool arrowFnBindThisWorkaround;
@@ -81,6 +85,7 @@ class CodegenOptions {
       {this.emitSourceMaps: true,
       this.forceCompile: false,
       this.closure: _CLOSURE_DEFAULT,
+      this.destructureNamedParams: _DESTRUCTURE_NAMED_PARAMS_DEFAULT,
       this.outputDir,
       this.arrowFnBindThisWorkaround: false,
       this.moduleFormat: 'dart'});
@@ -231,6 +236,7 @@ CompilerOptions parseOptions(List<String> argv, {bool forceOutDir: false}) {
           emitSourceMaps: args['source-maps'],
           forceCompile: args['force-compile'] || serverMode,
           closure: args['closure'],
+          destructureNamedParams: args['destructure-named-params'],
           outputDir: outputDir,
           arrowFnBindThisWorkaround: args['arrow-fn-bind-this'],
           moduleFormat: args['modules']),
@@ -327,6 +333,9 @@ final ArgParser argParser = new ArgParser()
   ..addFlag('closure',
       help: 'Emit Closure Compiler-friendly code (experimental)',
       defaultsTo: _CLOSURE_DEFAULT)
+  ..addFlag('destructure-named-params',
+      help: 'Destructure named parameters (requires ES6-enabled runtime)',
+      defaultsTo: _DESTRUCTURE_NAMED_PARAMS_DEFAULT)
   ..addFlag('force-compile',
       abbr: 'f', help: 'Compile code with static errors', defaultsTo: false)
   ..addOption('log', abbr: 'l', help: 'Logging level (defaults to warning)')