microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 20:25:23 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Address PR comments

Browse Source 
1. Remove extra line in __rest shim.
2. Improve __rest vs __assign check for destructuring assignment.
This commit is contained in:
Nathan Shively-Sanders 2016-11-04 09:03:03 -07:00
parent c9c5f49a24
commit 71f3157a35
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/binder.ts
View File

@ -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:

1
src/compiler/emitter.ts
View File

@ -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;