Merge pull request microsoft#2809 from Microsoft/noReservedWordsInBindingPatterns

Disallow reserved words for object binding pattern names

Author: DanielRosenwasser

src/compiler/checker.ts

@@ -6161,9 +6161,7 @@ module ts {
  }
  else {
  Debug.assert(memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment);
- type = memberDecl.name.kind === SyntaxKind.ComputedPropertyName
- ? unknownType
- : checkExpression(<Identifier>memberDecl.name, contextualMapper);
+ type = checkExpression((<ShorthandPropertyAssignment>memberDecl).name, contextualMapper);
  }
  typeFlags |= type.flags;
  let prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | member.flags, member.name);
@@ -8053,7 +8051,7 @@ module ts {
 
  function checkNumericLiteral(node: LiteralExpression): Type {
  // Grammar checking
- checkGrammarNumbericLiteral(node);
+ checkGrammarNumericLiteral(node);
  return numberType;
  }
 
@@ -12017,8 +12015,8 @@ module ts {
  }
 
  // GRAMMAR CHECKING
- function isReservedwordInStrictMode(node: Identifier): boolean {
- // Check that originalKeywordKind is less than LastFurtureReservedWord to see if an Identifier is a strict-mode reserved word
+ function isReservedWordInStrictMode(node: Identifier): boolean {
+ // Check that originalKeywordKind is less than LastFutureReservedWord to see if an Identifier is a strict-mode reserved word
  return (node.parserContextFlags & ParserContextFlags.StrictMode) &&
  (node.originalKeywordKind >= SyntaxKind.FirstFutureReservedWord && node.originalKeywordKind <= SyntaxKind.LastFutureReservedWord);
  }
@@ -12063,7 +12061,7 @@ module ts {
 
  function checkGrammarDeclarationNameInStrictMode(node: Declaration): boolean {
  let name = node.name;
- if (name && name.kind === SyntaxKind.Identifier && isReservedwordInStrictMode(<Identifier>name)) {
+ if (name && name.kind === SyntaxKind.Identifier && isReservedWordInStrictMode(<Identifier>name)) {
  let nameText = declarationNameToString(name);
  switch (node.kind) {
  case SyntaxKind.Parameter:
@@ -12139,7 +12137,7 @@ module ts {
 
  // The function takes an identifier itself or an expression which has SyntaxKind.Identifier.
  function checkGrammarIdentifierInStrictMode(node: Expression | Identifier, nameText?: string): boolean {
- if (node && node.kind === SyntaxKind.Identifier && isReservedwordInStrictMode(<Identifier>node)) {
+ if (node && node.kind === SyntaxKind.Identifier && isReservedWordInStrictMode(<Identifier>node)) {
  if (!nameText) {
  nameText = declarationNameToString(<Identifier>node);
  }
@@ -12154,7 +12152,7 @@ module ts {
 
  // The function takes an identifier when uses as a typeName in TypeReferenceNode
  function checkGrammarTypeNameInStrictMode(node: Identifier): boolean {
- if (node && node.kind === SyntaxKind.Identifier && isReservedwordInStrictMode(<Identifier>node)) {
+ if (node && node.kind === SyntaxKind.Identifier && isReservedWordInStrictMode(<Identifier>node)) {
  let nameText = declarationNameToString(<Identifier>node);
 
  // TODO (yuisu): Fix when module is a strict mode
@@ -12606,7 +12604,7 @@ module ts {
  // Grammar checking for computedPropertName and shorthandPropertyAssignment
  checkGrammarForInvalidQuestionMark(prop,(<PropertyAssignment>prop).questionToken, Diagnostics.An_object_member_cannot_be_declared_optional);
  if (name.kind === SyntaxKind.NumericLiteral) {
- checkGrammarNumbericLiteral(<Identifier>name);
+ checkGrammarNumericLiteral(<Identifier>name);
  }
  currentKind = Property;
  }
@@ -13158,7 +13156,7 @@ module ts {
  }
  }
 
- function checkGrammarNumbericLiteral(node: Identifier): boolean {
+ function checkGrammarNumericLiteral(node: Identifier): boolean {
  // Grammar checking
  if (node.flags & NodeFlags.OctalLiteral) {
  if (node.parserContextFlags & ParserContextFlags.StrictMode) {

src/compiler/parser.ts

@@ -3859,13 +3859,14 @@ module ts {
  function parseObjectBindingElement(): BindingElement {
  let node = <BindingElement>createNode(SyntaxKind.BindingElement);
  // TODO(andersh): Handle computed properties
- let id = parsePropertyName();
- if (id.kind === SyntaxKind.Identifier && token !== SyntaxKind.ColonToken) {
- node.name = <Identifier>id;
+ let tokenIsIdentifier = isIdentifier();
+ let propertyName = parsePropertyName();
+ if (tokenIsIdentifier && token !== SyntaxKind.ColonToken) {
+ node.name = <Identifier>propertyName;
  }
  else {
  parseExpected(SyntaxKind.ColonToken);
- node.propertyName = <Identifier>id;
+ node.propertyName = <Identifier>propertyName;
  node.name = parseIdentifierOrPattern();
  }
  node.initializer = parseInitializer(/*inParameter*/ false);

src/compiler/types.ts

@@ -389,7 +389,7 @@ module ts {
 
  export interface Identifier extends PrimaryExpression {
  text: string; // Text of identifier (with escapes converted to characters)
- originalKeywordKind?: SyntaxKind; // Original syntaxKind which get set so that we can report an error later
+ originalKeywordKind?: SyntaxKind;  // Original syntaxKind which get set so that we can report an error later
  }
 
  export interface QualifiedName extends Node {

tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.errors.txt

@@ -0,0 +1,8 @@
+tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers01.ts(2,13): error TS1005: ':' expected.
+
+
+==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers01.ts (1 errors) ====
+ 
+ var { while } = { while: 1 }
+ ~
+!!! error TS1005: ':' expected.

tests/baselines/reference/objectBindingPatternKeywordIdentifiers01.js

@@ -0,0 +1,6 @@
+//// [objectBindingPatternKeywordIdentifiers01.ts]
+
+var { while } = { while: 1 }
+
+//// [objectBindingPatternKeywordIdentifiers01.js]
+var = { while: 1 }.while;

tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.errors.txt

@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers02.ts(2,14): error TS1003: Identifier expected.
+tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers02.ts(2,20): error TS1005: ':' expected.
+
+
+==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers02.ts (2 errors) ====
+ 
+ var { while: while } = { while: 1 }
+ ~~~~~
+!!! error TS1003: Identifier expected.
+ ~
+!!! error TS1005: ':' expected.

tests/baselines/reference/objectBindingPatternKeywordIdentifiers02.js

@@ -0,0 +1,6 @@
+//// [objectBindingPatternKeywordIdentifiers02.ts]
+
+var { while: while } = { while: 1 }
+
+//// [objectBindingPatternKeywordIdentifiers02.js]
+var _a = { while: 1 }, = _a.while, = _a.while;

tests/baselines/reference/objectBindingPatternKeywordIdentifiers03.errors.txt

@@ -0,0 +1,8 @@
+tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers03.ts(2,15): error TS1005: ':' expected.
+
+
+==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers03.ts (1 errors) ====
+ 
+ var { "while" } = { while: 1 }
+ ~
+!!! error TS1005: ':' expected.

tests/baselines/reference/objectBindingPatternKeywordIdentifiers03.js

@@ -0,0 +1,6 @@
+//// [objectBindingPatternKeywordIdentifiers03.ts]
+
+var { "while" } = { while: 1 }
+
+//// [objectBindingPatternKeywordIdentifiers03.js]
+var = { while: 1 }["while"];

tests/baselines/reference/objectBindingPatternKeywordIdentifiers04.errors.txt

@@ -0,0 +1,11 @@
+tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers04.ts(2,16): error TS1003: Identifier expected.
+tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers04.ts(2,22): error TS1005: ':' expected.
+
+
+==== tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers04.ts (2 errors) ====
+ 
+ var { "while": while } = { while: 1 }
+ ~~~~~
+!!! error TS1003: Identifier expected.
+ ~
+!!! error TS1005: ':' expected.