From 24f4b041c7b743fa65f271dd3d48aa5734a2b5bf Mon Sep 17 00:00:00 2001
From: Ondrej Kraus <neverberlerfellerer@gmail.com>
Date: Sat, 28 Feb 2015 23:08:07 +0100
Subject: [PATCH] fix rest optimization in arrow functions and add advanced
 test

---
 .../transformers/es6/parameters.rest.js       |  8 +++----
 .../arrow-functions/actual.js                 | 15 ++++++++++++
 .../arrow-functions/expected.js               | 24 ++++++++++++++++---
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/babel/transformation/transformers/es6/parameters.rest.js b/src/babel/transformation/transformers/es6/parameters.rest.js
index ab4de1b324..15e765f9d0 100644
--- a/src/babel/transformation/transformers/es6/parameters.rest.js
+++ b/src/babel/transformation/transformers/es6/parameters.rest.js
@@ -28,7 +28,8 @@ var memberExpressionOptimisationVisitor = {
       // optimise it
       var prop = parent.property;
       if (isNumber(prop.value) || t.isUnaryExpression(prop) || t.isBinaryExpression(prop)) {
-        optimizeMemberExpression(node, parent, state.method.params.length);
+        this.node = state.argsId;
+        optimizeMemberExpression(parent, state.method.params.length);
         state.hasShorthand = true;
         return;
       }
@@ -38,16 +39,14 @@ var memberExpressionOptimisationVisitor = {
   }
 };
 
-function optimizeMemberExpression(node, parent, offset) {
+function optimizeMemberExpression(parent, offset) {
   var newExpr;
   var prop = parent.property;
 
   if (t.isLiteral(prop)) {
-    node.name = "arguments";
     prop.value += offset;
     prop.raw = String(prop.value);
   } else { // // UnaryExpression, BinaryExpression
-    node.name = "arguments";
     newExpr = t.binaryExpression("+", prop, t.literal(offset));
     parent.property = newExpr;
   }
@@ -86,6 +85,7 @@ exports.Function = function (node, parent, scope) {
     longForm:     false,
     method:       node,
     name:         rest.name,
+    argsId:       argsId
   };
 
   scope.traverse(node, memberExpressionOptimisationVisitor, state);
diff --git a/test/fixtures/transformation/es6-parameters.rest/arrow-functions/actual.js b/test/fixtures/transformation/es6-parameters.rest/arrow-functions/actual.js
index 854274b1e6..a01666d75d 100644
--- a/test/fixtures/transformation/es6-parameters.rest/arrow-functions/actual.js
+++ b/test/fixtures/transformation/es6-parameters.rest/arrow-functions/actual.js
@@ -2,3 +2,18 @@ var concat = (...arrs) => {
     var x = arrs[0];
     var y = arrs[1];
 };
+
+var somefun = function () {
+    let get2ndArg = (a, b, ...args1) => {
+        var _b = args1[0];
+        let somef = (x, y, z, ...args2) => {
+            var _a = args2[0];
+        };
+        let somefg = (c, d, e, f, ...args3) => {
+            var _a = args3[0];
+        };
+        var _c = arguments[1];
+        var _d = args1[1];
+    };
+    let get1stArg = (...args) => args[0];
+}
diff --git a/test/fixtures/transformation/es6-parameters.rest/arrow-functions/expected.js b/test/fixtures/transformation/es6-parameters.rest/arrow-functions/expected.js
index 96e011a7fc..44f86ca4c9 100644
--- a/test/fixtures/transformation/es6-parameters.rest/arrow-functions/expected.js
+++ b/test/fixtures/transformation/es6-parameters.rest/arrow-functions/expected.js
@@ -1,8 +1,26 @@
 "use strict";
 
-var _arguments = arguments;
 var concat = function () {
-    var x = _arguments[0];
-    var y = _arguments[1];
+    var x = arguments[0];
+    var y = arguments[1];
+};
+
+var somefun = function somefun() {
+    var _arguments = arguments;
+
+    var get2ndArg = function (a, b) {
+        var _b = arguments[2];
+        var somef = function (x, y, z) {
+            var _a = arguments[3];
+        };
+        var somefg = function (c, d, e, f) {
+            var _a = arguments[4];
+        };
+        var _c = _arguments[1];
+        var _d = arguments[3];
+    };
+    var get1stArg = function () {
+        return arguments[0];
+    };
 };