Error on binding patterns and improve error location

Author: Andy Hanson

Diff for: src/compiler/checker.ts

@@ -26067,11 +26067,9 @@ namespace ts {
             return grammarErrorOnNode(asyncModifier, Diagnostics._0_modifier_cannot_be_used_here, "async");
         }
 
-        function checkGrammarForDisallowedTrailingComma(list: NodeArray<Node>): boolean {
+        function checkGrammarForDisallowedTrailingComma(list: NodeArray<Node>, diag = Diagnostics.Trailing_comma_not_allowed): boolean {
             if (list && list.hasTrailingComma) {
-                const start = list.end - ",".length;
-                const end = list.end;
-                return grammarErrorAtPos(list[0], start, end - start, Diagnostics.Trailing_comma_not_allowed);
+                return grammarErrorAtPos(list[0], list.end - ",".length, ",".length, diag);
             }
         }
 
@@ -26093,9 +26091,7 @@ namespace ts {
                     if (i !== (parameterCount - 1)) {
                         return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_rest_parameter_must_be_last_in_a_parameter_list);
                     }
-                    if (parameters.hasTrailingComma) {
-                        return grammarErrorOnNode(parameter.dotDotDotToken, Diagnostics.A_rest_parameter_may_not_have_a_trailing_comma);
-                    }
+                    checkGrammarForDisallowedTrailingComma(parameters, Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
 
                     if (isBindingPattern(parameter.name)) {
                         return grammarErrorOnNode(parameter.name, Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
@@ -26709,6 +26705,7 @@ namespace ts {
                 if (node !== last(elements)) {
                     return grammarErrorOnNode(node, Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
+                checkGrammarForDisallowedTrailingComma(elements, Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
 
                 if (node.name.kind === SyntaxKind.ArrayBindingPattern || node.name.kind === SyntaxKind.ObjectBindingPattern) {
                     return grammarErrorOnNode(node.name, Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);

Diff for: src/compiler/diagnosticMessages.json

@@ -27,7 +27,7 @@
         "category": "Error",
         "code": 1012
     },
-    "A rest parameter may not have a trailing comma.": {
+    "A rest parameter or binding pattern may not have a trailing comma.": {
         "category": "Error",
         "code": 1013
     },

Diff for: tests/baselines/reference/trailingCommasInBindingPatterns.errors.txt

@@ -0,0 +1,12 @@
+tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts(1,12): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
+tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts(2,12): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
+
+
+==== tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts (2 errors) ====
+    const [...a,] = [];
+               ~
+!!! error TS1013: A rest parameter or binding pattern may not have a trailing comma.
+    const {...b,} = {};
+               ~
+!!! error TS1013: A rest parameter or binding pattern may not have a trailing comma.
+    

Diff for: tests/baselines/reference/trailingCommasInBindingPatterns.js

@@ -0,0 +1,17 @@
+//// [trailingCommasInBindingPatterns.ts]
+const [...a,] = [];
+const {...b,} = {};
+
+
+//// [trailingCommasInBindingPatterns.js]
+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) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var a = [].slice(0);
+var b = __rest({}, []);

Diff for: tests/baselines/reference/trailingCommasInBindingPatterns.symbols

@@ -0,0 +1,7 @@
+=== tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts ===
+const [...a,] = [];
+>a : Symbol(a, Decl(trailingCommasInBindingPatterns.ts, 0, 7))
+
+const {...b,} = {};
+>b : Symbol(b, Decl(trailingCommasInBindingPatterns.ts, 1, 7))
+

Diff for: tests/baselines/reference/trailingCommasInBindingPatterns.types

@@ -0,0 +1,9 @@
+=== tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts ===
+const [...a,] = [];
+>a : any[]
+>[] : undefined[]
+
+const {...b,} = {};
+>b : {}
+>{} : {}
+

Diff for: tests/baselines/reference/trailingCommasInFunctionParametersAndArguments.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/conformance/es7/trailingCommasInFunctionParametersAndArguments.ts(5,13): error TS1013: A rest parameter may not have a trailing comma.
+tests/cases/conformance/es7/trailingCommasInFunctionParametersAndArguments.ts(5,20): error TS1013: A rest parameter or binding pattern may not have a trailing comma.
 
 
 ==== tests/cases/conformance/es7/trailingCommasInFunctionParametersAndArguments.ts (1 errors) ====
@@ -7,8 +7,8 @@ tests/cases/conformance/es7/trailingCommasInFunctionParametersAndArguments.ts(5,
     f1(1,);
 
     function f2(...args,) {}
-                ~~~
-!!! error TS1013: A rest parameter may not have a trailing comma.
+                       ~
+!!! error TS1013: A rest parameter or binding pattern may not have a trailing comma.
 
     f2(...[],);
 

Diff for: tests/baselines/reference/unusedLocalsAndObjectSpread2.errors.txt

@@ -1,14 +1,14 @@
 tests/cases/compiler/unusedLocalsAndObjectSpread2.ts(5,6): error TS6133: 'rest' is declared but its value is never read.
 tests/cases/compiler/unusedLocalsAndObjectSpread2.ts(8,10): error TS6133: 'foo' is declared but its value is never read.
-tests/cases/compiler/unusedLocalsAndObjectSpread2.ts(12,8): error TS6133: 'rest' is declared but its value is never read.
+tests/cases/compiler/unusedLocalsAndObjectSpread2.ts(12,12): error TS6133: 'rest' is declared but its value is never read.
 
 
 ==== tests/cases/compiler/unusedLocalsAndObjectSpread2.ts (3 errors) ====
     declare let props: any;
     const {
         children, // here!
         active: _a, // here!
-      ...rest,
+      ...rest
          ~~~~
 !!! error TS6133: 'rest' is declared but its value is never read.
     } = props;
@@ -19,10 +19,10 @@ tests/cases/compiler/unusedLocalsAndObjectSpread2.ts(12,8): error TS6133: 'rest'
         const {
             children,
             active: _a,
-        ...rest,
-           ~~~~
+            ...rest
+               ~~~~
 !!! error TS6133: 'rest' is declared but its value is never read.
-      } = props;
+        } = props;
     }
 
     export const asdf = 123;

Diff for: tests/baselines/reference/unusedLocalsAndObjectSpread2.js

@@ -3,15 +3,15 @@ declare let props: any;
 const {
     children, // here!
     active: _a, // here!
-  ...rest,
+  ...rest
 } = props;
 
 function foo() {
     const {
         children,
         active: _a,
-    ...rest,
-  } = props;
+        ...rest
+    } = props;
 }
 
 export const asdf = 123;

Diff for: tests/baselines/reference/unusedLocalsAndObjectSpread2.symbols

@@ -9,7 +9,7 @@ const {
     active: _a, // here!
 >_a : Symbol(_a, Decl(unusedLocalsAndObjectSpread2.ts, 2, 13))
 
-  ...rest,
+  ...rest
 >rest : Symbol(rest, Decl(unusedLocalsAndObjectSpread2.ts, 3, 15))
 
 } = props;
@@ -25,10 +25,10 @@ function foo() {
         active: _a,
 >_a : Symbol(_a, Decl(unusedLocalsAndObjectSpread2.ts, 9, 17))
 
-    ...rest,
+        ...rest
 >rest : Symbol(rest, Decl(unusedLocalsAndObjectSpread2.ts, 10, 19))
 
-  } = props;
+    } = props;
 >props : Symbol(props, Decl(unusedLocalsAndObjectSpread2.ts, 0, 11))
 }
 

Diff for: tests/baselines/reference/unusedLocalsAndObjectSpread2.types

@@ -10,7 +10,7 @@ const {
 >active : any
 >_a : any
 
-  ...rest,
+  ...rest
 >rest : any
 
 } = props;
@@ -27,10 +27,10 @@ function foo() {
 >active : any
 >_a : any
 
-    ...rest,
+        ...rest
 >rest : any
 
-  } = props;
+    } = props;
 >props : any
 }
 

Diff for: tests/cases/compiler/unusedLocalsAndObjectSpread2.ts

@@ -4,15 +4,15 @@ declare let props: any;
 const {
     children, // here!
     active: _a, // here!
-  ...rest,
+  ...rest
 } = props;
 
 function foo() {
     const {
         children,
         active: _a,
-    ...rest,
-  } = props;
+        ...rest
+    } = props;
 }
 
 export const asdf = 123;

Diff for: tests/cases/conformance/es7/trailingCommasInBindingPatterns.ts

@@ -0,0 +1,2 @@
+const [...a,] = [];
+const {...b,} = {};