diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index c71967b2eaffe..5d7062f84b051 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -15,7 +15,7 @@
         "category": "Error",
         "code": 1006
     },
-    "The parser expected to find a '}' to match the '{' token here.": {
+    "The parser expected to find a '{1}' to match the '{0}' token here.": {
         "category": "Error",
         "code": 1007
     },
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index ed68dc053c240..80bea252a5e07 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -1341,24 +1341,27 @@ namespace ts {
             return inContext(NodeFlags.AwaitContext);
         }
 
-        function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): void {
-            parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
+        function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): DiagnosticWithDetachedLocation | undefined {
+            return parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
         }
 
-        function parseErrorAtPosition(start: number, length: number, message: DiagnosticMessage, arg0?: any): void {
+        function parseErrorAtPosition(start: number, length: number, message: DiagnosticMessage, arg0?: any): DiagnosticWithDetachedLocation | undefined {
             // Don't report another error if it would just be at the same position as the last error.
             const lastError = lastOrUndefined(parseDiagnostics);
+            let result: DiagnosticWithDetachedLocation | undefined;
             if (!lastError || start !== lastError.start) {
-                parseDiagnostics.push(createDetachedDiagnostic(fileName, start, length, message, arg0));
+                result = createDetachedDiagnostic(fileName, start, length, message, arg0);
+                parseDiagnostics.push(result);
             }
 
             // Mark that we've encountered an error.  We'll set an appropriate bit on the next
             // node we finish so that it can't be reused incrementally.
             parseErrorBeforeNextFinishedNode = true;
+            return result;
         }
 
-        function parseErrorAt(start: number, end: number, message: DiagnosticMessage, arg0?: any): void {
-            parseErrorAtPosition(start, end - start, message, arg0);
+        function parseErrorAt(start: number, end: number, message: DiagnosticMessage, arg0?: any): DiagnosticWithDetachedLocation | undefined {
+            return parseErrorAtPosition(start, end - start, message, arg0);
         }
 
         function parseErrorAtRange(range: TextRange, message: DiagnosticMessage, arg0?: any): void {
@@ -1552,6 +1555,20 @@ namespace ts {
             return false;
         }
 
+        function parseExpectedMatchingBrackets(openKind: SyntaxKind, closeKind: SyntaxKind, openPosition: number) {
+            if (token() === closeKind) {
+                nextToken();
+                return;
+            }
+            const lastError = parseErrorAtCurrentToken(Diagnostics._0_expected, tokenToString(closeKind));
+            if (lastError) {
+                addRelatedInfo(
+                    lastError,
+                    createDetachedDiagnostic(fileName, openPosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, tokenToString(openKind), tokenToString(closeKind))
+                );
+            }
+        }
+
         function parseOptional(t: SyntaxKind): boolean {
             if (token() === t) {
                 nextToken();
@@ -5481,10 +5498,11 @@ namespace ts {
 
         function parseArrayLiteralExpression(): ArrayLiteralExpression {
             const pos = getNodePos();
+            const openBracketPosition = scanner.getTokenPos();
             parseExpected(SyntaxKind.OpenBracketToken);
             const multiLine = scanner.hasPrecedingLineBreak();
             const elements = parseDelimitedList(ParsingContext.ArrayLiteralMembers, parseArgumentOrArrayLiteralElement);
-            parseExpected(SyntaxKind.CloseBracketToken);
+            parseExpectedMatchingBrackets(SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken, openBracketPosition);
             return finishNode(factory.createArrayLiteralExpression(elements, multiLine), pos);
         }
 
@@ -5553,15 +5571,7 @@ namespace ts {
             parseExpected(SyntaxKind.OpenBraceToken);
             const multiLine = scanner.hasPrecedingLineBreak();
             const properties = parseDelimitedList(ParsingContext.ObjectLiteralMembers, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true);
-            if (!parseExpected(SyntaxKind.CloseBraceToken)) {
-                const lastError = lastOrUndefined(parseDiagnostics);
-                if (lastError && lastError.code === Diagnostics._0_expected.code) {
-                    addRelatedInfo(
-                        lastError,
-                        createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here)
-                    );
-                }
-            }
+            parseExpectedMatchingBrackets(SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken, openBracePosition);
             return finishNode(factory.createObjectLiteralExpression(properties, multiLine), pos);
         }
 
@@ -5647,15 +5657,7 @@ namespace ts {
             if (parseExpected(SyntaxKind.OpenBraceToken, diagnosticMessage) || ignoreMissingOpenBrace) {
                 const multiLine = scanner.hasPrecedingLineBreak();
                 const statements = parseList(ParsingContext.BlockStatements, parseStatement);
-                if (!parseExpected(SyntaxKind.CloseBraceToken)) {
-                    const lastError = lastOrUndefined(parseDiagnostics);
-                    if (lastError && lastError.code === Diagnostics._0_expected.code) {
-                        addRelatedInfo(
-                            lastError,
-                            createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here)
-                        );
-                    }
-                }
+                parseExpectedMatchingBrackets(SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken, openBracePosition);
                 const result = withJSDoc(finishNode(factory.createBlock(statements, multiLine), pos), hasJSDoc);
                 if (token() === SyntaxKind.EqualsToken) {
                     parseErrorAtCurrentToken(Diagnostics.Declaration_or_statement_expected_This_follows_a_block_of_statements_so_if_you_intended_to_write_a_destructuring_assignment_you_might_need_to_wrap_the_the_whole_assignment_in_parentheses);
@@ -5711,9 +5713,10 @@ namespace ts {
             const pos = getNodePos();
             const hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(SyntaxKind.IfKeyword);
+            const openParenPosition = scanner.getTokenPos();
             parseExpected(SyntaxKind.OpenParenToken);
             const expression = allowInAnd(parseExpression);
-            parseExpected(SyntaxKind.CloseParenToken);
+            parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenPosition);
             const thenStatement = parseStatement();
             const elseStatement = parseOptional(SyntaxKind.ElseKeyword) ? parseStatement() : undefined;
             return withJSDoc(finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos), hasJSDoc);
@@ -5725,9 +5728,10 @@ namespace ts {
             parseExpected(SyntaxKind.DoKeyword);
             const statement = parseStatement();
             parseExpected(SyntaxKind.WhileKeyword);
+            const openParenPosition = scanner.getTokenPos();
             parseExpected(SyntaxKind.OpenParenToken);
             const expression = allowInAnd(parseExpression);
-            parseExpected(SyntaxKind.CloseParenToken);
+            parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenPosition);
 
             // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html
             // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in
@@ -5741,9 +5745,10 @@ namespace ts {
             const pos = getNodePos();
             const hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(SyntaxKind.WhileKeyword);
+            const openParenPosition = scanner.getTokenPos();
             parseExpected(SyntaxKind.OpenParenToken);
             const expression = allowInAnd(parseExpression);
-            parseExpected(SyntaxKind.CloseParenToken);
+            parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenPosition);
             const statement = parseStatement();
             return withJSDoc(finishNode(factory.createWhileStatement(expression, statement), pos), hasJSDoc);
         }
@@ -5819,9 +5824,10 @@ namespace ts {
             const pos = getNodePos();
             const hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(SyntaxKind.WithKeyword);
+            const openParenPosition = scanner.getTokenPos();
             parseExpected(SyntaxKind.OpenParenToken);
             const expression = allowInAnd(parseExpression);
-            parseExpected(SyntaxKind.CloseParenToken);
+            parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenPosition);
             const statement = doInsideOfContext(NodeFlags.InWithStatement, parseStatement);
             return withJSDoc(finishNode(factory.createWithStatement(expression, statement), pos), hasJSDoc);
         }
@@ -8074,13 +8080,9 @@ namespace ts {
                             hasChildren = true;
                             if (child.kind === SyntaxKind.JSDocTypeTag) {
                                 if (childTypeTag) {
-                                    parseErrorAtCurrentToken(Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
-                                    const lastError = lastOrUndefined(parseDiagnostics);
+                                    const lastError = parseErrorAtCurrentToken(Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
                                     if (lastError) {
-                                        addRelatedInfo(
-                                            lastError,
-                                            createDetachedDiagnostic(fileName, 0, 0, Diagnostics.The_tag_was_first_specified_here)
-                                        );
+                                        addRelatedInfo(lastError, createDetachedDiagnostic(fileName, 0, 0, Diagnostics.The_tag_was_first_specified_here));
                                     }
                                     break;
                                 }
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
index 2e3854ac84726..2e95e0d27dfdc 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
@@ -121,6 +121,7 @@ tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts(261,1): error TS
                     if (retValue != 0 ^=  {
                                       ~~
 !!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts:22:20: The parser expected to find a ')' to match the '(' token here.
                                           ~
     
     
diff --git a/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.errors.txt b/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.errors.txt
index 3a7c89e2f4157..6bac67291472c 100644
--- a/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.errors.txt
+++ b/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.errors.txt
@@ -16,5 +16,4 @@ tests/cases/compiler/errorRecoveryWithDotFollowedByNamespaceKeyword.ts(9,2): err
     }
      
 !!! error TS1005: '}' expected.
-!!! related TS1007 tests/cases/compiler/errorRecoveryWithDotFollowedByNamespaceKeyword.ts:3:19: The parser expected to find a '}' to match the '{' token here.
-!!! related TS1007 tests/cases/compiler/errorRecoveryWithDotFollowedByNamespaceKeyword.ts:2:20: The parser expected to find a '}' to match the '{' token here.
\ No newline at end of file
+!!! related TS1007 tests/cases/compiler/errorRecoveryWithDotFollowedByNamespaceKeyword.ts:3:19: The parser expected to find a '}' to match the '{' token here.
\ No newline at end of file
diff --git a/tests/baselines/reference/missingCloseBracketInArray.errors.txt b/tests/baselines/reference/missingCloseBracketInArray.errors.txt
new file mode 100644
index 0000000000000..26801c02812b4
--- /dev/null
+++ b/tests/baselines/reference/missingCloseBracketInArray.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/compiler/missingCloseBracketInArray.ts(1,48): error TS1005: ']' expected.
+
+
+==== tests/cases/compiler/missingCloseBracketInArray.ts (1 errors) ====
+    var alphas:string[] = alphas = ["1","2","3","4"
+                                                   
+!!! error TS1005: ']' expected.
+!!! related TS1007 tests/cases/compiler/missingCloseBracketInArray.ts:1:32: The parser expected to find a ']' to match the '[' token here.
\ No newline at end of file
diff --git a/tests/baselines/reference/missingCloseBracketInArray.js b/tests/baselines/reference/missingCloseBracketInArray.js
new file mode 100644
index 0000000000000..cb842d1cc7413
--- /dev/null
+++ b/tests/baselines/reference/missingCloseBracketInArray.js
@@ -0,0 +1,5 @@
+//// [missingCloseBracketInArray.ts]
+var alphas:string[] = alphas = ["1","2","3","4"
+
+//// [missingCloseBracketInArray.js]
+var alphas = alphas = ["1", "2", "3", "4"];
diff --git a/tests/baselines/reference/missingCloseBracketInArray.symbols b/tests/baselines/reference/missingCloseBracketInArray.symbols
new file mode 100644
index 0000000000000..4d28f8945fd13
--- /dev/null
+++ b/tests/baselines/reference/missingCloseBracketInArray.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/missingCloseBracketInArray.ts ===
+var alphas:string[] = alphas = ["1","2","3","4"
+>alphas : Symbol(alphas, Decl(missingCloseBracketInArray.ts, 0, 3))
+>alphas : Symbol(alphas, Decl(missingCloseBracketInArray.ts, 0, 3))
+
diff --git a/tests/baselines/reference/missingCloseBracketInArray.types b/tests/baselines/reference/missingCloseBracketInArray.types
new file mode 100644
index 0000000000000..557a865827c2b
--- /dev/null
+++ b/tests/baselines/reference/missingCloseBracketInArray.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/missingCloseBracketInArray.ts ===
+var alphas:string[] = alphas = ["1","2","3","4"
+>alphas : string[]
+>alphas = ["1","2","3","4" : string[]
+>alphas : string[]
+>["1","2","3","4" : string[]
+>"1" : "1"
+>"2" : "2"
+>"3" : "3"
+>"4" : "4"
+
diff --git a/tests/baselines/reference/missingCloseParenStatements.errors.txt b/tests/baselines/reference/missingCloseParenStatements.errors.txt
new file mode 100644
index 0000000000000..3f49d5a036653
--- /dev/null
+++ b/tests/baselines/reference/missingCloseParenStatements.errors.txt
@@ -0,0 +1,32 @@
+tests/cases/compiler/missingCloseParenStatements.ts(2,26): error TS1005: ')' expected.
+tests/cases/compiler/missingCloseParenStatements.ts(4,5): error TS1005: ')' expected.
+tests/cases/compiler/missingCloseParenStatements.ts(8,39): error TS1005: ')' expected.
+tests/cases/compiler/missingCloseParenStatements.ts(11,35): error TS1005: ')' expected.
+
+
+==== tests/cases/compiler/missingCloseParenStatements.ts (4 errors) ====
+    var a1, a2, a3 = 0;
+    if ( a1 && (a2 + a3 > 0) {
+                             ~
+!!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/compiler/missingCloseParenStatements.ts:2:4: The parser expected to find a ')' to match the '(' token here.
+        while( (a2 > 0) && a1
+        {
+        ~
+!!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/compiler/missingCloseParenStatements.ts:3:10: The parser expected to find a ')' to match the '(' token here.
+            do {
+                var i = i + 1;
+                a1 = a1 + i;
+                with ((a2 + a3 > 0) && a1 {
+                                          ~
+!!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/compiler/missingCloseParenStatements.ts:8:18: The parser expected to find a ')' to match the '(' token here.
+                    console.log(x);
+                  }
+            } while (i < 5 && (a1 > 5);
+                                      ~
+!!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/compiler/missingCloseParenStatements.ts:11:17: The parser expected to find a ')' to match the '(' token here.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/missingCloseParenStatements.js b/tests/baselines/reference/missingCloseParenStatements.js
new file mode 100644
index 0000000000000..8ba56b6b88183
--- /dev/null
+++ b/tests/baselines/reference/missingCloseParenStatements.js
@@ -0,0 +1,28 @@
+//// [missingCloseParenStatements.ts]
+var a1, a2, a3 = 0;
+if ( a1 && (a2 + a3 > 0) {
+    while( (a2 > 0) && a1
+    {
+        do {
+            var i = i + 1;
+            a1 = a1 + i;
+            with ((a2 + a3 > 0) && a1 {
+                console.log(x);
+              }
+        } while (i < 5 && (a1 > 5);
+    }
+}
+
+//// [missingCloseParenStatements.js]
+var a1, a2, a3 = 0;
+if (a1 && (a2 + a3 > 0)) {
+    while ((a2 > 0) && a1) {
+        do {
+            var i = i + 1;
+            a1 = a1 + i;
+            with ((a2 + a3 > 0) && a1) {
+                console.log(x);
+            }
+        } while (i < 5 && (a1 > 5));
+    }
+}
diff --git a/tests/baselines/reference/missingCloseParenStatements.symbols b/tests/baselines/reference/missingCloseParenStatements.symbols
new file mode 100644
index 0000000000000..e403570f8e832
--- /dev/null
+++ b/tests/baselines/reference/missingCloseParenStatements.symbols
@@ -0,0 +1,37 @@
+=== tests/cases/compiler/missingCloseParenStatements.ts ===
+var a1, a2, a3 = 0;
+>a1 : Symbol(a1, Decl(missingCloseParenStatements.ts, 0, 3))
+>a2 : Symbol(a2, Decl(missingCloseParenStatements.ts, 0, 7))
+>a3 : Symbol(a3, Decl(missingCloseParenStatements.ts, 0, 11))
+
+if ( a1 && (a2 + a3 > 0) {
+>a1 : Symbol(a1, Decl(missingCloseParenStatements.ts, 0, 3))
+>a2 : Symbol(a2, Decl(missingCloseParenStatements.ts, 0, 7))
+>a3 : Symbol(a3, Decl(missingCloseParenStatements.ts, 0, 11))
+
+    while( (a2 > 0) && a1
+>a2 : Symbol(a2, Decl(missingCloseParenStatements.ts, 0, 7))
+>a1 : Symbol(a1, Decl(missingCloseParenStatements.ts, 0, 3))
+    {
+        do {
+            var i = i + 1;
+>i : Symbol(i, Decl(missingCloseParenStatements.ts, 5, 15))
+>i : Symbol(i, Decl(missingCloseParenStatements.ts, 5, 15))
+
+            a1 = a1 + i;
+>a1 : Symbol(a1, Decl(missingCloseParenStatements.ts, 0, 3))
+>a1 : Symbol(a1, Decl(missingCloseParenStatements.ts, 0, 3))
+>i : Symbol(i, Decl(missingCloseParenStatements.ts, 5, 15))
+
+            with ((a2 + a3 > 0) && a1 {
+>a2 : Symbol(a2, Decl(missingCloseParenStatements.ts, 0, 7))
+>a3 : Symbol(a3, Decl(missingCloseParenStatements.ts, 0, 11))
+>a1 : Symbol(a1, Decl(missingCloseParenStatements.ts, 0, 3))
+
+                console.log(x);
+              }
+        } while (i < 5 && (a1 > 5);
+>i : Symbol(i, Decl(missingCloseParenStatements.ts, 5, 15))
+>a1 : Symbol(a1, Decl(missingCloseParenStatements.ts, 0, 3))
+    }
+}
diff --git a/tests/baselines/reference/missingCloseParenStatements.types b/tests/baselines/reference/missingCloseParenStatements.types
new file mode 100644
index 0000000000000..0d1b7469f6073
--- /dev/null
+++ b/tests/baselines/reference/missingCloseParenStatements.types
@@ -0,0 +1,67 @@
+=== tests/cases/compiler/missingCloseParenStatements.ts ===
+var a1, a2, a3 = 0;
+>a1 : any
+>a2 : any
+>a3 : number
+>0 : 0
+
+if ( a1 && (a2 + a3 > 0) {
+>a1 && (a2 + a3 > 0) : boolean
+>a1 : any
+>(a2 + a3 > 0) : boolean
+>a2 + a3 > 0 : boolean
+>a2 + a3 : any
+>a2 : any
+>a3 : number
+>0 : 0
+
+    while( (a2 > 0) && a1
+>(a2 > 0) && a1 : any
+>(a2 > 0) : boolean
+>a2 > 0 : boolean
+>a2 : any
+>0 : 0
+>a1 : any
+    {
+        do {
+            var i = i + 1;
+>i : any
+>i + 1 : any
+>i : any
+>1 : 1
+
+            a1 = a1 + i;
+>a1 = a1 + i : any
+>a1 : any
+>a1 + i : any
+>a1 : any
+>i : any
+
+            with ((a2 + a3 > 0) && a1 {
+>(a2 + a3 > 0) && a1 : any
+>(a2 + a3 > 0) : boolean
+>a2 + a3 > 0 : boolean
+>a2 + a3 : any
+>a2 : any
+>a3 : number
+>0 : 0
+>a1 : any
+
+                console.log(x);
+>console.log(x) : any
+>console.log : any
+>console : any
+>log : any
+>x : any
+              }
+        } while (i < 5 && (a1 > 5);
+>i < 5 && (a1 > 5) : boolean
+>i < 5 : boolean
+>i : any
+>5 : 5
+>(a1 > 5) : boolean
+>a1 > 5 : boolean
+>a1 : any
+>5 : 5
+    }
+}
diff --git a/tests/baselines/reference/nestedClassDeclaration.errors.txt b/tests/baselines/reference/nestedClassDeclaration.errors.txt
index 5540ee024378d..f897c38d68191 100644
--- a/tests/baselines/reference/nestedClassDeclaration.errors.txt
+++ b/tests/baselines/reference/nestedClassDeclaration.errors.txt
@@ -32,7 +32,6 @@ tests/cases/conformance/classes/nestedClassDeclaration.ts(17,1): error TS1128: D
 !!! error TS2304: Cannot find name 'C4'.
                  ~
 !!! error TS1005: ',' expected.
-!!! related TS1007 tests/cases/conformance/classes/nestedClassDeclaration.ts:14:9: The parser expected to find a '}' to match the '{' token here.
         }
     }
     ~
diff --git a/tests/baselines/reference/objectLiteralWithSemicolons4.errors.txt b/tests/baselines/reference/objectLiteralWithSemicolons4.errors.txt
index 651c0b66df75c..544bddafff278 100644
--- a/tests/baselines/reference/objectLiteralWithSemicolons4.errors.txt
+++ b/tests/baselines/reference/objectLiteralWithSemicolons4.errors.txt
@@ -9,5 +9,4 @@ tests/cases/compiler/objectLiteralWithSemicolons4.ts(3,1): error TS1005: ',' exp
 !!! error TS18004: No value exists in scope for the shorthand property 'a'. Either declare one or provide an initializer.
     ;
     ~
-!!! error TS1005: ',' expected.
-!!! related TS1007 tests/cases/compiler/objectLiteralWithSemicolons4.ts:1:9: The parser expected to find a '}' to match the '{' token here.
\ No newline at end of file
+!!! error TS1005: ',' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.errors.txt b/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
index 692fb7617da63..b37200c4f0293 100644
--- a/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegativeParse.errors.txt
@@ -28,7 +28,6 @@ tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts(4,20): error T
 !!! error TS2304: Cannot find name 'matchMedia'.
                                ~
 !!! error TS1005: ',' expected.
-!!! related TS1007 tests/cases/conformance/types/spread/objectSpreadNegativeParse.ts:3:10: The parser expected to find a '}' to match the '{' token here.
                                   ~
 !!! error TS1128: Declaration or statement expected.
     let o10 = { ...get x() { return 12; }};
diff --git a/tests/baselines/reference/parseErrorIncorrectReturnToken.errors.txt b/tests/baselines/reference/parseErrorIncorrectReturnToken.errors.txt
index bc43cd5b7763b..2cf728848e45e 100644
--- a/tests/baselines/reference/parseErrorIncorrectReturnToken.errors.txt
+++ b/tests/baselines/reference/parseErrorIncorrectReturnToken.errors.txt
@@ -25,7 +25,6 @@ tests/cases/compiler/parseErrorIncorrectReturnToken.ts(12,1): error TS1128: Decl
         m(n: number) => string {
                      ~~
 !!! error TS1005: '{' expected.
-!!! related TS1007 tests/cases/compiler/parseErrorIncorrectReturnToken.ts:8:9: The parser expected to find a '}' to match the '{' token here.
                         ~~~~~~
 !!! error TS2693: 'string' only refers to a type, but is being used as a value here.
                                ~
diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt b/tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt
index 45dd9935a6229..b88c48182a27b 100644
--- a/tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt
+++ b/tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt
@@ -11,6 +11,7 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IfStatements/parserErro
       }
       ~
 !!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IfStatements/parserErrorRecoveryIfStatement2.ts:3:8: The parser expected to find a ')' to match the '(' token here.
       f2() {
       }
       f3() {
diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement3.errors.txt b/tests/baselines/reference/parserErrorRecoveryIfStatement3.errors.txt
index 631cdb08a90e4..cfd645e592542 100644
--- a/tests/baselines/reference/parserErrorRecoveryIfStatement3.errors.txt
+++ b/tests/baselines/reference/parserErrorRecoveryIfStatement3.errors.txt
@@ -11,6 +11,7 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IfStatements/parserErro
       }
       ~
 !!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IfStatements/parserErrorRecoveryIfStatement3.ts:3:8: The parser expected to find a ')' to match the '(' token here.
       f2() {
       }
       f3() {
diff --git a/tests/baselines/reference/parserFuzz1.errors.txt b/tests/baselines/reference/parserFuzz1.errors.txt
index e11d25c48fa56..e90dda55244e6 100644
--- a/tests/baselines/reference/parserFuzz1.errors.txt
+++ b/tests/baselines/reference/parserFuzz1.errors.txt
@@ -20,5 +20,4 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserFuzz1.ts(2,15): e
         ~~~~~~
 !!! error TS1005: ';' expected.
                   
-!!! error TS1005: '{' expected.
-!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserFuzz1.ts:1:9: The parser expected to find a '}' to match the '{' token here.
\ No newline at end of file
+!!! error TS1005: '{' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/reservedWords2.errors.txt b/tests/baselines/reference/reservedWords2.errors.txt
index 599010b436872..6ecb9471631bd 100644
--- a/tests/baselines/reference/reservedWords2.errors.txt
+++ b/tests/baselines/reference/reservedWords2.errors.txt
@@ -45,6 +45,7 @@ tests/cases/compiler/reservedWords2.ts(12,17): error TS1138: Parameter declarati
 !!! error TS2580: Cannot find name 'require'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
                                   ~
 !!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/compiler/reservedWords2.ts:1:14: The parser expected to find a ')' to match the '(' token here.
     import * as  while from "foo"
                
 !!! error TS2300: Duplicate identifier '(Missing)'.
@@ -58,6 +59,7 @@ tests/cases/compiler/reservedWords2.ts(12,17): error TS1138: Parameter declarati
 !!! error TS2304: Cannot find name 'from'.
                             ~~~~~
 !!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/compiler/reservedWords2.ts:2:20: The parser expected to find a ')' to match the '(' token here.
     
     var typeof = 10;
         ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors-with-incremental.js b/tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors-with-incremental.js
index 10d0e3770f161..308daf394aea9 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors-with-incremental.js
@@ -47,11 +47,6 @@ Output::
 4 ;
   ~
 
-  src/src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 
 Found 1 error.
 
@@ -81,11 +76,6 @@ Output::
 4 ;
   ~
 
-  src/src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 
 Found 1 error.
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors.js
index 4c55b9ce60f7f..e9ea12ea0d3e4 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors.js
@@ -47,11 +47,6 @@ Output::
 4 ;
   ~
 
-  src/src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 
 Found 1 error.
 
@@ -81,11 +76,6 @@ Output::
 4 ;
   ~
 
-  src/src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 
 Found 1 error.
 
diff --git a/tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
index 4b96a48f8f60c..1b17fdb2ee462 100644
--- a/tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
+++ b/tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
@@ -56,11 +56,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:35 AM] Found 1 error. Watching for file changes.
 
 
@@ -113,11 +108,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:42 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error.js
index 3e563e8f60930..6af8477219c81 100644
--- a/tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error.js
+++ b/tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error.js
@@ -56,11 +56,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:35 AM] Found 1 error. Watching for file changes.
 
 
@@ -113,11 +108,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:42 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsc/incremental/initial-build/with-noEmitOnError-syntax-errors.js b/tests/baselines/reference/tsc/incremental/initial-build/with-noEmitOnError-syntax-errors.js
index ab70d95535c29..6d8d5e1bd8330 100644
--- a/tests/baselines/reference/tsc/incremental/initial-build/with-noEmitOnError-syntax-errors.js
+++ b/tests/baselines/reference/tsc/incremental/initial-build/with-noEmitOnError-syntax-errors.js
@@ -47,11 +47,6 @@ Output::
 4 ;
   ~
 
-  src/src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 
 Found 1 error.
 
@@ -160,11 +155,6 @@ Output::
 4 ;
   ~
 
-  src/src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 
 Found 1 error.
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 9b6b0c05fdfbb..01d3cecd1bedd 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 17c877f6ac1a6..16681988e8f32 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:32 AM] Found 1 error. Watching for file changes.
 
 
@@ -104,11 +99,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index c74e95b44358d..60cee519a51fa 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -181,11 +176,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index 9c9b6f756c1bc..bae815eebebfb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:32 AM] Found 1 error. Watching for file changes.
 
 
@@ -104,11 +99,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
index 02366f1125102..be4cbb2503da1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
@@ -49,11 +49,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -185,11 +180,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
index fbb7a7ed57463..da78efc9fba32 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
@@ -49,11 +49,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:32 AM] Found 1 error. Watching for file changes.
 
 
@@ -110,11 +105,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
index 07f84519690f9..bf7e7e13c154d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
index 442f3d18610b8..3c0a5fcd89b5c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:32 AM] Found 1 error. Watching for file changes.
 
 
@@ -104,11 +99,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index ec619eb4a7070..3347e57400a36 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index c463f068880d6..06c2ed70520e4 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 21dbc506c20db..6a1ef2230ca43 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -181,11 +176,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index 35e28f24cf7e8..34366e53ebaa5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -181,11 +176,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
index 354221d990443..ead341c0c24c2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
@@ -49,11 +49,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -185,11 +180,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
index f3c5e03a4097d..63c9185d38bde 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
@@ -49,11 +49,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -185,11 +180,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
index 5e2009b67b411..1b2e76b260800 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
index 0b2f2feee3f16..9e0103cd7fdc5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
index b0cd5f57eb796..878514fada7ae 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -179,11 +174,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
index 10e6adbf42082..bdb72e4bede96 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -179,11 +174,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 3630b1ed77c64..f07286fecfbc6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
index 17038187ea58c..c88348bd5bc26 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
index 63db0fe14a0f0..517e41b0e0111 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -179,11 +174,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
index 4093ad4830287..48c8bcb5bd307 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:32 AM] Found 1 error. Watching for file changes.
 
 
@@ -104,11 +99,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 975e40a6ec0a7..75cf59365fe80 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
@@ -180,11 +175,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:44 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
index 659ad65715340..0969d50832bf8 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
@@ -43,11 +43,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:32 AM] Found 1 error. Watching for file changes.
 
 
@@ -104,11 +99,6 @@ Output::
 4 ;
   ~
 
-  src/main.ts:2:11
-    2 const a = {
-                ~
-    The parser expected to find a '}' to match the '{' token here.
-
 [12:00:37 AM] Found 1 error. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/typeAssertions.errors.txt b/tests/baselines/reference/typeAssertions.errors.txt
index 9d10ec17fe95d..cf132a12d0262 100644
--- a/tests/baselines/reference/typeAssertions.errors.txt
+++ b/tests/baselines/reference/typeAssertions.errors.txt
@@ -93,6 +93,7 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
 !!! error TS2304: Cannot find name 'is'.
                     ~~~~~~
 !!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts:44:3: The parser expected to find a ')' to match the '(' token here.
                     ~~~~~~
 !!! error TS2693: 'string' only refers to a type, but is being used as a value here.
                                                    ~
@@ -108,6 +109,7 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
 !!! error TS2749: 'numOrStr' refers to a value, but is being used as a type here. Did you mean 'typeof numOrStr'?
                                             ~~
 !!! error TS1005: ')' expected.
+!!! related TS1007 tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts:48:3: The parser expected to find a ')' to match the '(' token here.
                                             ~~
 !!! error TS2304: Cannot find name 'is'.
                                                ~~~~~~
diff --git a/tests/cases/compiler/missingCloseBracketInArray.ts b/tests/cases/compiler/missingCloseBracketInArray.ts
new file mode 100644
index 0000000000000..cb99f0d227757
--- /dev/null
+++ b/tests/cases/compiler/missingCloseBracketInArray.ts
@@ -0,0 +1 @@
+var alphas:string[] = alphas = ["1","2","3","4"
\ No newline at end of file
diff --git a/tests/cases/compiler/missingCloseParenStatements.ts b/tests/cases/compiler/missingCloseParenStatements.ts
new file mode 100644
index 0000000000000..7ff34bdae6a16
--- /dev/null
+++ b/tests/cases/compiler/missingCloseParenStatements.ts
@@ -0,0 +1,13 @@
+var a1, a2, a3 = 0;
+if ( a1 && (a2 + a3 > 0) {
+    while( (a2 > 0) && a1
+    {
+        do {
+            var i = i + 1;
+            a1 = a1 + i;
+            with ((a2 + a3 > 0) && a1 {
+                console.log(x);
+              }
+        } while (i < 5 && (a1 > 5);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrayLiteralExpressions/parserErrorRecoveryArrayLiteralExpression3.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrayLiteralExpressions/parserErrorRecoveryArrayLiteralExpression3.ts
index 58df0691d8e2c..18ed3b5ef5a50 100644
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrayLiteralExpressions/parserErrorRecoveryArrayLiteralExpression3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrayLiteralExpressions/parserErrorRecoveryArrayLiteralExpression3.ts
@@ -1,2 +1 @@
-
 var texCoords = [2, 2, 0.5000001192092895, 0.8749999 ; 403953552, 0.5000001192092895, 0.8749999403953552];