From 1a000c8422e2481cf1af69ce83102c5ce55f652c Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Fri, 1 Oct 2021 17:50:00 +0100 Subject: [PATCH] Fix main (#46160) --- src/testRunner/parallel/host.ts | 2 +- src/testRunner/parallel/worker.ts | 2 +- .../multipleClassPropertyModifiersErrors.errors.txt | 6 +++--- .../parserIndexMemberDeclaration10.errors.txt | 6 +++--- .../parserMemberAccessorDeclaration8.errors.txt | 6 +++--- .../parserMemberFunctionDeclaration2.errors.txt | 6 +++--- .../parserMemberVariableDeclaration2.errors.txt | 6 +++--- .../reference/staticAsIdentifier.errors.txt | 12 ++++++------ .../reference/staticModifierAlreadySeen.errors.txt | 12 ++++++------ 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/testRunner/parallel/host.ts b/src/testRunner/parallel/host.ts index abc486c9f72..421b95ef93a 100644 --- a/src/testRunner/parallel/host.ts +++ b/src/testRunner/parallel/host.ts @@ -525,7 +525,7 @@ namespace Harness.Parallel.Host { completeBar(); progressBars.disable(); - const replayRunner = new Mocha.Runner(new Mocha.Suite(""), /*delay*/ false); + const replayRunner = new Mocha.Runner(new Mocha.Suite(""), { delay: false }); replayRunner.started = true; const createStatsCollector = require("mocha/lib/stats-collector"); createStatsCollector(replayRunner); // manually init stats collector like mocha.run would diff --git a/src/testRunner/parallel/worker.ts b/src/testRunner/parallel/worker.ts index fe944c56753..ed91b3c285f 100644 --- a/src/testRunner/parallel/worker.ts +++ b/src/testRunner/parallel/worker.ts @@ -209,7 +209,7 @@ namespace Harness.Parallel.Worker { const errors: ErrorInfo[] = []; const passes: TestInfo[] = []; const start = +new Date(); - const runner = new Mocha.Runner(suite, /*delay*/ false); + const runner = new Mocha.Runner(suite, { delay: false }); runner .on("start", () => { diff --git a/tests/baselines/reference/multipleClassPropertyModifiersErrors.errors.txt b/tests/baselines/reference/multipleClassPropertyModifiersErrors.errors.txt index 78b97f97e8c..4b532d3804b 100644 --- a/tests/baselines/reference/multipleClassPropertyModifiersErrors.errors.txt +++ b/tests/baselines/reference/multipleClassPropertyModifiersErrors.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,16): error TS1005: ';' expected. +tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,9): error TS1434: Unexpected keyword or identifier. ==== tests/cases/compiler/multipleClassPropertyModifiersErrors.ts (1 errors) ==== @@ -6,8 +6,8 @@ tests/cases/compiler/multipleClassPropertyModifiersErrors.ts(4,16): error TS1005 public public p1; private private p2; static static p3; - ~~ -!!! error TS1005: ';' expected. + ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. public private p4; private public p5; public static p6; diff --git a/tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt b/tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt index bed80fc9e88..265485dcf37 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt +++ b/tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,18): error TS1005: ';' expected. +tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,11): error TS1434: Unexpected keyword or identifier. ==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts (1 errors) ==== class C { static static [x: string]: string; - ~ -!!! error TS1005: ';' expected. + ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. } \ No newline at end of file diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt index 533eb625d77..0f8f87d9f92 100644 --- a/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt +++ b/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt @@ -1,12 +1,12 @@ -tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,19): error TS1005: ';' expected. +tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,12): error TS1434: Unexpected keyword or identifier. tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts(2,23): error TS2378: A 'get' accessor must return a value. ==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (2 errors) ==== class C { static static get Foo() { } - ~~~ -!!! error TS1005: ';' expected. + ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. ~~~ !!! error TS2378: A 'get' accessor must return a value. } \ No newline at end of file diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration2.errors.txt b/tests/baselines/reference/parserMemberFunctionDeclaration2.errors.txt index 64773dd2de2..ab11c94aaf7 100644 --- a/tests/baselines/reference/parserMemberFunctionDeclaration2.errors.txt +++ b/tests/baselines/reference/parserMemberFunctionDeclaration2.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts(2,19): error TS1005: ';' expected. +tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts(2,12): error TS1434: Unexpected keyword or identifier. ==== tests/cases/conformance/parser/ecmascript5/MemberFunctionDeclarations/parserMemberFunctionDeclaration2.ts (1 errors) ==== class C { static static Foo() { } - ~~~ -!!! error TS1005: ';' expected. + ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. } \ No newline at end of file diff --git a/tests/baselines/reference/parserMemberVariableDeclaration2.errors.txt b/tests/baselines/reference/parserMemberVariableDeclaration2.errors.txt index 137d221b49a..ca1946e3b96 100644 --- a/tests/baselines/reference/parserMemberVariableDeclaration2.errors.txt +++ b/tests/baselines/reference/parserMemberVariableDeclaration2.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts(2,17): error TS1005: ';' expected. +tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts(2,10): error TS1434: Unexpected keyword or identifier. ==== tests/cases/conformance/parser/ecmascript5/MemberVariableDeclarations/parserMemberVariableDeclaration2.ts (1 errors) ==== class C { static static Foo; - ~~~ -!!! error TS1005: ';' expected. + ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. } \ No newline at end of file diff --git a/tests/baselines/reference/staticAsIdentifier.errors.txt b/tests/baselines/reference/staticAsIdentifier.errors.txt index b3cd9889f84..f85bba74e46 100644 --- a/tests/baselines/reference/staticAsIdentifier.errors.txt +++ b/tests/baselines/reference/staticAsIdentifier.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/staticAsIdentifier.ts(12,19): error TS1005: ';' expected. -tests/cases/compiler/staticAsIdentifier.ts(16,19): error TS1005: ';' expected. +tests/cases/compiler/staticAsIdentifier.ts(12,12): error TS1434: Unexpected keyword or identifier. +tests/cases/compiler/staticAsIdentifier.ts(16,12): error TS1434: Unexpected keyword or identifier. ==== tests/cases/compiler/staticAsIdentifier.ts (2 errors) ==== @@ -15,14 +15,14 @@ tests/cases/compiler/staticAsIdentifier.ts(16,19): error TS1005: ';' expected. class C3 { static static p: string; - ~ -!!! error TS1005: ';' expected. + ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. } class C4 { static static foo() {} - ~~~ -!!! error TS1005: ';' expected. + ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. } class C5 { diff --git a/tests/baselines/reference/staticModifierAlreadySeen.errors.txt b/tests/baselines/reference/staticModifierAlreadySeen.errors.txt index f9e3e2afdc6..b6f532ccdff 100644 --- a/tests/baselines/reference/staticModifierAlreadySeen.errors.txt +++ b/tests/baselines/reference/staticModifierAlreadySeen.errors.txt @@ -1,16 +1,16 @@ -tests/cases/compiler/staticModifierAlreadySeen.ts(2,19): error TS1005: ';' expected. +tests/cases/compiler/staticModifierAlreadySeen.ts(2,12): error TS1434: Unexpected keyword or identifier. +tests/cases/compiler/staticModifierAlreadySeen.ts(3,19): error TS1434: Unexpected keyword or identifier. tests/cases/compiler/staticModifierAlreadySeen.ts(3,19): error TS2300: Duplicate identifier 'static'. -tests/cases/compiler/staticModifierAlreadySeen.ts(3,26): error TS1005: ';' expected. ==== tests/cases/compiler/staticModifierAlreadySeen.ts (3 errors) ==== class C { static static foo = 1; - ~~~ -!!! error TS1005: ';' expected. + ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. public static static bar() { } ~~~~~~ +!!! error TS1434: Unexpected keyword or identifier. + ~~~~~~ !!! error TS2300: Duplicate identifier 'static'. - ~~~ -!!! error TS1005: ';' expected. } \ No newline at end of file