From 0490253710e9450eeaa8331a2454c55780fcefbc Mon Sep 17 00:00:00 2001 From: Jesse Trinity Date: Wed, 2 Jun 2021 16:11:06 -0700 Subject: [PATCH] accept baselines --- .../constructorWithIncompleteTypeAnnotation.errors.txt | 2 +- ...rrorRecoveryWithDotFollowedByNamespaceKeyword.errors.txt | 2 +- tests/baselines/reference/exportInFunction.errors.txt | 2 +- tests/baselines/reference/jsonParserRecovery/JSX.errors.txt | 3 +-- .../reference/jsonParserRecovery/TypeScript_code.errors.txt | 3 +-- .../jsonParserRecovery/trailing_identifier.errors.txt | 3 +-- tests/baselines/reference/missingCloseBrace.errors.txt | 2 +- .../reference/missingCloseBraceInObjectLiteral.errors.txt | 2 +- .../reference/missingCloseBracketInArray.errors.txt | 2 +- .../reference/missingCloseParenStatements.errors.txt | 6 +++--- .../reference/parserErrorRecoveryIfStatement2.errors.txt | 2 +- .../reference/parserErrorRecoveryIfStatement3.errors.txt | 2 +- .../reference/parserErrorRecovery_ObjectLiteral2.errors.txt | 2 +- .../reference/parserErrorRecovery_ObjectLiteral3.errors.txt | 2 +- .../reference/parserErrorRecovery_ObjectLiteral4.errors.txt | 2 +- .../reference/parserErrorRecovery_ObjectLiteral5.errors.txt | 2 +- .../parserErrorRecovery_SwitchStatement2.errors.txt | 2 +- .../reference/prettyContextNotDebugAssertion.errors.txt | 6 +++--- 18 files changed, 22 insertions(+), 25 deletions(-) diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt index 2e95e0d27df..25324c8de8a 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.errors.txt @@ -121,7 +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. +!!! related TS1007 tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts:22:19: 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 6bac6729147..eb5873670cf 100644 --- a/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.errors.txt +++ b/tests/baselines/reference/errorRecoveryWithDotFollowedByNamespaceKeyword.errors.txt @@ -16,4 +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. \ No newline at end of file +!!! related TS1007 tests/cases/compiler/errorRecoveryWithDotFollowedByNamespaceKeyword.ts:3:18: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file diff --git a/tests/baselines/reference/exportInFunction.errors.txt b/tests/baselines/reference/exportInFunction.errors.txt index bfd43b23477..f76393405c7 100644 --- a/tests/baselines/reference/exportInFunction.errors.txt +++ b/tests/baselines/reference/exportInFunction.errors.txt @@ -7,4 +7,4 @@ tests/cases/compiler/exportInFunction.ts(3,1): error TS1005: '}' expected. !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/compiler/exportInFunction.ts:1:14: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file +!!! related TS1007 tests/cases/compiler/exportInFunction.ts:1:13: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file diff --git a/tests/baselines/reference/jsonParserRecovery/JSX.errors.txt b/tests/baselines/reference/jsonParserRecovery/JSX.errors.txt index 7789f6c0019..772c67ee493 100644 --- a/tests/baselines/reference/jsonParserRecovery/JSX.errors.txt +++ b/tests/baselines/reference/jsonParserRecovery/JSX.errors.txt @@ -33,5 +33,4 @@ JSX(15,10): error TS1005: '}' expected. ) -!!! error TS1005: '}' expected. -!!! related TS1007 JSX:4: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/jsonParserRecovery/TypeScript_code.errors.txt b/tests/baselines/reference/jsonParserRecovery/TypeScript_code.errors.txt index cd17a0c487e..357be436faf 100644 --- a/tests/baselines/reference/jsonParserRecovery/TypeScript_code.errors.txt +++ b/tests/baselines/reference/jsonParserRecovery/TypeScript_code.errors.txt @@ -16,5 +16,4 @@ TypeScript code(1,22): error TS1005: '}' expected. ~~~~ !!! error TS1012: Unexpected token. -!!! error TS1005: '}' expected. -!!! related TS1007 TypeScript code:1:18: 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/jsonParserRecovery/trailing_identifier.errors.txt b/tests/baselines/reference/jsonParserRecovery/trailing_identifier.errors.txt index 11c44b08f00..295513f3c60 100644 --- a/tests/baselines/reference/jsonParserRecovery/trailing_identifier.errors.txt +++ b/tests/baselines/reference/jsonParserRecovery/trailing_identifier.errors.txt @@ -7,5 +7,4 @@ trailing identifier(1,8): error TS1005: '}' expected. ~~~~ !!! error TS1012: Unexpected token. -!!! error TS1005: '}' expected. -!!! related TS1007 trailing identifier:1:4: 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/missingCloseBrace.errors.txt b/tests/baselines/reference/missingCloseBrace.errors.txt index 27db81d27da..0d48c82985f 100644 --- a/tests/baselines/reference/missingCloseBrace.errors.txt +++ b/tests/baselines/reference/missingCloseBrace.errors.txt @@ -13,4 +13,4 @@ tests/cases/compiler/missingCloseBrace.ts(9,1): error TS1005: '}' expected. !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/compiler/missingCloseBrace.ts:1:22: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file +!!! related TS1007 tests/cases/compiler/missingCloseBrace.ts:1:21: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file diff --git a/tests/baselines/reference/missingCloseBraceInObjectLiteral.errors.txt b/tests/baselines/reference/missingCloseBraceInObjectLiteral.errors.txt index 436c8843c75..23bd8f0e4ad 100644 --- a/tests/baselines/reference/missingCloseBraceInObjectLiteral.errors.txt +++ b/tests/baselines/reference/missingCloseBraceInObjectLiteral.errors.txt @@ -9,4 +9,4 @@ tests/cases/compiler/missingCloseBraceInObjectLiteral.ts(5,1): error TS1005: '}' !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/compiler/missingCloseBraceInObjectLiteral.ts:1:11: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file +!!! related TS1007 tests/cases/compiler/missingCloseBraceInObjectLiteral.ts:1:10: 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 index 26801c02812..6efe976750d 100644 --- a/tests/baselines/reference/missingCloseBracketInArray.errors.txt +++ b/tests/baselines/reference/missingCloseBracketInArray.errors.txt @@ -5,4 +5,4 @@ tests/cases/compiler/missingCloseBracketInArray.ts(1,48): error TS1005: ']' expe 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 +!!! related TS1007 tests/cases/compiler/missingCloseBracketInArray.ts:1:31: The parser expected to find a ']' to match the '[' token here. \ No newline at end of file diff --git a/tests/baselines/reference/missingCloseParenStatements.errors.txt b/tests/baselines/reference/missingCloseParenStatements.errors.txt index 3f49d5a0366..3cae4b65bcd 100644 --- a/tests/baselines/reference/missingCloseParenStatements.errors.txt +++ b/tests/baselines/reference/missingCloseParenStatements.errors.txt @@ -9,7 +9,7 @@ tests/cases/compiler/missingCloseParenStatements.ts(11,35): error TS1005: ')' ex 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. +!!! related TS1007 tests/cases/compiler/missingCloseParenStatements.ts:2:3: The parser expected to find a ')' to match the '(' token here. while( (a2 > 0) && a1 { ~ @@ -21,12 +21,12 @@ tests/cases/compiler/missingCloseParenStatements.ts(11,35): error TS1005: ')' ex 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. +!!! related TS1007 tests/cases/compiler/missingCloseParenStatements.ts:8:17: 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. +!!! related TS1007 tests/cases/compiler/missingCloseParenStatements.ts:11:16: The parser expected to find a ')' to match the '(' token here. } } \ No newline at end of file diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt b/tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt index b88c48182a2..806f2cf7914 100644 --- a/tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt +++ b/tests/baselines/reference/parserErrorRecoveryIfStatement2.errors.txt @@ -11,7 +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. +!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IfStatements/parserErrorRecoveryIfStatement2.ts:3:7: 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 cfd645e5925..a92e4f81fd2 100644 --- a/tests/baselines/reference/parserErrorRecoveryIfStatement3.errors.txt +++ b/tests/baselines/reference/parserErrorRecoveryIfStatement3.errors.txt @@ -11,7 +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. +!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/IfStatements/parserErrorRecoveryIfStatement3.ts:3:7: The parser expected to find a ')' to match the '(' token here. f2() { } f3() { diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.errors.txt b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.errors.txt index 1b1cb56af70..983e890edf9 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral2.errors.txt @@ -15,4 +15,4 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserEr !!! error TS1005: ':' expected. !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserErrorRecovery_ObjectLiteral2.ts:1:9: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file +!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserErrorRecovery_ObjectLiteral2.ts:1:8: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.errors.txt b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.errors.txt index cfde9bcd8a3..9c4912628a8 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral3.errors.txt @@ -12,4 +12,4 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserEr !!! error TS1005: ':' expected. !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserErrorRecovery_ObjectLiteral3.ts:1:9: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file +!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserErrorRecovery_ObjectLiteral3.ts:1:8: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.errors.txt b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.errors.txt index 8b67b285eb7..29e666c6819 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral4.errors.txt @@ -12,4 +12,4 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserEr !!! error TS1005: ':' expected. !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserErrorRecovery_ObjectLiteral4.ts:1:9: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file +!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserErrorRecovery_ObjectLiteral4.ts:1:8: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file diff --git a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.errors.txt b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.errors.txt index 3915b915e46..75826e126e9 100644 --- a/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_ObjectLiteral5.errors.txt @@ -9,4 +9,4 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserEr !!! error TS1005: ':' expected. !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserErrorRecovery_ObjectLiteral5.ts:1:9: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file +!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ObjectLiterals/parserErrorRecovery_ObjectLiteral5.ts:1:8: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file diff --git a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.errors.txt b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.errors.txt index 2fca88d8beb..0fe4208a014 100644 --- a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.errors.txt +++ b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.errors.txt @@ -16,4 +16,4 @@ tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parser } !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parserErrorRecovery_SwitchStatement2.ts:2:17: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file +!!! related TS1007 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/SwitchStatements/parserErrorRecovery_SwitchStatement2.ts:2:16: The parser expected to find a '}' to match the '{' token here. \ No newline at end of file diff --git a/tests/baselines/reference/prettyContextNotDebugAssertion.errors.txt b/tests/baselines/reference/prettyContextNotDebugAssertion.errors.txt index 2bb96b27a9d..ba72657ea52 100644 --- a/tests/baselines/reference/prettyContextNotDebugAssertion.errors.txt +++ b/tests/baselines/reference/prettyContextNotDebugAssertion.errors.txt @@ -3,9 +3,9 @@ 2    - tests/cases/compiler/index.ts:1:11 + tests/cases/compiler/index.ts:1:10 1 if (true) { -    ~ +    ~ The parser expected to find a '}' to match the '{' token here. @@ -14,6 +14,6 @@ !!! error TS1005: '}' expected. -!!! related TS1007 tests/cases/compiler/index.ts:1:11: The parser expected to find a '}' to match the '{' token here. +!!! related TS1007 tests/cases/compiler/index.ts:1:10: The parser expected to find a '}' to match the '{' token here. Found 1 error.