From 0a985ee28771c1aee386c7a2cb74c36ce8721e81 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Fri, 26 Aug 2016 13:25:19 -0700
Subject: [PATCH] Parse untyped object type members separated by ','

Previously if the first member was untyped and the separator was ',',
then parsing would fail.
---
 src/compiler/parser.ts                           |  1 +
 .../reference/parseObjectLiteralsWithoutTypes.js | 10 ++++++++++
 .../parseObjectLiteralsWithoutTypes.symbols      | 16 ++++++++++++++++
 .../parseObjectLiteralsWithoutTypes.types        | 16 ++++++++++++++++
 .../compiler/parseObjectLiteralsWithoutTypes.ts  |  3 +++
 5 files changed, 46 insertions(+)
 create mode 100644 tests/baselines/reference/parseObjectLiteralsWithoutTypes.js
 create mode 100644 tests/baselines/reference/parseObjectLiteralsWithoutTypes.symbols
 create mode 100644 tests/baselines/reference/parseObjectLiteralsWithoutTypes.types
 create mode 100644 tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index b5ba89887a2..b28f13e438f 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -2339,6 +2339,7 @@ namespace ts {
                     token() === SyntaxKind.LessThanToken ||
                     token() === SyntaxKind.QuestionToken ||
                     token() === SyntaxKind.ColonToken ||
+                    token() === SyntaxKind.CommaToken ||
                     canParseSemicolon();
             }
             return false;
diff --git a/tests/baselines/reference/parseObjectLiteralsWithoutTypes.js b/tests/baselines/reference/parseObjectLiteralsWithoutTypes.js
new file mode 100644
index 00000000000..4872cb8773b
--- /dev/null
+++ b/tests/baselines/reference/parseObjectLiteralsWithoutTypes.js
@@ -0,0 +1,10 @@
+//// [parseObjectLiteralsWithoutTypes.ts]
+let x: { foo, bar }
+let y: { foo: number, bar }
+let z: { foo, bar: number }
+
+
+//// [parseObjectLiteralsWithoutTypes.js]
+var x;
+var y;
+var z;
diff --git a/tests/baselines/reference/parseObjectLiteralsWithoutTypes.symbols b/tests/baselines/reference/parseObjectLiteralsWithoutTypes.symbols
new file mode 100644
index 00000000000..1e0bd775d10
--- /dev/null
+++ b/tests/baselines/reference/parseObjectLiteralsWithoutTypes.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts ===
+let x: { foo, bar }
+>x : Symbol(x, Decl(parseObjectLiteralsWithoutTypes.ts, 0, 3))
+>foo : Symbol(foo, Decl(parseObjectLiteralsWithoutTypes.ts, 0, 8))
+>bar : Symbol(bar, Decl(parseObjectLiteralsWithoutTypes.ts, 0, 13))
+
+let y: { foo: number, bar }
+>y : Symbol(y, Decl(parseObjectLiteralsWithoutTypes.ts, 1, 3))
+>foo : Symbol(foo, Decl(parseObjectLiteralsWithoutTypes.ts, 1, 8))
+>bar : Symbol(bar, Decl(parseObjectLiteralsWithoutTypes.ts, 1, 21))
+
+let z: { foo, bar: number }
+>z : Symbol(z, Decl(parseObjectLiteralsWithoutTypes.ts, 2, 3))
+>foo : Symbol(foo, Decl(parseObjectLiteralsWithoutTypes.ts, 2, 8))
+>bar : Symbol(bar, Decl(parseObjectLiteralsWithoutTypes.ts, 2, 13))
+
diff --git a/tests/baselines/reference/parseObjectLiteralsWithoutTypes.types b/tests/baselines/reference/parseObjectLiteralsWithoutTypes.types
new file mode 100644
index 00000000000..dcd9cb79d19
--- /dev/null
+++ b/tests/baselines/reference/parseObjectLiteralsWithoutTypes.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts ===
+let x: { foo, bar }
+>x : { foo: any; bar: any; }
+>foo : any
+>bar : any
+
+let y: { foo: number, bar }
+>y : { foo: number; bar: any; }
+>foo : number
+>bar : any
+
+let z: { foo, bar: number }
+>z : { foo: any; bar: number; }
+>foo : any
+>bar : number
+
diff --git a/tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts b/tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts
new file mode 100644
index 00000000000..7f00e4b15e7
--- /dev/null
+++ b/tests/cases/compiler/parseObjectLiteralsWithoutTypes.ts
@@ -0,0 +1,3 @@
+let x: { foo, bar }
+let y: { foo: number, bar }
+let z: { foo, bar: number }