maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert #43460 and #40884 (#44175)

Browse source 
* Revert "Only issue matching token errors on non-dupe locations (#43460)"

This reverts commit 76a2ae3d69.

* Revert "Adding Diagnostic message for missing ']' and ')' in Array literal and conditional statements (#40884)"

This reverts commit 555ef73da8.

* re-add clobbered merge lines
This commit is contained in:
Jesse Trinity 2021-05-19 16:54:07 -07:00 committed by GitHub
parent e67da8a748
commit 5770434891
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 336 additions and 255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/diagnosticMessages.json
View file

@ -15,7 +15,7 @@
"category": "Error",
"code": 1006
},
"The parser expected to find a '{1}' to match the '{0}' token here.": {
"The parser expected to find a '}' to match the '{' token here.": {
"category": "Error",
"code": 1007
},

72
src/compiler/parser.ts
View file

@ -1336,27 +1336,24 @@ namespace ts {
return inContext(NodeFlags.AwaitContext);
}
function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): DiagnosticWithDetachedLocation | undefined {
return parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): void {
parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
}
function parseErrorAtPosition(start: number, length: number, message: DiagnosticMessage, arg0?: any): DiagnosticWithDetachedLocation | undefined {
function parseErrorAtPosition(start: number, length: number, message: DiagnosticMessage, arg0?: any): void {
// 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) {
result = createDetachedDiagnostic(fileName, start, length, message, arg0);
parseDiagnostics.push(result);
parseDiagnostics.push(createDetachedDiagnostic(fileName, start, length, message, arg0));
}
// 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): DiagnosticWithDetachedLocation | undefined {
return parseErrorAtPosition(start, end - start, message, arg0);
function parseErrorAt(start: number, end: number, message: DiagnosticMessage, arg0?: any): void {
parseErrorAtPosition(start, end - start, message, arg0);
}
function parseErrorAtRange(range: TextRange, message: DiagnosticMessage, arg0?: any): void {
@ -1546,20 +1543,6 @@ 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();
@ -5450,11 +5433,10 @@ 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);
parseExpectedMatchingBrackets(SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken, openBracketPosition);
parseExpected(SyntaxKind.CloseBracketToken);
return finishNode(factory.createArrayLiteralExpression(elements, multiLine), pos);
}
@ -5523,7 +5505,15 @@ namespace ts {
parseExpected(SyntaxKind.OpenBraceToken);
const multiLine = scanner.hasPrecedingLineBreak();
const properties = parseDelimitedList(ParsingContext.ObjectLiteralMembers, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true);
parseExpectedMatchingBrackets(SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken, openBracePosition);
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)
);
}
}
return finishNode(factory.createObjectLiteralExpression(properties, multiLine), pos);
}
@ -5609,7 +5599,15 @@ namespace ts {
if (parseExpected(SyntaxKind.OpenBraceToken, diagnosticMessage) || ignoreMissingOpenBrace) {
const multiLine = scanner.hasPrecedingLineBreak();
const statements = parseList(ParsingContext.BlockStatements, parseStatement);
parseExpectedMatchingBrackets(SyntaxKind.OpenBraceToken, SyntaxKind.CloseBraceToken, openBracePosition);
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)
);
}
}
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);
@ -5665,10 +5663,9 @@ namespace ts {
const pos = getNodePos();
const hasJSDoc = hasPrecedingJSDocComment();
parseExpected(SyntaxKind.IfKeyword);
const openParenPosition = scanner.getTokenPos();
parseExpected(SyntaxKind.OpenParenToken);
const expression = allowInAnd(parseExpression);
parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenPosition);
parseExpected(SyntaxKind.CloseParenToken);
const thenStatement = parseStatement();
const elseStatement = parseOptional(SyntaxKind.ElseKeyword) ? parseStatement() : undefined;
return withJSDoc(finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos), hasJSDoc);
@ -5680,10 +5677,9 @@ namespace ts {
parseExpected(SyntaxKind.DoKeyword);
const statement = parseStatement();
parseExpected(SyntaxKind.WhileKeyword);
const openParenPosition = scanner.getTokenPos();
parseExpected(SyntaxKind.OpenParenToken);
const expression = allowInAnd(parseExpression);
parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenPosition);
parseExpected(SyntaxKind.CloseParenToken);
// 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
@ -5697,10 +5693,9 @@ namespace ts {
const pos = getNodePos();
const hasJSDoc = hasPrecedingJSDocComment();
parseExpected(SyntaxKind.WhileKeyword);
const openParenPosition = scanner.getTokenPos();
parseExpected(SyntaxKind.OpenParenToken);
const expression = allowInAnd(parseExpression);
parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenPosition);
parseExpected(SyntaxKind.CloseParenToken);
const statement = parseStatement();
return withJSDoc(finishNode(factory.createWhileStatement(expression, statement), pos), hasJSDoc);
}
@ -5776,10 +5771,9 @@ namespace ts {
const pos = getNodePos();
const hasJSDoc = hasPrecedingJSDocComment();
parseExpected(SyntaxKind.WithKeyword);
const openParenPosition = scanner.getTokenPos();
parseExpected(SyntaxKind.OpenParenToken);
const expression = allowInAnd(parseExpression);
parseExpectedMatchingBrackets(SyntaxKind.OpenParenToken, SyntaxKind.CloseParenToken, openParenPosition);
parseExpected(SyntaxKind.CloseParenToken);
const statement = doInsideOfContext(NodeFlags.InWithStatement, parseStatement);
return withJSDoc(finishNode(factory.createWithStatement(expression, statement), pos), hasJSDoc);
}
@ -8010,9 +8004,13 @@ namespace ts {
hasChildren = true;
if (child.kind === SyntaxKind.JSDocTypeTag) {
if (childTypeTag) {
const lastError = parseErrorAtCurrentToken(Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
parseErrorAtCurrentToken(Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
const lastError = lastOrUndefined(parseDiagnostics);
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;
}

1
tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt
View file

@ -121,7 +121,6 @@ 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.
~

3
tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.errors.txt
View file

@ -16,4 +16,5 @@ 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: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.

8
tests/baselines/reference/missingCloseBracketInArray.errors.txt
View file

@ -1,8 +0,0 @@
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.

5
tests/baselines/reference/missingCloseBracketInArray.js
View file

@ -1,5 +0,0 @@
//// [missingCloseBracketInArray.ts]
var alphas:string[] = alphas = ["1","2","3","4"
//// [missingCloseBracketInArray.js]
var alphas = alphas = ["1", "2", "3", "4"];

5
tests/baselines/reference/missingCloseBracketInArray.symbols
View file

@ -1,5 +0,0 @@
=== 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))

11
tests/baselines/reference/missingCloseBracketInArray.types
View file

@ -1,11 +0,0 @@
=== 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"

32
tests/baselines/reference/missingCloseParenStatements.errors.txt
View file

@ -1,32 +0,0 @@
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.
}
}

28
tests/baselines/reference/missingCloseParenStatements.js
View file

@ -1,28 +0,0 @@
//// [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));
}
}

37
tests/baselines/reference/missingCloseParenStatements.symbols
View file

@ -1,37 +0,0 @@
=== 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))
}
}

67
tests/baselines/reference/missingCloseParenStatements.types
View file

@ -1,67 +0,0 @@
=== 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
}
}

1
tests/baselines/reference/nestedClassDeclaration.errors.txt
View file

@ -32,6 +32,7 @@ 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.
}
}
~

3
tests/baselines/reference/objectLiteralWithSemicolons4.errors.txt
View file

@ -9,4 +9,5 @@ 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.
!!! error TS1005: ',' expected.
!!! related TS1007 tests/cases/compiler/objectLiteralWithSemicolons4.ts:1:9: The parser expected to find a '}' to match the '{' token here.

1
tests/baselines/reference/objectSpreadNegativeParse.errors.txt
View file

@ -28,6 +28,7 @@ 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; }};

1
tests/baselines/reference/parseErrorIncorrectReturnToken.errors.txt
View file

@ -25,6 +25,7 @@ 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.
~

1
tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt
View file

@ -11,7 +11,6 @@ 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() {

1
tests/baselines/reference/parserErrorRecoveryIfStatement3.errors.txt
View file

@ -11,7 +11,6 @@ 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() {

3
tests/baselines/reference/parserFuzz1.errors.txt
View file

@ -20,4 +20,5 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserFuzz1.ts(2,15): e
~~~~~~
!!! error TS1005: ';' expected.
!!! 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.

2
tests/baselines/reference/reservedWords2.errors.txt
View file

@ -45,7 +45,6 @@ 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)'.
@ -59,7 +58,6 @@ 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;
~~~~~~

10
tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors-with-incremental.js
View file

@ -47,6 +47,11 @@ 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.
@ -76,6 +81,11 @@ 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.

10
tests/baselines/reference/tsbuild/noEmitOnError/initial-build/syntax-errors.js
View file

@ -47,6 +47,11 @@ 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.
@ -76,6 +81,11 @@ 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.

10
tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
View file

@ -56,6 +56,11 @@ 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.
@ -108,6 +113,11 @@ 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.

10
tests/baselines/reference/tsbuild/watchMode/noEmitOnError/does-not-emit-any-files-on-error.js
View file

@ -56,6 +56,11 @@ 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.
@ -108,6 +113,11 @@ 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.

10
tests/baselines/reference/tsc/incremental/initial-build/with-noEmitOnError-syntax-errors.js
View file

@ -47,6 +47,11 @@ 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.
@ -155,6 +160,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -99,6 +104,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -176,6 +181,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -99,6 +104,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
View file

@ -49,6 +49,11 @@ 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,6 +185,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
View file

@ -49,6 +49,11 @@ 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.
@ -105,6 +110,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -99,6 +104,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -176,6 +181,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -176,6 +181,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
View file

@ -49,6 +49,11 @@ 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,6 +185,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
View file

@ -49,6 +49,11 @@ 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,6 +185,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -174,6 +179,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -174,6 +179,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -174,6 +179,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -99,6 +104,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
View file

@ -43,6 +43,11 @@ 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.
@ -175,6 +180,11 @@ 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.

10
tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
View file

@ -43,6 +43,11 @@ 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.
@ -99,6 +104,11 @@ 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.

2
tests/baselines/reference/typeAssertions.errors.txt
View file

@ -93,7 +93,6 @@ 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.
~
@ -109,7 +108,6 @@ 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'.
~~~~~~

1
tests/cases/compiler/missingCloseBracketInArray.ts
View file

@ -1 +0,0 @@
var alphas:string[] = alphas = ["1","2","3","4"

13
tests/cases/compiler/missingCloseParenStatements.ts
View file

@ -1,13 +0,0 @@
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);
}
}

1
tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrayLiteralExpressions/parserErrorRecoveryArrayLiteralExpression3.ts
View file

@ -1 +1,2 @@
var texCoords = [2, 2, 0.5000001192092895, 0.8749999 ; 403953552, 0.5000001192092895, 0.8749999403953552];