Error on non-identifier rest in destructuring assignment

sandersn · sandersn · commit 9b2b2ca19b4b · 2016-11-11T08:56:35.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13941,7 +13941,12 @@ namespace ts {
                     error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), declarationNameToString(name));
                 }
             }
-            else if (property.kind !== SyntaxKind.SpreadAssignment) {
+            else if (property.kind === SyntaxKind.SpreadAssignment) {
+                if (property.expression.kind !== SyntaxKind.Identifier) {
+                    error(property.expression, Diagnostics.An_object_rest_element_must_be_an_identifier);
+                }
+            }
+            else {
                 error(property, Diagnostics.Property_assignment_expected);
             }
         }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -1991,6 +1991,10 @@
         "category": "Error",
         "code": 2700
     },
+    "An object rest element must be an identifier.": {
+        "category": "Error",
+        "code": 2701
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
@@ -328,8 +328,9 @@ namespace ts {
                         bindingElements.push(p);
                     }
                 }
-                else if (i === properties.length - 1 && p.kind === SyntaxKind.SpreadAssignment) {
-                    Debug.assert((p as SpreadAssignment).expression.kind === SyntaxKind.Identifier);
+                else if (i === properties.length - 1 &&
+                         p.kind === SyntaxKind.SpreadAssignment &&
+                         p.expression.kind === SyntaxKind.Identifier) {
                     if (bindingElements.length) {
                         emitRestAssignment(bindingElements, value, location, target);
                         bindingElements = [];

Original file line number	Diff line number	Diff line change
`@@ -13941,7 +13941,12 @@ namespace ts {`
`13941`	`13941`	`error(name, Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), declarationNameToString(name));`
`13942`	`13942`	`}`
`13943`	`13943`	`}`
`13944`		`- else if (property.kind !== SyntaxKind.SpreadAssignment) {`
	`13944`	`+ else if (property.kind === SyntaxKind.SpreadAssignment) {`
	`13945`	`+ if (property.expression.kind !== SyntaxKind.Identifier) {`
	`13946`	`+ error(property.expression, Diagnostics.An_object_rest_element_must_be_an_identifier);`
	`13947`	`+ }`
	`13948`	`+ }`
	`13949`	`+ else {`
`13945`	`13950`	`error(property, Diagnostics.Property_assignment_expected);`
`13946`	`13951`	`}`
`13947`	`13952`	`}`
Original file line number	Diff line number	Diff line change
`@@ -328,8 +328,9 @@ namespace ts {`
`328`	`328`	`bindingElements.push(p);`
`329`	`329`	`}`
`330`	`330`	`}`
`331`		`- else if (i === properties.length - 1 && p.kind === SyntaxKind.SpreadAssignment) {`
`332`		`- Debug.assert((p as SpreadAssignment).expression.kind === SyntaxKind.Identifier);`
	`331`	`+ else if (i === properties.length - 1 &&`
	`332`	`+ p.kind === SyntaxKind.SpreadAssignment &&`
	`333`	`+ p.expression.kind === SyntaxKind.Identifier) {`
`333`	`334`	`if (bindingElements.length) {`
`334`	`335`	`emitRestAssignment(bindingElements, value, location, target);`
`335`	`336`	`bindingElements = [];`