From 71f3157a35cacd404371d6020929a1299d959f15 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 4 Nov 2016 09:03:03 -0700
Subject: [PATCH] Address PR comments

1. Remove extra line in __rest shim.
2. Improve __rest vs __assign check for destructuring assignment.
---
 src/compiler/binder.ts  | 12 ++++++++++--
 src/compiler/emitter.ts |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index a4d9a5a30ed..7aa27e520d3 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -1935,10 +1935,18 @@ namespace ts {
                 case SyntaxKind.SpreadElementExpression:
                 case SyntaxKind.JsxSpreadAttribute:
                     let root = container;
-                    while (root && root.kind !== SyntaxKind.BinaryExpression) {
+                    let hasRest = false;
+                    while (root.parent) {
+                        if (root.kind === SyntaxKind.ObjectLiteralExpression &&
+                            root.parent.kind === SyntaxKind.BinaryExpression &&
+                            (root.parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
+                            (root.parent as BinaryExpression).left === root) {
+                            hasRest = true;
+                            break;
+                        }
                         root = root.parent;
                     }
-                    emitFlags |= root && isDestructuringAssignment(root) ? NodeFlags.HasRestAttribute : NodeFlags.HasSpreadAttribute;
+                    emitFlags |= hasRest ? NodeFlags.HasRestAttribute : NodeFlags.HasSpreadAttribute;
                     return;
 
                 case SyntaxKind.CallSignature:
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index c89fa1f1550..9885ea9c791 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -45,7 +45,6 @@ var __assign = (this && this.__assign) || Object.assign || function(t) {
         const restHelper = `
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
-
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && !e.indexOf(p))
         t[p] = s[p];
     return t;